Move the travel sample tutorial from 2.x trunk to contrib as its not in the build, doesn't build, and no one is actively working on it. (and even if they were, i wonder if this should be released seperately like the 1.x version and so not in the trunk tree anyway

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

684 files changed, 0 insertions, 41415 deletions

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/README b/sca-java-2.x/trunk/tutorials/travelsample/README
deleted file mode 100644
index 32290ef82f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/README
+++ /dev/null
@@ -1,534 +0,0 @@
-

-Building the travel sample using ant

-------------------------------------

-

-1. Download and unzip JDK 6 update 7 (or later) or JDK 5 update 22, and set

-   the JAVA_HOME environment variable to the JDK base directory.

-2. Install svn and ant.

-3. Create a local directory to hold the travel sample code.  With this as

-   your current directory, check out the complete travel sample from svn

-   using the following command:

-     svn co http://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/tutorials/travelsample

-4. Download and unzip the Tuscany SCA Java 1.6 (or later) binary distribution

-   and set the TUSCANY_HOME environment variable to the base directory

-   containing the unzipped binary distribution.

-5. Download and unzip the OpenEJB 3.1.2 (or later) binary distribution and set

-   the OPENEJB_HOME environment variable to the base directory containing

-   the unzipped binary distribution.

-6. If you are using JDK 5, download and unzip the JAX-WS reference implementation

-   version 2.1.7 and set the JAXWS_HOME environment variable to the base directory

-   containing the unzipped download.

-7. With the travelsample directory as your current directory, enter the

-   command "ant compile".

-

-

-Building the travel sample using maven

---------------------------------------

-

-Most of the steps are similar to the above.  For completeness, a full list

-of the steps needed is given here.

-

-1. Download and unzip JDK 6 update 7 (or later) or JDK 5 update 22, and set

-   the JAVA_HOME environment variable to the JDK base directory.

-2. Install svn and maven.

-3. Create a local directory to hold the travel sample code.  With this as

-   your current directory, check out the complete travel sample from svn

-   using the following command:

-     svn co http://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk/tutorials/travelsample

-4. Check the setting of the <tuscany.version> property in the

-   travelsample/pom.xml file.  If you want to build the travel sample using

-   a different Tuscany version, change this property as necessary.  The

-   travel sample has been tested and runs correctly with Tuscany SCA Java 1.6. 

-5. With the travelsample directory as your current directory, enter the

-   command "mvn".  You will need a live internet connection so that maven

-   can download any required files to your local repository.

-6. By default the maven build produces a binary distribution that is an

-   add-on delta to the Tuscany SCA Java 1.6 binary distribution.  If you

-   want to produce a fully self-contained binary distribution for the

-   travel sample, you can use the command "mvn -Pselfcontained" instead

-   of "mvn" to do this.

-

-

-Running the travel sample from the build directories

-----------------------------------------------------

-

-The travel sample consists of a number of related scenarios.  These scenarios

-are listed below, together with instructions for running them.  The instructions

-in this section will work irrespective of whether the travel sample was built

-using ant or maven.

-

-Most of the scenarios are run by opening a single command prompt window

-and entering the command "ant run" into that window.  If a scenario is

-listed with multiple commands, this means that it needs multiple command

-prompt windows.  In this case, each of the listed commands must be entered

-into its own separate command prompt window in the order shown.

-

-Before running these scenarios, you need to perform the setup described above

-in "Building the travel sample using ant" if you have not already done this.

-

-Some of the scenarios are packaged as web applications (.war files).  Instead

-of being run from the command line, these are deployed to a suitable web

-application server (such as Apache Tomcat) and run from a browser.

-

-For each scenario, the following are listed below:

- Command(s): the command or commands for running the scenario, if any

- Directory: the current directory for the command prompt window or windows

- Webapp: .war file to be deployed for this scenario, if any

- URL(s): browser URL or URLs used to run this scenario, if any

- Contributions: SCA contributions used in this scenario

- Launchers: other launcher directories used in this scenario, if any

- Services: non-SCA services used in this scenario, if any

- Clients: non-SCA clients used in this scenario, if any

-

-1) Jumpstart - First simple example of using Tuscany

-

-Command: ant run

-Directory: launchers/jumpstart

-Contributions: introducing-trips

-

-2) Introducing - Simplified introduction to the travel application

-

-Command: ant run 

-Directory: launchers/introducing

-Contributions: introducing-client, introducing-tours, introducing-trips

-

-3) Introducing (distributed) - Distributed services with a domain manager

-

-Commands: ant run-domain, ant run-trips, ant run-tours, ant run

-Directory: launchers/introducing-client

-Contributions: introducing-client, introducing-tours, introducing-trips

-Launchers: introducing-domain, introducing-tours, introducing-trips

-

-4) Interaction - Different SCA interaction styles 

-

-Command: ant run

-Directory: launchers/interaction

-Contributions: calendar, common, currency, flight, hotel, interaction-client, 

-   interaction-service-remote, shoppingcart

-

-5) Full application - The full interactive travel application

-

-Command: ant run

-Directory: launchers/fullapp

-URL: http://localhost:8080/scatours

-Contributions: car, common, creditcard-payment-jaxb-policy, currency, flight,

-   fullapp-bespoketrip, fullapp-coordination, fullapp-currency, fullapp-packagedtrip,

-   fullapp-shoppingcart, fullapp-ui, hotel, payment-spring-policy, scatours,

-   shoppingcart, travelcatalog, trip, tripbooking

-

-6) Full application (distributed) - Distributed services with a domain manager

-

-Commands: ant run-domain, ant run

-Directory: launchers/fullapp-nodes

-URL: http://localhost:8080/scatours

-Contributions: car, common, creditcard-payment-jaxb-policy, currency, flight,

-   fullapp-bespoketrip, fullapp-coordination, fullapp-currency, fullapp-packagedtrip,

-   fullapp-shoppingcart, fullapp-ui, hotel, payment-spring-policy, scatours,

-   shoppingcart, travelcatalog, trip, tripbooking

-Launchers: fullapp-domain

-

-7) Building blocks - Using SCA composites as application building blocks

-

-Commands: ant run

-Directory: launchers/buildingblocks

-Contributions: buildingblocks, buildingblocks-client, introducing-trips

-

-8) Blog feed

-

-Command: ant run

-Directory: launchers/blog-feed

-URLs: http://localhost:8090/BlogAtom, http://localhost:8090/BlogRSS,

-   http://localhost:8090/BlogAtomAPIs, http://localhost:8090/BlogRSSAPIs

-Contributions: blog-feed

-

-9) Data binding

-

-Command: ant run

-Directory: launchers/databinding

-Contributions: creditcard-payment-sdo, databinding-client, payment-java

-

-10) Feed logger

-

-Command: ant run

-Directory: launchers/feed-logger

-Contributions: feed-logger

-

-11) Help pages

-

-Command: ant run

-Directory: launchers/help-pages

-URL: http://localhost:8085/help/index.html

-Contributions: help-pages

-

-12) Policy

-

-Command: ant run

-Directory: launchers/policy

-Contributions: creditcard-payment-jaxb-policy, payment-java-policy, policy-client

-

-13) Payment service with different implementation types

-

-13a) implementation.bpel

-

-Command: ant run

-Directory: launchers/payment-bpel

-Contributions: creditcard-payment-jaxb, emailgateway, payment-bpel, payment-bpel-process 

-

-13b) implementation.script written in Groovy

-

-Command: ant run

-Directory: launchers/payment-groovy

-Contributions: creditcard-payment-jaxb, emailgateway, payment-groovy

-

-13c) implementation.java

-

-Command: ant run

-Directory: launchers/payment-java

-Contributions: creditcard-payment-jaxb, payment-java 

-

-13d) implementation.java with policy

-

-Command: ant run

-Directory: launchers/payment-java-policy

-Contributions: creditcard-payment-jaxb-policy, payment-java-policy 

-

-13e) implementation.spring

-

-Command: ant run

-Directory: launchers/payment-spring

-Contributions: creditcard-payment-jaxb, payment-spring

-

-13f) implementation.spring with SCA tags

-

-Command: ant run

-Directory: launchers/payment-spring-scatag

-Contributions: creditcard-payment-jaxb, payment-spring-scatag

-

-14) SCA service packaged in a web application

-

-Webapp: scatours-contribution-creditcard-payment-webapp.war

-Contributions: creditcard-payment-jaxb, creditcard-payment-webapp

-URL: http://localhost:8080/scatours-contribution-creditcard-payment-webapp

-

-Note: The host name and port number may differ depending on the configuration

-of the web application server.

-

-15) SCA currency converter service interoperating with SCA or non-SCA client

-

-15a) SCA client

-

-Command: ant run

-Directory: launchers/currency-converter

-Contributions: currency

-

-15b) CORBA client

-

-Commands: ant run, ant run-client

-Directory: launchers/currency-converter-corba

-Contributions: currency, currency-corba

-Clients: currency-converter-corba

-

-15c) JMS client

-

-Commands: ant run, ant run-client

-Directory: launchers/currency-converter-jms

-Contributions: currency, currency-jms

-Clients: currency-converter-jms

-

-15d) RMI client

-

-Commands: ant run, ant run-client

-Directory: launchers/currency-converter-rmi

-Contributions: currency, currency-rmi

-Clients: currency-converter-rmi

-

-15e) JAX-WS client

-

-Commands: ant run, ant run-client

-Directory: launchers/currency-converter-ws

-Contributions: currency, currency-ws

-Clients: currency-converter-ws-jaxws

-

-15f) Web application JSP client

-

-Webapp: scatours-contribution-currency-jsp.war

-Contributions: currency, currency-jsp

-URL: http://localhost:8080/scatours-contribution-currency-jsp

-

-Note: The URL host name and port number may differ depending on the

-configuration of the web application server.

-

-15g) Web application servlet client

-

-Webapp: scatours-contribution-currency-servlet.war

-Contributions: currency, currency-servlet

-URL: http://localhost:8080/scatours-contribution-currency-servlet

-

-Note: The URL host name and port number may differ depending on the

-configuration of the web application server.

-

-16) SCA notification service interoperating with non-SCA SMS gateway service

-

-16a) SMS gateway CORBA service

-

-Commands: ant run-smsgateway, ant run 

-Directory: launchers/notification-corba

-Contributions: notification, notification-corba

-Services: smsgateway-corba

-

-16b) SMS gateway EJB service

-

-Commands: ant run-smsgateway, ant run 

-Directory: launchers/notification-ejb

-Contributions: notification, notification-ejb

-Services: smsgateway-ejb

-

-16c) SMS gateway JMS service

-

-Commands: ant run-smsgateway, ant run 

-Directory: launchers/notification-jms

-Contributions: notification, notification-jms

-Services: smsgateway-jms

-

-16d) SMS gateway RMI service

-

-Commands: ant run-smsgateway, ant run 

-Directory: launchers/notification-rmi

-Contributions: notification, notification-rmi

-Services: smsgateway-rmi

-

-16e) SMS gateway JAX-WS service

-

-Commands: ant run-smsgateway, ant run 

-Directory: launchers/notification-ws

-Contributions: notification, notification-ws

-Services: smsgateway-jaxws

-

-

-Running the travel sample from the distribution directories

------------------------------------------------------------

-

-If the travel sample was built using maven, a binary distribution

-directory will be created containing all the built jar files, together with

-some directories containing runtime dependencies for these jar files.

-

-The following directories contain the jar files for the travel sample:

-  clients - non-SCA clients using various communication technologies

-  contributions - SCA contributions for the travel sample

-  launchers - executable launchers for the travel sample

-  services - non-SCA services using various communication technologies

-  util - jar files needed by other jars in the travel sample

-

-The following directories contain runtime dependencies of the above jar files:

-  domainconfig - domain configuration files

-  jaxws - JAX-WS runtime jars neeed when running the travel sample on JDK 5

-  lib - Tuscany runtime jars and their dependencies needed by the travel sample

-     (only present if the travel sample was  built using "mvn -Pselfcontained")

-  ode - JPA Derby database needed by the ODE runtime

-  openejb - OpenEJB 3.1.2 runtime jars needed by the travel sample

-

-You can run each of the scenarios from the binary distribution by running one

-or more jar files using ant scripts that are included in the binary distribution.

-

-The ant commands that you need to use for running each scenario are listed below.

-If multiple ant commands are listed for a scenario, they must be run in

-separate processes in the order listed.  The current directory when invoking

-the ant command must be set as follows:

- launchers/scatours-launcher-*.jar are run from the launchers directory 

- clients/scatours-client-*.jar are run from the clients directory 

- services/scatours-service-*.jar are run from the services directory

- 

-To run a jar, you need to used the command "ant run-jarsuffix" where

-"jarsuffix" is the last part of the jar file name omitting the standard prefix

-"scatours-client", "scatours-launcher" or "scatours-service".  For example,

-to run the "jumpstart" scenario, you would set your current directory to the

-binary distribution "launchers" directory and run the command

-  ant run-jumpstart

-This runs the travel sample jar file scatours-launcher-jumpstart.jar using a

-classpath with the required runtime dependencies from the Tuscany SCA binary

-distribution.  The location of the Tuscany SCA binary distribution is specified

-by the TUSCANY_HOME environment variable).

-

-If the travel sample binary distribution was built using the "mvn -Pselfcontained"

-command, you can use the "java -jar" command to run the travel sample executable

-jars directly as an alternative to using ant scripts.  For example, instead of

-using the command

-  ant run-jumpstart

-you can use the command

-  java -jar scatours-launcher-jumpstart.jar

-

-Here is a complete list of the ant commands to run the scenarios described above

-from the travel sample binary distribution.  These are run from the "launchers"

-directory unlesss otherwise indicated.

-

- 1) Jumpstart - First simple example of using Tuscany

-   ant run-jumpstart

-

- 2) Introducing - Simplified introduction to the travel application

-   ant run-introducing

-

- 3) Introducing (distributed) - Distributed services with a domain manager

-   ant run-introducing-domain

-   ant run-introducing-trips

-   ant run-introducing-tours

-   ant run-introducing-client

-

- 4) Interaction - Different SCA interaction styles 

-   ant run-interaction

-

- 5) Full application - The full interactive travel application

-   jant run-fullapp

-

- 6) Full application (distributed) - Distributed services with a domain manager

-   ant run-fullapp-domain

-   ant run-fullapp-nodes

-

- 7) Building blocks - Using SCA composites as application building blocks

-   ant run-buildingblocks

-

- 8) Blog feed

-   ant run-blog-feed

-

- 9) Data binding

-   ant run-databinding

-

-10) Feed logger

-   ant run-feed-logger

-

-11) Help pages

-   ant run-help-pages

-

-12) Policy

-   ant run-policy

-

-13) Payment service with different implementation types

-

-13a) implementation.bpel

-   ant run-payment-bpel

-

-13b) implementation.script written in Groovy

-   ant run-payment-groovy

-

-13c) implementation.java

-   ant run-payment-java

-

-13d) implementation.java with policy

-   ant run-payment-java-policy

-

-13e) implementation.spring

-   ant run-payment-spring

-

-13f) implementation.spring with SCA tags

-   ant run-payment-spring-scatag

-

-14) SCA service packaged in a web application

-   not available in binary distribution

-

-15) SCA currency converter service interoperating with SCA or non-SCA client

-

-15a) SCA client

-   ant run-currency-converter

-

-15b) CORBA client

-   ant run-currency-converter-corba

-   ant run-currency-converter-corba (from "clients" directory)

-

-15c) JMS client

-   ant run-currency-converter-jms

-   ant run-currency-converter-jms (from "clients" directory)

-

-15d) RMI client

-   ant run-currency-converter-rmi

-   ant run-currency-converter-rmi (from "clients" directory)

-

-15e) JAX-WS client

-   ant run-currency-converter-ws

-   ant run-currency-converter-ws-jaxws (from "clients" directory)

-

-15f) Web application JSP client

-   not available in binary distribution

-

-15g) Web application servlet client

-   not available in binary distribution

-

-16) SCA notification service interoperating with non-SCA SMS gateway service

-

-16a) SMS gateway CORBA service

-   ant run-smsgateway-corba (from "services" directory)

-   ant run-notification-corba

-

-16b) SMS gateway EJB service

-   ant run-smsgateway-ejb (from "services" directory)

-   ant run-notification-ejb

-

-16c) SMS gateway JMS service

-   ant run-smsgateway-jms (from "services" directory)

-   ant run-notification-jms

-

-16d) SMS gateway RMI service

-   ant run-smsgateway-rmi (from "services" directory)

-   ant run-notification-rmi

-

-16e) SMS gateway JAX-WS service

-   ant run-smsgateway-jaxws (from "services" directory)

-   ant run-notification-ws

-

-

-Cross-reference of contributions to scenarios

----------------------------------------------

-

-The following table shows which contributions are used in which scenarios.

-

-contributions/blog-feed  8

-contributions/buildingblocks  7

-contributions/buildingblocks-client  7

-contributions/calendar  4

-contributions/car  5, 6

-contributions/common  4, 5, 6

-contributions/creditcard-payment-jaxb  13a, 13b, 13c, 13e, 13f, 14

-contributions/creditcard-payment-jaxb-policy  5, 6, 12, 13d

-contributions/creditcard-payment-sdo  9

-contributions/creditcard-payment-webapp  14

-contributions/currency  4, 5, 6, 15a, 15b, 15c, 15d, 15e, 15f, 15g

-contributions/currency-corba  15b

-contributions/currency-jms  15c

-contributions/currency-jsp  15f

-contributions/currency-rmi  15d

-contributions/currency-servlet  15g

-contributions/currency-ws  15e

-contributions/databinding-client  9

-contributions/emailgateway  13a, 13b

-contributions/feed-logger  10

-contributions/flight  4, 5, 6

-contributions/fullapp-bespoketrip  5, 6

-contributions/fullapp-coordination  5, 6

-contributions/fullapp-currency  5, 6

-contributions/fullapp-packagedtrip  5, 6 

-contributions/fullapp-shoppingcart  5, 6

-contributions/fullapp-ui  5, 6

-contributions/help-pages  11

-contributions/hotel  5, 6

-contributions/interaction-client  4

-contributions/interaction-service-remote  4

-contributions/introducing-client  2, 3

-contributions/introducing-tours  2, 3

-contributions/introducing-trips  1, 2, 3, 7

-contributions/notification  16a, 16b, 16c, 16d

-contributions/notification-corba  16a

-contributions/notification-ejb  16b

-contributions/notification-jms  16c

-contributions/notification-rmi  16d

-contributions/payment-bpel  13a

-contributions/payment-bpel-process  13a

-contributions/payment-groovy  13b

-contributions/payment-java  9, 13c

-contributions/payment-java-policy  12, 13d

-contributions/payment-spring  13e

-contributions/payment-spring-policy  5, 6

-contributions/payment-spring-scatag  13f

-contributions/policy-client  12

-contributions/scatours  5, 6

-contributions/shoppingcart  4, 5, 6

-contributions/travelcatalog  5, 6

-contributions/trip  5, 6

-contributions/tripbooking  5, 6

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/antdefs.xml b/sca-java-2.x/trunk/tutorials/travelsample/antdefs.xml
deleted file mode 100644
index 5b5a4efb67..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/antdefs.xml
+++ /dev/null
@@ -1,621 +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.

--->

-

-<!--

-   This file is designed to be imported by build.xml files to provide

-   definitions for a default set of build targets.  The build.xml file

-   can include additional definitions to configure the behavior of these

-   default targets.  The build.xml file can also define any additional

-   targets that are needed by the project.

-

-   This build file has been tested with JDK 5 update 22 and JDK 6 update 7.

-

-   When invoking a build.xml file that imports this file, the following

-   environment variables must be set:

-     TUSCANY_HOME A directory containing the Tuscany SCA binary distribution.

-       This build file has been tested with Tuscany SCA version 1.6.

-     JUNIT_JAR The location of the JUnit jar file.  This build file has

-       been tested with JUnit version 4.5.

-     JAXWS_HOME (only if using JDK 5) A directory containing the JAX-WS

-       reference implementation.  This build file has been tested with

-       the JAX-WS RI version 2.1.7.

-

-   This file defines the following targets that can be used on the

-   ant command that invokes the build.xml file:

-     "compile" Compiles any Java source files that don't have an up-to-date

-       class file, and copies any files in or under the resource directory.

-       If the build.xml file contains a <path> element with the id

-       "compile-path", the contents of this path are added to the compiler's

-       classpath.  Also invokes the following targets:

-       . "wsdljava" (defined in the build.xml file) if there are any

-           .wsdl files in or under the resource directory

-       . "idljava" (defined in the build.xml file) if there are any

-           .idl files in or under the resource directory

-       . "test" if there are any files in or under the src/test/java

-           directory

-       . "package" if all previous steps completed successfully

-     "test" Compiles any Java unit test files that don't have an

-       up-to-date class file, copies any test resources in or under the

-       src/test/resources directory, and runs the unit tests.  If the

-       build.xml file contains a <path> element with the id "test-path",

-       the contents of this path are used for compiling and running the

-       unit tests.  In addition, the "compile-path" setting (if specified)

-       is used for running unit tests.  If the build.xml file defines the

-       "test-setup" property, the "testsetup" target in the build.xml

-       file is invoked after copying the test resources.

-     "package" Creates a jar file containing the compiled Java class

-        files (excluding unit test code) and any files in or under the

-        resource directory, unless the jar file is already up to date.

-        If the build.xml file defines a path with id "package-path", this

-        path is used for the Class-Path manifest entry.

-     "clean" Deletes all the files produced by the build.

-

-   This file also defines the following targets for invocation by <antcall>

-   from the build.xml file:

-     "wsimport" Generates Java code from a WSDL file (unless the Java code

-       is already up to date) by running the wsimport command (on JDK 6)

-       or by calling the equivalent class in the JAX-WS RI (on JDK 5).

-       Requires the following parameters:

-       . <package> the Java package to use for generated code

-       . <wsdlfile> the filename of the WSDL file

-       . <javaclass> the filename of any Java class file that will be

-           generated by running this target on the WSDL file

-     "sdojavagen" Generates Java code from a WSDL file (unless the Java

-       code is already up to date) by running the SDO XSD2JavaGenerator.

-       Requires the same parameters as <wsimport>, plus the following:

-       . <prefix> the prefix string for naming the generated factory

-     "idlj" Generates Java code from a CORBA IDL file (unless the Java

-       code is already up to date) by running the JDK idlj command.

-       Requires the following parameters:

-       . <idljopts> the options to be used on this idlj command invocation

-       . <idlfile> the filename of the IDL file

-       . <javaclass> the filename of any Java class file that will be

-           generated by running this target for this IDL file

-     "add-implementation-web" Adds implementation.web support to the

-       installed Tuscany SCA binary distribution if not already there.

-

-   All other targets defined by this file (with names starting with "#")

-   are for internal use within this file and should not be used externally.

--->

-

-<project name="antdefs">

-    <property environment="env"/> 

-    <fail unless="env.TUSCANY_HOME">

-        Error: Please set the TUSCANY_HOME environment variable.

-    </fail>

-    <fail unless="env.JUNIT_JAR">

-        Error: Please set the JUNIT_JAR environment variable.

-    </fail>

-

-    <!-- check whether there are any WSDL files in or under the resource directory -->

-    <target name="#find-wsdlfiles">

-        <fileset id="#allwsdl" dir="src/main/resources">

-            <include name="**/*.wsdl"/>

-        </fileset>

-        <condition property="#wsdlfiles">

-            <and>

-                <available file="src/main/resources" type="dir"/>

-                <resourcecount refid="#allwsdl" when="greater" count="0"/>

-            </and>

-        </condition>

-    </target>

-

-    <!-- call the wsdljava target in the build.xml file if required -->

-    <target name="#call-wsdljava" depends="#find-wsdlfiles" if="#wsdlfiles">

-        <antcall target="wsdljava"/>

-    </target>

-

-    <!-- check whether the WSDL-generated Java code is already up to date -->

-    <target name="#wsdlcheck">

-        <condition property="#wsdl-uptodate">

-            <uptodate srcfile="src/main/resources/${wsdlfile}"

-                      targetfile="target/classes/${javaclass}"/>

-        </condition>

-    </target>

-

-    <!-- run the wsimport command if required -->

-    <target name="wsimport" depends="#wsdlcheck" unless="#wsdl-uptodate">

-        <antcall target="#wsimport"/>

-	</target>

-

-    <!-- check whether the wsimport command is available in the JDK -->

-    <target name="#is-jdk-wsimport">

-        <condition property="#jdk-wsimport">

-            <or>

-                <available file="${java.home}/../bin/wsimport" type="file"/>

-                <available file="${java.home}/../bin/wsimport.exe" type="file"/>

-            </or>

-        </condition>

-    </target>

-

-    <!-- run the JDK wsimport command if available -->

-    <target name="#wsimport-jdk" if="#jdk-wsimport">

-        <mkdir dir="target/jaxws-source"/>

-        <exec executable="${java.home}/../bin/wsimport" dir="." failonerror="true">

-            <arg line="-keep -s ./target/jaxws-source -p ${package} 

-                       -d ./target/classes src/main/resources/${wsdlfile}"/>

-        </exec>

-    </target>

-

-    <!-- run the com.sun.tools.ws.WsImport class in jaxws-tools.jar if available -->

-    <target name="#wsimport-jaxws" unless="#jdk-wsimport">

-        <condition property="#jaxws-tools">

-            <available file="${env.JAXWS_HOME}/lib/jaxws-tools.jar" type="file"/>

-        </condition>

-        <fail unless="#jaxws-tools">

-            Error: Could not find wsimport executable or jaxws-tools.jar.

-        </fail>

-        <mkdir dir="target/jaxws-source"/>

-        <java classname="com.sun.tools.ws.WsImport" fork="true" dir="." failonerror="true">

-            <arg line="-keep -s ./target/jaxws-source -p ${package} 

-                       -d ./target/classes src/main/resources/${wsdlfile}"/>

-            <classpath location="${env.JAXWS_HOME}/lib/jaxws-tools.jar"/>

-        </java>

-    </target>

-

-    <!-- run the wsimport command in JDK 6 or use jaxws-tools.jar on JDK 5 -->

-    <target name="#wsimport" depends="#is-jdk-wsimport, #wsimport-jdk, #wsimport-jaxws"/>

-

-    <!-- run the SDO XSD2JavaGenerator if required, then compile the generated Java source -->

-    <target name="sdojavagen" depends="#wsdlcheck" unless="#wsdl-uptodate">

-        <mkdir dir="target/sdo-source"/>

-        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true" dir="." failonerror="true">

-            <arg value="-javaPackage"/>

-            <arg value="${package}"/>

-            <arg value="-prefix"/>

-            <arg value="${prefix}"/>

-            <arg value="-noNotification"/>

-            <arg value="-noContainment"/>

-            <arg value="-noUnsettable"/>

-            <arg value="-targetDirectory"/>

-            <arg value="target/sdo-source"/>

-            <arg value="src/main/resources/${wsdlfile}"/>

-            <classpath location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-        </java>

-        <javac destdir="target/classes" debug="true" source="1.5" target="1.5">

-            <src path="target/sdo-source"/>

-            <classpath location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-        </javac>

-    </target>

-

-    <!-- check whether there are any CORBA IDL files in or under the resource directory -->

-    <target name="#find-idlfiles">

-        <fileset id="#allidl" dir="src/main/resources">

-            <include name="**/*.idl"/>

-        </fileset>

-        <condition property="#idlfiles">

-            <and>

-                <available file="src/main/resources" type="dir"/>

-                <resourcecount refid="#allidl" when="greater" count="0"/>

-            </and>

-        </condition>

-    </target>

-

-    <!-- call the idljava target in the build.xml file if required -->

-    <target name="#call-idljava" depends="#find-idlfiles" if="#idlfiles">

-        <antcall target="idljava"/>

-    </target>

-

-    <!-- check whether the IDL-generated Java code is already up to date -->

-    <target name="#idlcheck">

-        <condition property="#idl-uptodate">

-            <uptodate srcfile="src/main/resources/${idlfile}"

-                      targetfile="target/classes/${javaclass}"/>

-        </condition>

-    </target>

-

-    <!-- run the JDK idlj command if required, then compile the generated Java source -->

-    <target name="idlj" depends="#idlcheck" unless="#idl-uptodate">

-        <mkdir dir="target/idlj-source"/>

-        <exec executable="${java.home}/../bin/idlj" dir="." failonerror="true">

-            <arg value="${idljopts}"/>

-            <arg value="-td"/>

-            <arg value="target/idlj-source"/>

-            <arg value="src/main/resources/${idlfile}"/>

-        </exec>

-        <javac destdir="target/classes" debug="true" source="1.5" target="1.5">

-            <src path="target/idlj-source"/>

-        </javac>

-    </target>

-

-    <!-- check whether there are any Java source files to compile -->

-    <target name="#find-javafiles">

-        <fileset id="#alljava" dir="src/main/java">

-            <include name="**/*.java"/>

-        </fileset>

-        <condition property="#javafiles">

-            <and>

-                <available file="src/main/java" type="dir"/>

-                <resourcecount refid="#alljava" when="greater" count="0"/>

-            </and>

-        </condition>

-    </target>

-

-    <!-- compile the Java source files -->

-    <target name="#src-compile" depends="#find-javafiles" if="#javafiles">

-        <antcall target="#run-compile"/>

-    </target>

-

-    <!-- check whether a dependency path for the Java compiler was specified -->

-    <target name="#check-compile-path">

-        <condition property="#compile-path">

-            <isreference refid="compile-path"/>

-        </condition>

-    </target>

-

-    <!-- set classpath for Java compiler to include specified additional path -->

-    <target name="#set-compile-path" if="#compile-path">

-        <path id="#javac-classpath">

-            <path refid="compile-path"/>

-        </path>

-    </target>

-

-    <!-- set default classpath for Java compiler if no additional path specified -->

-    <target name="#default-compile-path" unless="#compile-path">

-        <path id="#javac-classpath"/>

-    </target>

-

-    <!-- set the Java compiler classpath -->

-    <target name="#set-javac-classpath" depends="#check-compile-path, #set-compile-path, #default-compile-path"/>

-

-    <!-- compile the Java source files -->

-    <target name="#run-compile" depends="#set-javac-classpath">

-        <javac destdir="target/classes" debug="true" source="1.5" target="1.5">

-            <src path="src/main/java"/>

-            <classpath>

-                <path refid="#javac-classpath"/>

-                <pathelement path="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </javac>

-    </target>

-

-    <!-- check whether there are any resources to copy -->

-    <target name="#find-resources">

-        <fileset id="#allresources" dir="src/main/resources"/>

-        <condition property="#resources">

-            <and>

-                <available file="src/main/resources" type="dir"/>

-                <resourcecount refid="#allresources" when="greater" count="0"/>

-            </and>

-        </condition>

-    </target>

-

-    <!-- copy the contents of the resource directory -->

-    <target name="#copy-resources" depends="#find-resources" if="#resources">

-        <copy todir="target/classes">

-            <fileset dir="src/main/resources"/>

-        </copy>

-    </target>

-

-    <!-- check whether there are any Java files in or under the test directory -->

-    <target name="#find-testjava">

-        <fileset id="#alltestjava" dir="src/test/java">

-            <include name="**/*.java"/>

-        </fileset>

-        <condition property="#testjava">

-            <and>

-                <available file="src/test/java" type="dir"/>

-                <resourcecount refid="#alltestjava" when="greater" count="0"/>

-            </and>

-        </condition>

-    </target>

-

-    <!-- call the test target if required -->

-    <target name="#call-test" depends="#find-testjava" if="#testjava">

-        <antcall target="test"/>

-    </target>

-

-    <!-- check whether there are any test resources to copy -->

-    <target name="#find-testresources">

-        <fileset id="#alltestresources" dir="src/test/resources"/>

-        <condition property="#testresources">

-            <and>

-                <available file="src/test/resources" type="dir"/>

-                <resourcecount refid="#alltestresources" when="greater" count="0"/>

-            </and>

-        </condition>

-    </target>

-

-    <!-- copy the test resources -->

-    <target name="#copy-testresources" depends="#find-testresources" if="#testresources">

-        <copy todir="target/test-classes">

-            <fileset dir="src/test/resources"/>

-        </copy>

-    </target>

-

-    <!-- perform additional test setup if required -->

-    <target name="#test-setup" if="test-setup">

-        <antcall target="testsetup"/>

-    </target>

-

-    <!-- check whether a dependency path for the unit tests was specified -->

-    <target name="#check-test-path">

-        <condition property="#test-path">

-            <isreference refid="test-path"/>

-        </condition>

-    </target>

-

-    <!-- set classpath for unit tests to include specified additional path -->

-    <target name="#set-test-path" if="#test-path">

-        <path id="#test-classpath">

-            <path refid="test-path"/>

-        </path>

-    </target>

-

-    <!-- set default classpath for unit tests if no additional path specified -->

-    <target name="#default-test-path" unless="#test-path">

-        <path id="#test-classpath"/>

-    </target>

-

-    <!-- set the Java compiler test classpath -->

-    <target name="#set-test-classpath" depends="#check-test-path, #set-test-path, #default-test-path"/>

-

-    <!-- compile the test classes -->

-    <target name="#test-compile" depends="#set-test-classpath">

-        <javac destdir="target/test-classes" debug="true" source="1.5" target="1.5">

-            <src path="src/test/java"/>

-            <classpath>

-                <pathelement location="target/classes"/>

-                <path refid="#test-classpath"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-                <pathelement location="${env.JUNIT_JAR}"/>

-            </classpath>

-        </javac>

-    </target>

-

-    <!-- run the junit task -->

-    <target name="#run-junit" depends="#set-test-classpath, #set-javac-classpath">

-        <junit printsummary="no" dir="." fork="true" forkmode="once" haltonfailure="true">

-            <classpath>

-                <pathelement location="target/test-classes"/>

-                <path refid="#test-classpath"/>

-                <pathelement location="target/classes"/>

-                <path refid="#javac-classpath"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-                <pathelement location="${env.JUNIT_JAR}"/>

-            </classpath>

-            <formatter type="plain" usefile="false"/>

-            <batchtest>

-                <fileset dir="src/test/java">

-                    <include name="**/*TestCase.java"/>

-                </fileset>

-            </batchtest>

-        </junit>

-    </target>

-

-    <!-- check whether the Tuscany SCA version is 1.5.1 -->

-    <target name="#find-tuscany-1.5.1">

-        <fileset id="#tuscany-assembly-1.5.1" dir="${env.TUSCANY_HOME}/modules">

-            <include name="tuscany-assembly-1.5.1.jar"/>

-        </fileset>

-        <condition property="#tuscany-version" value="1.5.1">

-            <resourcecount refid="#tuscany-assembly-1.5.1" when="greater" count="0"/>

-        </condition>

-        <condition property="#tuscany-repo" value="m2-ibiblio-rsync-repository">

-            <resourcecount refid="#tuscany-assembly-1.5.1" when="greater" count="0"/>

-        </condition>

-    </target>

-

-    <!-- check whether the Tuscany SCA version is 1.6-SNAPSHOT -->

-    <target name="#find-tuscany-1.6-SNAPSHOT" unless="#tuscany-version">

-        <fileset id="#tuscany-assembly-1.6-SNAPSHOT" dir="${env.TUSCANY_HOME}/modules">

-            <include name="tuscany-assembly-1.6-SNAPSHOT.jar"/>

-        </fileset>

-        <condition property="#tuscany-version" value="1.6-SNAPSHOT">

-            <resourcecount refid="#tuscany-assembly-1.6-SNAPSHOT" when="greater" count="0"/>

-        </condition>

-        <condition property="#tuscany-baseversion" value="1.6">

-            <resourcecount refid="#tuscany-assembly-1.6-SNAPSHOT" when="greater" count="0"/>

-        </condition>

-        <condition property="#tuscany-repo" value="m2-snapshot-repository">

-            <resourcecount refid="#tuscany-assembly-1.6-SNAPSHOT" when="greater" count="0"/>

-        </condition>

-    </target>

-

-    <!-- check whether the Tuscany SCA version is 1.6 -->

-    <target name="#find-tuscany-1.6" unless="#tuscany-version">

-        <fileset id="#tuscany-assembly-1.6" dir="${env.TUSCANY_HOME}/modules">

-            <include name="tuscany-assembly-1.6.jar"/>

-        </fileset>

-        <condition property="#tuscany-version" value="1.6">

-            <resourcecount refid="#tuscany-assembly-1.6" when="greater" count="0"/>

-        </condition>

-        <condition property="#tuscany-repo" value="m2-ibiblio-rsync-repository">

-            <resourcecount refid="#tuscany-assembly-1.6" when="greater" count="0"/>

-        </condition>

-    </target>

-

-    <!-- check whether the Tuscany SCA version is 1.7-SNAPSHOT -->

-    <target name="#find-tuscany-1.7-SNAPSHOT" unless="#tuscany-version">

-        <fileset id="#tuscany-assembly-1.7-SNAPSHOT" dir="${env.TUSCANY_HOME}/modules">

-            <include name="tuscany-assembly-1.7-SNAPSHOT.jar"/>

-        </fileset>

-        <condition property="#tuscany-version" value="1.7-SNAPSHOT">

-            <resourcecount refid="#tuscany-assembly-1.7-SNAPSHOT" when="greater" count="0"/>

-        </condition>

-        <condition property="#tuscany-baseversion" value="1.7">

-            <resourcecount refid="#tuscany-assembly-1.7-SNAPSHOT" when="greater" count="0"/>

-        </condition>

-        <condition property="#tuscany-repo" value="m2-snapshot-repository">

-            <resourcecount refid="#tuscany-assembly-1.7-SNAPSHOT" when="greater" count="0"/>

-        </condition>

-    </target>

-

-    <!-- find the Tuscany SCA version that matches the JAVA_HOME environment variable -->

-    <target name="#find-tuscany-version" depends="#find-tuscany-1.5.1, #find-tuscany-1.6-SNAPSHOT,

-                                                  #find-tuscany-1.6, #find-tuscany-1.7-SNAPSHOT">

-        <fail unless="#tuscany-version">

-            Error: Unknown Tuscany version for JAVA_HOME environment variable.

-        </fail>

-    </target>

-

-    <!-- check whether the installed Tuscany SCA binary distribution includes implementation.web support -->

-    <target name="#check-implementation-web">

-        <fileset id="#implweb-before-copy" dir="${env.TUSCANY_HOME}/modules">

-            <include name="tuscany-implementation-web-${#tuscany-version}.jar"/>

-            <include name="tuscany-implementation-web-runtime-${#tuscany-version}.jar"/>

-        </fileset>

-        <condition property="#has-implementation-web">

-            <resourcecount refid="#implweb-before-copy" when="equal" count="2"/>

-        </condition>

-    </target>

-

-    <!-- check whether the installed Tuscany SCA binary distribution is a snapshot -->

-    <target name="#check-tuscany-snapshot">

-        <condition property="#tuscany-snapshot">

-            <equals arg1="${#tuscany-repo}" arg2="m2-snapshot-repository"/>

-        </condition>

-    </target>

- 

-    <!-- copy implementation.web support to the installed Tuscany SCA snapshot binary distribution -->

-    <target name="#copy-impl-web-snapshot" if="#tuscany-snapshot">

-        <xmlproperty>

-            <url url="http://people.apache.org/repo/${#tuscany-repo}/org/apache/tuscany/sca/tuscany-implementation-web/${#tuscany-version}/maven-metadata.xml"/>

-        </xmlproperty>   

-        <copy todir="${env.TUSCANY_HOME}/modules" flatten="true">

-            <url url="http://people.apache.org/repo/${#tuscany-repo}/org/apache/tuscany/sca/tuscany-implementation-web/${#tuscany-version}/tuscany-implementation-web-${#tuscany-baseversion}-${metadata.versioning.snapshot.timestamp}-${metadata.versioning.snapshot.buildNumber}.jar"/>

-            <url url="http://people.apache.org/repo/${#tuscany-repo}/org/apache/tuscany/sca/tuscany-implementation-web-runtime/${#tuscany-version}/tuscany-implementation-web-runtime-${#tuscany-baseversion}-${metadata.versioning.snapshot.timestamp}-${metadata.versioning.snapshot.buildNumber}.jar"/>

-        </copy>

-        <!-- need to copy and move because of ant 1.7.1 bug when copying with tofile and url -->

-        <move file="${env.TUSCANY_HOME}/modules/tuscany-implementation-web-${#tuscany-baseversion}-${metadata.versioning.snapshot.timestamp}-${metadata.versioning.snapshot.buildNumber}.jar" tofile="${env.TUSCANY_HOME}/modules/tuscany-implementation-web-${#tuscany-version}.jar"/>

-        <move file="${env.TUSCANY_HOME}/modules/tuscany-implementation-web-runtime-${#tuscany-baseversion}-${metadata.versioning.snapshot.timestamp}-${metadata.versioning.snapshot.buildNumber}.jar" tofile="${env.TUSCANY_HOME}/modules/tuscany-implementation-web-runtime-${#tuscany-version}.jar"/>

-    </target>

- 

-    <!-- copy implementation.web support to the installed Tuscany SCA non-snapshot binary distribution -->

-    <target name="#copy-impl-web-nonsnapshot" unless="#tuscany-snapshot">

-        <copy todir="${env.TUSCANY_HOME}/modules" flatten="true">

-            <url url="http://people.apache.org/repo/${#tuscany-repo}/org/apache/tuscany/sca/tuscany-implementation-web/${#tuscany-version}/tuscany-implementation-web-${#tuscany-version}.jar"/>

-            <url url="http://people.apache.org/repo/${#tuscany-repo}/org/apache/tuscany/sca/tuscany-implementation-web-runtime/${#tuscany-version}/tuscany-implementation-web-runtime-${#tuscany-version}.jar"/>

-        </copy>

-    </target>

- 

-    <!-- copy implementation.web support to the installed Tuscany SCA binary distribution -->

-    <target name="#copy-implementation-web" depends="#check-tuscany-snapshot, #copy-impl-web-snapshot, #copy-impl-web-nonsnapshot"/>

-

-    <!-- add implementation.web support to the installed Tuscany SCA binary distribution if not already there -->

-    <target name="add-implementation-web" depends="#find-tuscany-version, #check-implementation-web" unless="#has-implementation-web">

-        <antcall target="#copy-implementation-web"/>

-        <fileset id="#implweb-after-copy" dir="${env.TUSCANY_HOME}/modules">

-            <include name="tuscany-implementation-web-${#tuscany-version}.jar"/>

-            <include name="tuscany-implementation-web-runtime-${#tuscany-version}.jar"/>

-        </fileset>

-        <condition property="#implementation-web-copied">

-            <resourcecount refid="#implweb-after-copy" when="equal" count="2"/>

-        </condition>

-        <fail unless="#implementation-web-copied">

-            Error: Unable to download tuscany-implementation-web and tuscany-implementation-web-runtime jars.

-        </fail>

-    </target>

-

-    <!-- check whether there are any files in the webapp directory -->

-    <target name="#check-webapp">

-        <fileset id="#webappfiles" dir="src/main/webapp"/>

-        <condition property="#webapp">

-            <and>

-                <available file="src/main/webapp" type="dir"/>

-                <resourcecount refid="#webappfiles" when="greater" count="0"/>

-            </and>

-        </condition>

-    </target>

-

-    <!-- build a war file if there are files in the webapp directory -->

-    <target name="#package-war" if="#webapp">

-        <mkdir dir="target/lib"/>

-        <antcall target="copy-lib"/>

-        <war destfile="target/${ant.project.name}.war" webxml="src/main/webapp/WEB-INF/web.xml"

-             excludes="**/*.cbp">

-            <fileset dir="src/main/webapp"/>

-            <lib dir="target/lib"/>

-            <classes dir="target/classes"/>

-        </war>

-    </target>

-

-    <!-- build a jar file if there are no files in the webapp directory -->

-    <target name="#package-jar" unless="#webapp">

-        <antcall target="#create-jar"/>

-    </target>

-

-    <!-- build a packaged jar file or war file -->

-    <target name="#build-package" depends="#check-webapp, #package-war, #package-jar"/>

-

-    <!-- check whether a dependency path for the package target was specified -->

-    <target name="#check-package-path">

-        <condition property="#package-path">

-            <isreference refid="package-path"/>

-        </condition>

-    </target>

-

-    <!-- create a jar file with a Class-Path attribute -->

-    <target name="#create-jar-path" if="#package-path">

-        <property name="#parentdir" location=".."/>

-        <pathconvert property="#package-classpath" refid="package-path" pathsep=" " dirsep="/">

-            <map from="${#parentdir}" to="../.."/>

-        </pathconvert>

-        <jar destfile="target/${ant.project.name}.jar" basedir="target/classes"

-             excludes="**/*.cbp">

-            <manifest>

-                <attribute name="Class-Path" value="${#package-classpath}"/>

-            </manifest>

-        </jar>

-    </target>

-

-    <!-- create a jar file without a Class-Path attribute -->

-    <target name="#create-jar-nopath" unless="#package-path">

-        <jar destfile="target/${ant.project.name}.jar" basedir="target/classes"

-             excludes="**/*.cbp"/>

-    </target>

-

-    <!-- create a jar file with or without a Class-Path attribute -->

-    <target name="#create-jar" depends="#check-package-path, #create-jar-path, #create-jar-nopath"/>

-

-    <!-- for external use on the ant command line -->

-    <target name="compile">

-        <echo message="Compiling project ${ant.project.name}"/>

-        <mkdir dir="target/classes"/>

-        <antcall target="#call-wsdljava"/>

-        <antcall target="#call-idljava"/>

-        <antcall target="#src-compile"/>

-        <antcall target="#copy-resources"/>

-        <antcall target="#call-test"/>

-        <antcall target="package"/>

-    </target>

-

-    <!-- for external use on the ant command line -->

-    <target name="test" depends="#find-testjava" if="#testjava">

-        <echo message="Testing project ${ant.project.name}"/>

-        <mkdir dir="target/test-classes"/>

-        <antcall target="#test-compile"/>

-        <antcall target="#copy-testresources"/>

-        <antcall target="#test-setup"/>

-        <antcall target="#run-junit"/>

-    </target>

-

-    <!-- for external use on the ant command line -->

-    <target name="package">

-        <echo message="Packaging project ${ant.project.name}"/>

-        <antcall target="#build-package"/>

-    </target>

-

-    <!-- for external use on the ant command line -->

-    <target name="clean">

-        <echo message="Cleaning project ${ant.project.name}"/>

-        <delete dir="target" includeemptydirs="true"/>

-    </target>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/build.xml
deleted file mode 100644
index f74b4cb2a8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/build.xml
+++ /dev/null
@@ -1,49 +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="scatours" default="compile">

-

-    <target name="compile">

-        <antcall target="allsubdirs">

-            <param name="target" value="compile"/>

-        </antcall>

-    </target>

-

-    <target name="test">

-        <antcall target="allsubdirs">

-            <param name="target" value="test"/>

-        </antcall>

-    </target>

-

-    <target name="clean">

-        <antcall target="allsubdirs">

-            <param name="target" value="clean"/>

-        </antcall>

-    </target>

-

-    <target name="allsubdirs">

-        <ant dir="util" target="${target}"/> <!--needed by launchers-->

-        <ant dir="contributions" target="${target}"/> <!--needed by launchers-->

-        <ant dir="domainconfig" target="${target}"/> <!--needed by launchers-->

-        <ant dir="services" target="${target}"/> <!--needed by launchers-->

-        <ant dir="launchers" target="${target}"/> <!--needed by clients-->

-        <ant dir="clients" target="${target}"/>

-    </target>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/build.xml
deleted file mode 100644
index 78e305c3cd..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/build.xml
+++ /dev/null
@@ -1,47 +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="scatours-clients" default="compile">

-

-    <target name="compile">

-        <antcall target="allsubdirs">

-            <param name="target" value="compile"/>

-        </antcall>

-    </target>

-

-    <target name="test">

-        <antcall target="allsubdirs">

-            <param name="target" value="test"/>

-        </antcall>

-    </target>

-

-    <target name="clean">

-        <antcall target="allsubdirs">

-            <param name="target" value="clean"/>

-        </antcall>

-    </target>

-

-    <target name="allsubdirs">

-        <ant dir="currency-converter-corba" target="${target}"/>

-        <ant dir="currency-converter-jms" target="${target}"/>

-        <ant dir="currency-converter-rmi" target="${target}"/>

-        <ant dir="currency-converter-ws-jaxws" target="${target}"/>

-    </target>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/build.xml
deleted file mode 100644
index eebbe90d4d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-client-currency-converter-corba" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="idljava">

-        <antcall target="idlj">

-            <param name="idljopts" value="-fclient"/>

-            <param name="idlfile" value="currency-converter.idl"/>

-            <param name="javaclass" value="com/tuscanyscatours/currencyconverter/CurrencyConverter.class"/>

-        </antcall>

-    </target>

-

-    <!-- Before invoking the "run" target, the CORBA implementation of the

-       currency converter service needs to be started in its own process. -->

-    <target name="run-service">

-        <ant dir="../../launchers/currency-converter-corba" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.CurrencyConverterCORBAClient" fork="true" failonerror="true">

-            <classpath location="target/${ant.project.name}.jar"/>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml
deleted file mode 100644
index e6ad5e33a8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/pom.xml
+++ /dev/null
@@ -1,85 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-client-currency-converter-corba</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter CORBA Client</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-        <finalName>${artifactId}</finalName>

-

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.CurrencyConverterCORBAClient</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>idlj-maven-plugin</artifactId>

-                <version>1.1</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-                <configuration>

-                    <compiler>idlj</compiler>

-                    <sources>

-                        <source>

-                            <includes>

-                                <include>currency-converter.idl</include>

-                            </includes>

-                            <emitStubs>true</emitStubs>

-                            <emitSkeletons>false</emitSkeletons>

-                        </source>

-                    </sources>

-                    <sourceDirectory>${basedir}/src/main/resources</sourceDirectory>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBAClient.java b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBAClient.java
deleted file mode 100644
index 7d799e459b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBAClient.java
+++ /dev/null
@@ -1,41 +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 scatours;
-
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.Object;
-
-import com.tuscanyscatours.currencyconverter.CurrencyConverter;
-import com.tuscanyscatours.currencyconverter.CurrencyConverterHelper;
-
-public class CurrencyConverterCORBAClient {
-
-    public static void main(String[] args) throws Exception {
-
-        String[] orbArgs = {"-ORBInitialPort", "5080"};
-        ORB orb = ORB.init(orbArgs, null);
-
-        String ior = "corbaname::localhost:5080#CurrencyConverterCORBAService";
-        Object obj = orb.string_to_object(ior);
-        CurrencyConverter converter = CurrencyConverterHelper.narrow(obj);
-
-        System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));
-        System.out.println("100 USD = " + converter.convert("USD", "GBP", 100.0) + "GBP");
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/src/main/resources/currency-converter.idl b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/src/main/resources/currency-converter.idl
deleted file mode 100644
index 1ff24291f5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-corba/src/main/resources/currency-converter.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
- 
-module com {
-    module tuscanyscatours {
-        module currencyconverter {
-            interface CurrencyConverter {
-                double getExchangeRate(in string fromCurrencyCode, in string toCurrencyCode);
-                double convert(in string fromCurrencyCode, in string toCurrencyCode, in double amount);
-            };
-        };
-    };
-};
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/build.xml
deleted file mode 100644
index 1e3e20e4e6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/build.xml
+++ /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.

--->

-

-<project name="scatours-client-currency-converter-jms" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <!-- Before invoking the "run" target, the JMS implementation of the

-       currency converter service needs to be started in its own process. -->

-    <target name="run-service">

-        <ant dir="../../launchers/currency-converter-jms" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.CurrencyConverterJMSClient" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <!-- The following is used to bring in the ActiveMQ runtime. -->

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml
deleted file mode 100644
index a69b843bff..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/pom.xml
+++ /dev/null
@@ -1,105 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-client-currency-converter-jms</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter JMS Client</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-all</artifactId>

-            <version>5.2.0</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.activemq</groupId>

-                    <artifactId>activemq-web-demo</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-api</artifactId>

-            <version>1.2.7</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>xerces</groupId>

-                    <artifactId>xercesImpl</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>xml-apis</groupId>

-                    <artifactId>xml-apis</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-impl</artifactId>

-            <version>1.2.7</version>

-            <scope>runtime</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.CurrencyConverterJMSClient</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>             

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSClient.java b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSClient.java
deleted file mode 100644
index 0bea38e07f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSClient.java
+++ /dev/null
@@ -1,103 +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 scatours;
-
-import java.io.ByteArrayInputStream;
-
-import javax.jms.Connection;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.axiom.om.OMAbstractFactory;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMText;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-
-public class CurrencyConverterJMSClient {
-
-    private static Connection activeMQConnection;
-    private static Session activeMQSession;
-    private static Destination requestDestination;
-    private static MessageProducer activeMQProducer;
-    private static Destination responseDestination;
-    private static MessageConsumer consumer;
-    private static OMFactory omFactory;
-
-    public static void main(String[] args) throws JMSException, XMLStreamException {
-        startActiveMQSession();
-
-        OMElement request = omFactory.createOMElement("convert", "http://goodvaluetrips.com/", "ns2");
-        request.addChild(createArg(0, "USD"));
-        request.addChild(createArg(1, "GBP"));
-        request.addChild(createArg(2, "100.0"));
-
-        TextMessage message = activeMQSession.createTextMessage("convert");
-        message.setStringProperty("scaOperationName", "convert");
-        message.setJMSReplyTo(responseDestination);
-        message.setText(request.toString());
-        activeMQProducer.send(message);
-
-        TextMessage response = (TextMessage)consumer.receive();
-        StAXOMBuilder builder = new StAXOMBuilder(new ByteArrayInputStream(response.getText().getBytes()));
-        OMText returnElement = (OMText)builder.getDocumentElement().getFirstOMChild();
-        String returnValue = returnElement.getText();
-        System.out.println("100 USD = " + returnValue + "GBP");
-
-        stopActiveMQSession();
-    }
-
-    private static void startActiveMQSession() throws JMSException {
-        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61619");
-
-        activeMQConnection = connectionFactory.createConnection();
-        activeMQConnection.start();
-
-        activeMQSession = activeMQConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
-        requestDestination = activeMQSession.createQueue("RequestQueue");
-        activeMQProducer = activeMQSession.createProducer(requestDestination);
-
-        responseDestination = activeMQSession.createQueue("ResponseQueue");
-        consumer = activeMQSession.createConsumer(responseDestination);
-
-        omFactory = OMAbstractFactory.getOMFactory();
-    }
-
-    private static void stopActiveMQSession() throws JMSException {
-        consumer.close();
-        activeMQProducer.close();
-        activeMQSession.close();
-        activeMQConnection.close();
-    }
-
-    private static OMElement createArg(int argNumber, String value) {
-        OMFactory omFactory = OMAbstractFactory.getOMFactory();
-        OMElement arg = omFactory.createOMElement("arg" + argNumber, null);
-        OMText senderOM = omFactory.createOMText(value);
-        arg.addChild(senderOM);
-        return arg;
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/build.xml
deleted file mode 100644
index 33a2db7951..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/build.xml
+++ /dev/null
@@ -1,36 +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="scatours-client-currency-converter-rmi" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <!-- Before invoking the "run" target, the RMI implementation of the

-       currency converter service needs to be started in its own process. -->

-    <target name="run-service">

-        <ant dir="../../launchers/currency-converter-rmi" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.CurrencyConverterRMIClient" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml
deleted file mode 100644
index 18ed8ce4fa..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/pom.xml
+++ /dev/null
@@ -1,59 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-client-currency-converter-rmi</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter RMI Client</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.CurrencyConverterRMIClient</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>            

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
deleted file mode 100644
index e12a95c964..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.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 com.tuscanyscatours.currencyconverter;

-

-/**

- * The CurrencyConverter service interface

- */

-public interface CurrencyConverter {

-

-    double getExchangeRate(String fromCurrencyCode, String toCurrencyCode);

-

-    double convert(String fromCurrencyCode, String toCurrencyCode, double amount);

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMIClient.java b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMIClient.java
deleted file mode 100644
index 32e4fccfce..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMIClient.java
+++ /dev/null
@@ -1,36 +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 scatours;
-
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-
-import com.tuscanyscatours.currencyconverter.CurrencyConverter;
-
-public class CurrencyConverterRMIClient {
-
-    public static void main(String[] args) throws Exception {
-        Registry registry = LocateRegistry.getRegistry("localhost", 8099);
-        String name = "CurrencyConverterRMI";
-        CurrencyConverter converter = (CurrencyConverter)registry.lookup(name);
-
-        System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));
-        System.out.println("100 USD = " + converter.convert("USD", "GBP", 100.0) + "GBP");
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml
deleted file mode 100644
index 116f2999ba..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/build.xml
+++ /dev/null
@@ -1,64 +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="scatours-client-currency-converter-ws-jaxws" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="wsdl/CurrencyConverter.wsdl"/>

-            <param name="javaclass" value="scatours/currencyconverter/client/CurrencyConverter.class"/>

-            <param name="package" value="scatours.currencyconverter.client"/>

-        </antcall>

-    </target>

-

-    <!-- Before invoking the "run" target, the Web Services implementation of

-       the currency converter service needs to be started in its own process. -->

-    <target name="run-service">

-        <ant dir="../../launchers/currency-converter-ws" target="run"/>

-    </target>

-

-    <target name="run" depends="is-jdk6, jaxws-jdk6, jaxws-jdk5">

-        <java classname="scatours.CurrencyConverterWSClient" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="jaxws-path"/>

-            </classpath>

-        </java>

-    </target>

-

-    <!-- check to see if we are running on JDK 6 -->

-    <target name="is-jdk6">

-        <condition property="jdk6">

-            <available classname="javax.xml.ws.Service"/>

-        </condition>

-    </target>

-

-    <!-- JDK 6 contains JAX-WS so we don't need it on the classpath -->

-    <target name="jaxws-jdk6" if="jdk6">

-        <path id="jaxws-path"/>

-    </target>

-

-    <!-- on JDK 5 we need to add the JAX-WS runtime to the classpath -->

-    <target name="jaxws-jdk5" unless="jdk6">

-        <path id="jaxws-path">

-            <fileset dir="${env.JAXWS_HOME}/lib"/>

-        </path>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
deleted file mode 100644
index 11eb5d52eb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/pom.xml
+++ /dev/null
@@ -1,100 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-client-currency-converter-ws-jaxws</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter Web Service JAX-WS Client</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>javax.xml.ws</groupId>

-            <artifactId>jaxws-api</artifactId>

-            <version>2.1</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>javax.xml.soap</groupId>

-                    <artifactId>saaj-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <pluginRepositories>

-        <pluginRepository>

-            <id>java.net2</id>

-            <name>java.net Maven 2.x Repository</name>

-            <url>http://download.java.net/maven/2</url>

-            <snapshots>

-                <enabled>false</enabled>

-            </snapshots>

-        </pluginRepository>

-    </pluginRepositories>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-jaxws-runtime.jar</Class-Path>

-                            <Main-Class>scatours.CurrencyConverterWSClient</Main-Class>

-                        </manifestEntries>

-                    </archive>

-                </configuration>

-            </plugin>

-                

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <wsdlDirectory>${basedir}/src/main/resources/wsdl</wsdlDirectory>

-                            <packageName>scatours.currencyconverter.client</packageName>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/src/main/java/scatours/CurrencyConverterWSClient.java b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/src/main/java/scatours/CurrencyConverterWSClient.java
deleted file mode 100644
index dbaa7c2124..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/src/main/java/scatours/CurrencyConverterWSClient.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package scatours;
-
-import scatours.currencyconverter.client.CurrencyConverter;
-import scatours.currencyconverter.client.CurrencyConverterService;
-
-public class CurrencyConverterWSClient {
-
-    public static void main(String[] args) throws Exception {
-        CurrencyConverterService service = new CurrencyConverterService();
-        CurrencyConverter converter = service.getPort(CurrencyConverter.class);
-
-        System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));
-        System.out.println("100 USD = " + converter.convert("USD", "GBP", 100.0) + "GBP");
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/src/main/resources/wsdl/CurrencyConverter.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/src/main/resources/wsdl/CurrencyConverter.wsdl
deleted file mode 100644
index 055431bbf2..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/currency-converter-ws-jaxws/src/main/resources/wsdl/CurrencyConverter.wsdl
+++ /dev/null
@@ -1,115 +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="CurrencyConverterService" targetNamespace="http://currencyconverter.tuscanyscatours.com/"
-    xmlns:tns="http://currencyconverter.tuscanyscatours.com/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/" 
-    xmlns:SOAP11="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xs:schema attributeFormDefault="qualified" elementFormDefault="unqualified" targetNamespace="http://currencyconverter.tuscanyscatours.com/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="getExchangeRate">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
-            <xs:element minOccurs="0" name="arg1" nillable="true" type="xs:string"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="convertResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="return" type="xs:double"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="getExchangeRateResponse">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="return" type="xs:double"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element name="convert">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" name="arg0" nillable="true" type="xs:string"/>
-            <xs:element minOccurs="0" name="arg1" nillable="true" type="xs:string"/>
-            <xs:element minOccurs="0" name="arg2" type="xs:double"/>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-    </xs:schema>
-  </wsdl:types>
-  <wsdl:message name="getExchangeRate">
-    <wsdl:part name="getExchangeRate" element="tns:getExchangeRate">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="convertResponse">
-    <wsdl:part name="convertResponse" element="tns:convertResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="getExchangeRateResponse">
-    <wsdl:part name="getExchangeRateResponse" element="tns:getExchangeRateResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="convert">
-    <wsdl:part name="convert" element="tns:convert">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="CurrencyConverter">
-    <wsdl:operation name="getExchangeRate">
-      <wsdl:input message="tns:getExchangeRate">
-    </wsdl:input>
-      <wsdl:output message="tns:getExchangeRateResponse">
-    </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="convert">
-      <wsdl:input message="tns:convert">
-    </wsdl:input>
-      <wsdl:output message="tns:convertResponse">
-    </wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="CurrencyConverterBinding" type="tns:CurrencyConverter">
-    <SOAP:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="getExchangeRate">
-      <SOAP:operation/>
-      <wsdl:input>
-        <SOAP:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <SOAP:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="convert">
-      <SOAP:operation/>
-      <wsdl:input>
-        <SOAP:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-        <SOAP:body use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="CurrencyConverterService">
-    <wsdl:port name="CurrencyConverterPort" binding="tns:CurrencyConverterBinding">
-      <SOAP:address location="http://localhost:8080/CurrencyConverter"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/clients/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/clients/pom.xml
deleted file mode 100644
index ea2ed780ed..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/clients/pom.xml
+++ /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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-clients</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Tours non-SCA Clients</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>currency-converter-corba</module>

-                <module>currency-converter-jms</module>

-                <module>currency-converter-rmi</module>

-                <module>currency-converter-ws-jaxws</module>

-            </modules>

-        </profile>

-

-    </profiles>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/build.xml
deleted file mode 100644
index 2f0f6b12a5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-blog-feed" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml
deleted file mode 100644
index e3f37cc21d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/pom.xml
+++ /dev/null
@@ -1,80 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-blog-feed</artifactId>

-    <name>Apache Tuscany SCA Tours Blog Feed Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-atom</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-atom-runtime</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rss-runtime</artifactId>

-            <version>${tuscany.version}</version>

-        </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/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/BlogPost.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/BlogPost.java
deleted file mode 100644
index f93fe59b9d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/BlogPost.java
+++ /dev/null
@@ -1,68 +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 com.tuscanyscatours.blog;
-
-import java.util.Date;
-
-/**
- * Bean for blog posts.
- */
-public class BlogPost {
-
-    private final String author;
-    private final String title;
-    private final String content;
-    private final Date updated;
-    private final String link;
-    private final String related;
-
-    public BlogPost(String author, String title, String content, Date updated, String link, String related) {
-        this.author = author;
-        this.title = title;
-        this.content = content;
-        this.updated = updated;
-        this.link = link;
-        this.related = related;
-    }
-
-    public String getAuthor() {
-        return author;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public Date getUpdated() {
-        return updated;
-    }
-
-    public String getLink() {
-        return link;
-    }
-
-    public String getRelated() {
-        return related;
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/AtomBlogFeedImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/AtomBlogFeedImpl.java
deleted file mode 100644
index b7a392f927..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/AtomBlogFeedImpl.java
+++ /dev/null
@@ -1,124 +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 com.tuscanyscatours.blog.feed.impl;
-
-import java.util.List;
-
-import org.apache.abdera.Abdera;
-import org.apache.abdera.factory.Factory;
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.apache.tuscany.sca.binding.atom.collection.NotFoundException;
-
-import com.tuscanyscatours.blog.BlogPost;
-
-/**
- * An Atom feed that implements the org.apache.tuscany.sca.binding.atom.collection.Collection
- * interface and uses the Atom APIs to construct the Atom feed.
- */
-public class AtomBlogFeedImpl extends BaseBlogFeedImpl implements
-    org.apache.tuscany.sca.binding.atom.collection.Collection {
-
-    /**
-     * Gets an Atom feed containing all the blog posts.
-     * 
-     * @return An Atom feed containing all the blog posts.
-     */
-    public Feed getFeed() {
-        // Create SCA Tours blog Atom feed
-        final Factory factory = Abdera.getNewFactory();
-        final Feed feed = factory.newFeed();
-        feed.setTitle(FEED_TITLE);
-        feed.setSubtitle(FEED_DESCRIPTION);
-        feed.addAuthor(FEED_AUTHOR);
-
-        // Get all blog posts and convert to Atom entries
-        final List<BlogPost> blogEntries = getAllBlogPosts();
-        for (BlogPost blogEntry : blogEntries) {
-            final Entry entry = factory.newEntry();
-            entry.setId(nextBlogID());
-            entry.addAuthor(blogEntry.getAuthor());
-            entry.setTitle(blogEntry.getTitle());
-            entry.setContentAsHtml(blogEntry.getContent());
-            entry.setUpdated(blogEntry.getUpdated());
-            entry.addLink(blogEntry.getLink());
-            feed.addEntry(entry);
-        }
-
-        return feed;
-    }
-
-    /**
-     * Query the feed.
-     * 
-     * @param query The query
-     * @return Always returns null as method not implemented
-     */
-    public Feed query(String query) {
-        // Not implemented
-        return null;
-    }
-
-    /**
-     * Posts a new entry to the blog.
-     * 
-     * @param entry The new entry
-     * @return Always returns null as method not implemented
-     */
-    public Entry post(Entry entry) {
-        // Not implemented
-        return null;
-    }
-
-    /**
-     * Gets the specified entry from the blog.
-     * 
-     * @param id ID of the entry to get
-     * @return Not used
-     * @throws NotFoundException Always thrown as method not implemented
-     */
-    public Entry get(String id) throws NotFoundException {
-        // Not implemented
-        throw new NotFoundException("You are not allowed to update entries");
-    }
-
-    /**
-     * Updates the specified entry on the blog.
-     * 
-     * @param id ID of the entry to update
-     * @param entry The new entry
-     * @throws NotFoundException Always thrown as method not implemented
-     */
-    public void put(String id, Entry entry) throws NotFoundException {
-        // Not implemented
-        throw new NotFoundException("You are not allowed to update entries");
-    }
-
-    /**
-     * Deletes the specified entry from the blog.
-     * 
-     * @param id ID of the entry to delete
-     * @throws NotFoundException Always thrown as method not implemented
-     */
-    public void delete(String id) throws NotFoundException {
-        // Not implemented
-        throw new NotFoundException("You are not allowed to delete entries");
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/BaseBlogFeedImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/BaseBlogFeedImpl.java
deleted file mode 100644
index f132d340ea..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/BaseBlogFeedImpl.java
+++ /dev/null
@@ -1,88 +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 com.tuscanyscatours.blog.feed.impl;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.tuscanyscatours.blog.BlogPost;
-
-/**
- * Base class for all blog feeds that provides the common methods
- * that are shared by all the blog feed implementations.
- */
-public abstract class BaseBlogFeedImpl {
-
-    /**
-     * Title of the blog.feed.
-     */
-    protected static final String FEED_TITLE = "Tuscany SCA Tours Blog Feed";
-
-    /**
-     * Description of the blog feed.
-     */
-    protected static final String FEED_DESCRIPTION = "Feed contianing the latest blog posts from Tuscany SCA Tours";
-
-    /**
-     * Author of the blog feed.
-     */
-    protected static final String FEED_AUTHOR = "SCA Tours CEO";
-
-    /**
-     * Used to generate unique IDs for the blog entries.
-     */
-    protected static final AtomicInteger ID_GEN = new AtomicInteger();
-
-    /**
-     * Generates the next blog entry ID.
-     * 
-     * @return Next blog entry ID
-     */
-    protected String nextBlogID() {
-        return Integer.toString(ID_GEN.incrementAndGet());
-    }
-
-    /**
-     * Retrieves a list of all blog posts.
-     * 
-     * @return A list of all blog posts.
-     */
-    public List<BlogPost> getAllBlogPosts() {
-        // Note: To keep things simple, we will just hard code a sample post.
-        // A proper implementation would load all blog posts from some resource
-        // such as files or a database.
-        List<BlogPost> blogEntries = new ArrayList<BlogPost>();
-
-        // Create a sample entry
-        final BlogPost samplePost =
-            new BlogPost(
-                         FEED_AUTHOR,
-                         "Apache Tuscany in Action book features SCA Tours",
-                         "We are famous as SCA Tours has been featured in the Apache Tuscany in Action book published by Manning",
-                         new Date(), "http://www.manning.com/laws/", null);
-
-        // Add sample post to the list of posts
-        blogEntries.add(samplePost);
-
-        return blogEntries;
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/GenericBlogFeedImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/GenericBlogFeedImpl.java
deleted file mode 100644
index c427b658a4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/GenericBlogFeedImpl.java
+++ /dev/null
@@ -1,70 +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 com.tuscanyscatours.blog.feed.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.data.collection.Entry;
-import org.apache.tuscany.sca.data.collection.Item;
-
-import com.tuscanyscatours.blog.BlogPost;
-
-/**
- * Implementation of the blog feed that uses the Tuscany Data API so
- * that it is independent of any Feed APIs such as Atom and RSS.  
- */
-public class GenericBlogFeedImpl extends BaseBlogFeedImpl {
-
-    /**
-     * Implementation of the getAll() method from the Tuscany API
-     * that will return all of the blog posts as generic Tuscany
-     * feed items.
-     * 
-     * @return All blog entries
-     */
-    public Entry<Object, Object>[] getAll() {
-        final List<BlogPost> posts = getAllBlogPosts();
-
-        final Entry<Object, Object>[] entries = new Entry[posts.size()];
-        int i = 0;
-        for (BlogPost post : posts) {
-            entries[i++] = convertBlogPostToFeedItem(post);
-        }
-
-        return entries;
-    }
-
-    /**
-     * Converts a blog post to a Tuscany API feed item.
-     * 
-     * @param post The blog post to convert
-     * @return The blog post as a Tuscany API feed item
-     */
-    private Entry<Object, Object> convertBlogPostToFeedItem(BlogPost post) {
-        // Convert Blog entry into an Item
-        final Item item =
-            new Item(post.getTitle(), post.getContent(), post.getLink(), post.getRelated(), post.getUpdated());
-
-        // Add item to entry 
-        final Entry<Object, Object> entry = new Entry<Object, Object>(nextBlogID(), item);
-
-        return entry;
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/RSSBlogFeedImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/RSSBlogFeedImpl.java
deleted file mode 100644
index efccffef67..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/java/com/tuscanyscatours/blog/feed/impl/RSSBlogFeedImpl.java
+++ /dev/null
@@ -1,94 +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 com.tuscanyscatours.blog.feed.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.rss.collection.NotFoundException;
-
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndContentImpl;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.tuscanyscatours.blog.BlogPost;
-
-/**
- * An RSS feed that implements the org.apache.tuscany.sca.binding.rss.collection.Collection
- * interface and uses the RSS APIs to construct the RSS feed.
- */
-public class RSSBlogFeedImpl extends BaseBlogFeedImpl implements
-    org.apache.tuscany.sca.binding.rss.collection.Collection {
-
-    /**
-     * Gets an RSS feed containing all the blog posts.
-     * 
-     * @return An RSS feed containing all the blog posts.
-     */
-    public SyndFeed getFeed() {
-        // Create SCA Tours blog RSS feed
-        SyndFeed feed = new SyndFeedImpl();
-        feed.setTitle(FEED_TITLE);
-        feed.setDescription(FEED_DESCRIPTION);
-        feed.setAuthor(FEED_AUTHOR);
-
-        // Get all blog posts and convert to RSS entries
-        final List<BlogPost> blogEntries = getAllBlogPosts();
-        for (BlogPost blogEntry : blogEntries) {
-            SyndEntry entry = new SyndEntryImpl();
-            entry.setUri(nextBlogID());
-            entry.setAuthor(blogEntry.getAuthor());
-            entry.setTitle(blogEntry.getTitle());
-
-            SyndContent content = new SyndContentImpl();
-            content.setType("text");
-            content.setValue(blogEntry.getContent());
-
-            entry.setPublishedDate(blogEntry.getUpdated());
-            entry.setLink(blogEntry.getLink());
-
-            feed.getEntries().add(entry);
-        }
-
-        return feed;
-    }
-
-    /**
-     * Query the feed.
-     * 
-     * @param query The query
-     * @return Always returns null as method not implemented
-     */
-    public SyndFeed query(String query) {
-        // Not implemented
-        return null;
-    }
-
-    public SyndEntry get(String id) throws NotFoundException {
-        // Not implemented
-        return null;
-    }
-
-    public List<SyndEntry> getAll() throws NotFoundException {
-        // Not implemented
-        return null;
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 1259a688e3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,21 +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">

-</contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite
deleted file mode 100644
index 8fb948dddc..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/blog-feed/src/main/resources/blog-feed.composite
+++ /dev/null
@@ -1,58 +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://tuscanyscatours.com/"

-    name="blogFeed">

-

-    <!-- Example that shows using the Tuscany Data APIs to create a feed that -->

-    <!-- is independent of the Feed API -->

-    <service name="BlogAtom" promote="BlogFeed">

-        <tuscany:binding.atom uri="http://localhost:8090/BlogAtom"/>

-    </service>

-

-    <service name="BlogRSS" promote="BlogFeed">

-        <tuscany:binding.rss uri="http://localhost:8090/BlogRSS"/>

-    </service>

-

-    <component name="BlogFeed">

-        <implementation.java class="com.tuscanyscatours.blog.feed.impl.GenericBlogFeedImpl"/>

-    </component>

-

-    <!-- Example that shows using the Atom Collections API to create a feed that -->

-    <!-- uses the Atom APIs -->

-    <service name="BlogAtomAPIs" promote="BlogAtom">

-        <tuscany:binding.atom uri="http://localhost:8090/BlogAtomAPIs"/>

-    </service>

-

-    <component name="BlogAtom">

-        <implementation.java class="com.tuscanyscatours.blog.feed.impl.AtomBlogFeedImpl"/>

-    </component>

-

-    <!-- Example that shows using the RSS Collections API to create a feed that -->

-    <!-- uses the RSS APIs -->

-    <service name="BlogRSSAPIs" promote="BlogRSS">

-        <tuscany:binding.rss uri="http://localhost:8090/BlogRSSAPIs"/>

-    </service>

-

-    <component name="BlogRSS">

-        <implementation.java class="com.tuscanyscatours.blog.feed.impl.RSSBlogFeedImpl"/>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/build.xml
deleted file mode 100644
index a30dd29ec9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/build.xml
+++ /dev/null
@@ -1,97 +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="scatours-contributions" default="compile">

-

-    <target name="compile">

-        <antcall target="allsubdirs">

-            <param name="target" value="compile"/>

-        </antcall>

-    </target>

-

-    <target name="test">

-        <antcall target="allsubdirs">

-            <param name="target" value="test"/>

-        </antcall>

-    </target>

-

-    <target name="clean">

-        <antcall target="allsubdirs">

-            <param name="target" value="clean"/>

-        </antcall>

-    </target>

-

-    <target name="allsubdirs">

-        <ant dir="blog-feed" target="${target}"/>

-        <ant dir="introducing-trips" target="${target}"/> <!--needed by buildingblocks-->

-        <ant dir="buildingblocks" target="${target}"/>

-        <ant dir="buildingblocks-client" target="${target}"/>

-        <ant dir="calendar" target="${target}"/>

-        <ant dir="common" target="${target}"/> <!--needed by car-->

-        <ant dir="car" target="${target}"/>

-        <ant dir="creditcard-payment-jaxb" target="${target}"/>

-        <ant dir="creditcard-payment-jaxb-policy" target="${target}"/>

-        <ant dir="creditcard-payment-sdo" target="${target}"/>

-        <ant dir="creditcard-payment-webapp" target="${target}"/>

-        <ant dir="currency" target="${target}"/>

-        <ant dir="currency-corba" target="${target}"/>

-        <ant dir="currency-jms" target="${target}"/>

-        <ant dir="currency-jsp" target="${target}"/>

-        <ant dir="currency-rmi" target="${target}"/>

-        <ant dir="currency-servlet" target="${target}"/>

-        <ant dir="currency-ws" target="${target}"/>

-        <ant dir="payment-java" target="${target}"/> <!--needed by databinding-client-->

-        <ant dir="databinding-client" target="${target}"/>

-        <ant dir="emailgateway" target="${target}"/>

-        <ant dir="feed-logger" target="${target}"/>

-        <ant dir="flight" target="${target}"/>

-        <ant dir="fullapp-bespoketrip" target="${target}"/>

-        <ant dir="fullapp-coordination" target="${target}"/>

-        <ant dir="fullapp-currency" target="${target}"/>

-        <ant dir="fullapp-packagedtrip" target="${target}"/>

-        <ant dir="fullapp-shoppingcart" target="${target}"/>

-        <ant dir="fullapp-ui" target="${target}"/>

-        <ant dir="help-pages" target="${target}"/>

-        <ant dir="hotel" target="${target}"/>

-        <ant dir="shoppingcart" target="${target}"/> <!--needed by interaction-client-->

-        <ant dir="interaction-client" target="${target}"/>

-        <ant dir="interaction-service-remote" target="${target}"/>

-        <ant dir="introducing-tours" target="${target}"/> <!--needed by introducing-client-->

-        <ant dir="introducing-client" target="${target}"/>

-        <ant dir="notification" target="${target}"/>

-        <ant dir="notification-corba" target="${target}"/>

-        <ant dir="notification-ejb" target="${target}"/>

-        <ant dir="notification-jms" target="${target}"/>

-        <ant dir="notification-rmi" target="${target}"/>

-        <ant dir="notification-ws" target="${target}"/>

-        <ant dir="payment-java-policy" target="${target}"/>

-        <ant dir="payment-bpel-process" target="${target}"/> <!--needed by payment-bpel-->

-        <ant dir="payment-bpel" target="${target}"/>

-        <ant dir="payment-groovy" target="${target}"/>

-        <ant dir="payment-spring" target="${target}"/>

-        <ant dir="payment-spring-policy" target="${target}"/>

-        <ant dir="payment-spring-scatag" target="${target}"/>

-        <ant dir="policy-client" target="${target}"/>

-        <ant dir="travelcatalog" target="${target}"/> <!--needed by scatours-->

-        <ant dir="tripbooking" target="${target}"/> <!--needed by scatours-->

-        <ant dir="scatours" target="${target}"/>

-        <ant dir="trip" target="${target}"/>

-    </target>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/build.xml
deleted file mode 100644
index 9ea7438516..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-buildingblocks-client" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml
deleted file mode 100644
index 443edb6215..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-buildingblocks-client</artifactId>

-    <name>Apache Tuscany SCA Tours Building Blocks Client Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-buildingblocks</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-trips</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-all</artifactId>

-            <version>5.2.0</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.activemq</groupId>

-                    <artifactId>activemq-web-demo</artifactId>

-                </exclusion>

-            </exclusions>

-            <scope>test</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java
deleted file mode 100644
index 9eb38a0a85..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Bookings.java
+++ /dev/null
@@ -1,26 +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 scatours;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Bookings {

-    String newBooking(String trip, int people);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.java
deleted file mode 100644
index af9d8a1bbb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/Checkout.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 scatours;

-

-import java.math.BigDecimal;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Checkout {

-    void makePayment(BigDecimal amount, String cardInfo);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java
deleted file mode 100644
index cd46a8915a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ApplClientImpl.java
+++ /dev/null
@@ -1,52 +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 scatours.impl;

-

-import java.math.BigDecimal;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-import scatours.Bookings;

-import scatours.Checkout;

-

-@Service(Runnable.class)

-public class ApplClientImpl {

-    @Reference

-    protected Bookings bookings1, bookings2;

-

-    @Reference

-    protected Checkout checkout1, checkout2;

-

-    public ApplClientImpl() {

-    }

-

-    public void run() {

-        String bookingCode = bookings1.newBooking("FS1APR4", 1);

-        System.out.println("Booking code is " + bookingCode);

-

-        checkout1.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10");

-

-        bookingCode = bookings2.newBooking("AC3MAY9", 2);

-        System.out.println("Booking code is " + bookingCode);

-

-        checkout2.makePayment(new BigDecimal("2295.00"), "9876123456784321 11/11");

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java
deleted file mode 100644
index d37860be3b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/java/scatours/impl/ToursClientImpl.java
+++ /dev/null
@@ -1,47 +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 scatours.impl;

-

-import java.math.BigDecimal;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-import scatours.Bookings;

-import scatours.Checkout;

-

-@Service(Runnable.class)

-public class ToursClientImpl {

-    @Reference

-    protected Bookings bookings;

-

-    @Reference

-    protected Checkout checkout;

-

-    public ToursClientImpl() {

-    }

-

-    public void run() {

-        String bookingCode = bookings.newBooking("FS1APR4", 1);

-        System.out.println("Booking code is " + bookingCode);

-

-        checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10");

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 183ffa816b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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:tst="http://tuscanyscatours.com/">

-    <deployable composite="tst:ToursApplClient" />

-    <deployable composite="tst:ToursImplClient" />

-    <deployable composite="tst:ToursImplIncludeClient" />

-    <import namespace="http://tuscanyscatours.com/" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite
deleted file mode 100644
index f0e33425e3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-appl-client.composite
+++ /dev/null
@@ -1,40 +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"

-           targetNamespace="http://tuscanyscatours.com/"

-           xmlns:tst="http://tuscanyscatours.com/"

-           name="ToursApplClient">

-

-    <component name="ApplClient">

-        <implementation.java class="scatours.impl.ApplClientImpl" />

-        <reference name="bookings1">

-            <binding.ws uri="http://localhost:8081/BookTrip" />

-        </reference>

-        <reference name="checkout1">

-            <binding.ws uri="http://localhost:8081/Checkout" />

-        </reference>

-        <reference name="bookings2">

-            <binding.jms uri="jms:BookTrip" />

-        </reference>

-        <reference name="checkout2">

-            <binding.jms uri="jms:Checkout" />

-        </reference>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite
deleted file mode 100644
index 6048ccda88..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-client.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-           targetNamespace="http://tuscanyscatours.com/"

-           xmlns:tst="http://tuscanyscatours.com/"

-           name="ToursImplClient">

-

-    <component name="ToursClient">

-        <implementation.java class="scatours.impl.ToursClientImpl" />

-        <reference name="bookings" target="MyTours/BookTrip" />

-        <reference name="checkout" target="MyTours/Checkout" />

-    </component>

-

-    <include name="tst:ToursImpl" />

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite
deleted file mode 100644
index 49967db666..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/main/resources/tours-impl-include-client.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-           targetNamespace="http://tuscanyscatours.com/"

-           xmlns:tst="http://tuscanyscatours.com/"

-           name="ToursImplIncludeClient">

-

-    <component name="ToursClient">

-        <implementation.java class="scatours.impl.ToursClientImpl" />

-        <reference name="bookings" target="MyTours/BookTrip" />

-        <reference name="checkout" target="MyTours/Checkout" />

-    </component>

-

-    <include name="tst:ToursImplInclude" />

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java
deleted file mode 100644
index 6115833182..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksApplTestCase.java
+++ /dev/null
@@ -1,77 +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 scatours;

-

-import org.apache.activemq.broker.BrokerService;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests the Building Blocks Composite Application scenario

- */

-public class BuildingBlocksApplTestCase {

-

-    private BrokerService jmsBroker;

-    private Node node1, node2;

-

-    @Before

-    public void startServer() throws Exception {

-        jmsBroker = new BrokerService();

-        jmsBroker.setPersistent(false);

-        jmsBroker.setUseJmx(false);

-        jmsBroker.addConnector("tcp://localhost:61619");

-

-        node1 = NodeFactory.getInstance().createNode("tours-appl.composite",

-                    new Contribution("introducing-trips", "../introducing-trips/target/classes"),

-                    new Contribution("buildingblocks", "../buildingblocks/target/classes"));

-

-        node2 = NodeFactory.getInstance().createNode("tours-appl-client.composite",

-                    new Contribution("buildingblocks-client", "./target/classes"));

-

-        jmsBroker.start();

-        node1.start();

-        node2.start();

-    }

-

-    @Test

-    public void testAppl() {

-        Runnable client = ((Node)node2).getService(Runnable.class, "ApplClient/Runnable");

-        client.run();

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        if (node2 != null) {

-            node2.stop();

-        }

-        if (node1 != null) {

-            node1.stop();

-        }

-        if (jmsBroker != null) {

-            jmsBroker.stop();

-        }

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
deleted file mode 100644
index ebc278f5b4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
+++ /dev/null
@@ -1,59 +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 scatours;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests the Building Blocks Composite Implementation Include scenario

- */

-public class BuildingBlocksImplIncludeTestCase {

-

-    private Node node;

-

-    @Before

-    public void startServer() throws Exception {

-        node = NodeFactory.getInstance().createNode("tours-impl-include-client.composite",

-                   new Contribution("introducing-trips", "../introducing-trips/target/classes"),

-                   new Contribution("buildingblocks", "../buildingblocks/target/classes"),

-                   new Contribution("buildingblocks-client", "./target/classes"));

-

-        node.start();

-    }

-

-    @Test

-    public void testImplInclude() {

-        Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");

-        client.run();

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        if (node != null) {

-            node.stop();

-        }

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java
deleted file mode 100644
index 9356a2b146..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/java/scatours/BuildingBlocksImplTestCase.java
+++ /dev/null
@@ -1,58 +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 scatours;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests the Building Blocks Composite Implementation scenario

- */

-public class BuildingBlocksImplTestCase {

-

-    private Node node;

-

-    @Before

-    public void startServer() throws Exception {

-        node = NodeFactory.getInstance().createNode("tours-impl-client.composite",

-                   new Contribution("buildingblocks", "../buildingblocks/target/classes"),

-                   new Contribution("buildingblocks-client", "./target/classes"));

-

-        node.start();

-    }

-

-    @Test

-    public void testImpl() {

-        Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");

-        client.run();

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        if (node != null) {

-            node.stop();

-        }

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/resources/jndi.properties b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/resources/jndi.properties
deleted file mode 100644
index 88270fd1e0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks-client/src/test/resources/jndi.properties
+++ /dev/null
@@ -1,39 +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.

-## ---------------------------------------------------------------------------

-

-# START SNIPPET: jndi

-

-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory

-

-# use the following property to configure the default connector

-java.naming.provider.url = vm://localhost?broker.persistent=false

-

-# use the following property to specify the JNDI name the connection factory

-# should appear as. 

-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

-connectionFactoryNames = ConnectionFactory

-

-# register some queues in JNDI using the form

-# queue.[jndiName] = [physicalName]

-queue.BookTrip = BookTripRequestQueue

-queue.Checkout = CheckoutRequestQueue

-

-# register some topics in JNDI using the form

-# topic.[jndiName] = [physicalName]

-#topic.MyTopic = example.MyTopic

-

-# END SNIPPET: jndi

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/build.xml
deleted file mode 100644
index 1e23144229..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-buildingblocks" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml
deleted file mode 100644
index bf5ad5c51a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/pom.xml
+++ /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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-buildingblocks</artifactId>

-    <name>Apache Tuscany SCA Tours Building Blocks Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>        

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-trips</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>test</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java
deleted file mode 100644
index 748e88ee09..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/Tours.java
+++ /dev/null
@@ -1,26 +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 com.budgettours;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Tours {

-    String checkAvailability(String trip, int people);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/impl/TourProviderImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/impl/TourProviderImpl.java
deleted file mode 100644
index 8e48625f0c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/budgettours/impl/TourProviderImpl.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 com.budgettours.impl;

-

-import com.budgettours.Tours;

-

-public class TourProviderImpl implements Tours {

-    public String checkAvailability(String trip, int people) {

-        // call non-SCA code to reserve trip and return booking code

-        return "5Q87X";

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java
deleted file mode 100644
index 5026d23c95..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/goodvaluetrips/Trips.java
+++ /dev/null
@@ -1,26 +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 com.goodvaluetrips;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Trips {

-    String checkAvailability(String trip, int people);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java
deleted file mode 100644
index 4ddd145778..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Bookings.java
+++ /dev/null
@@ -1,26 +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 com.tuscanyscatours;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Bookings {

-    String newBooking(String trip, int people);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.java
deleted file mode 100644
index 4e8f1481f5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Checkout.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 com.tuscanyscatours;

-

-import java.math.BigDecimal;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Checkout {

-    void makePayment(BigDecimal amount, String cardInfo);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java
deleted file mode 100644
index beb5f529b1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/Updates.java
+++ /dev/null
@@ -1,26 +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 com.tuscanyscatours;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Updates {

-    void addTrip(String resCode);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java
deleted file mode 100644
index 629ea7b5ec..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java
+++ /dev/null
@@ -1,49 +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 com.tuscanyscatours.impl;

-

-import java.math.BigDecimal;

-import java.util.ArrayList;

-import java.util.List;

-

-import com.tuscanyscatours.Checkout;

-import com.tuscanyscatours.Updates;

-

-public class ShoppingCartImpl implements Checkout, Updates {

-    private static List<String> bookedTrips = new ArrayList<String>();

-

-    protected String currency = "USD";

-

-    public void makePayment(BigDecimal amount, String cardInfo) {

-        System.out.print("Charged " + currency + " " + amount

-            + " to card "

-            + cardInfo

-            + " for "

-            + (bookedTrips.size() > 1 ? "trips" : "trip"));

-        for (String trip : bookedTrips) {

-            System.out.print(" " + trip);

-        }

-        System.out.println();

-        bookedTrips.clear();

-    }

-

-    public void addTrip(String resCode) {

-        bookedTrips.add(resCode);

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java
deleted file mode 100644
index 1259fa7d82..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java
+++ /dev/null
@@ -1,39 +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 com.tuscanyscatours.impl;

-

-import org.oasisopen.sca.annotation.Reference;

-

-import com.goodvaluetrips.Trips;

-import com.tuscanyscatours.Bookings;

-import com.tuscanyscatours.Updates;

-

-public class TripBookingImpl implements Bookings {

-    @Reference

-    protected Trips mytrips;

-

-    @Reference

-    protected Updates cart;

-

-    public String newBooking(String trip, int people) {

-        String resCode = mytrips.checkAvailability(trip, people);

-        cart.addTrip(resCode);

-        return "GV" + resCode;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/scatours/impl/TripProviderImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/scatours/impl/TripProviderImpl.java
deleted file mode 100644
index a95f01c519..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/java/scatours/impl/TripProviderImpl.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 scatours.impl;

-

-import com.goodvaluetrips.Trips;

-

-public class TripProviderImpl implements Trips {

-    public String checkAvailability(String trip, int people) {

-        // scaffolded test code to return an arbitrary booking code

-        return "7S09Z";

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 697b706163..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +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:tst="http://tuscanyscatours.com/">

-    <deployable composite="tst:ToursAppl" />

-    <deployable composite="tst:ToursImpl" />

-    <deployable composite="tst:ToursImplInclude" />

-    <import namespace="http://goodvaluetrips.com/" />

-    <export namespace="http://tuscanyscatours.com/" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite
deleted file mode 100644
index 6d0a1c1f0d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-appl.composite
+++ /dev/null
@@ -1,54 +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"

-           targetNamespace="http://tuscanyscatours.com/"

-           xmlns:bb="http://bb.tuscanyscatours.com/"

-           xmlns:gvt="http://goodvaluetrips.com/"

-           name="ToursAppl">

-

-    <component name="WSTours">

-        <implementation.composite name="bb:Tours" />

-        <service name="BookTrip">

-            <binding.ws uri="http://localhost:8081/BookTrip" />

-        </service>

-        <service name="Checkout">

-            <binding.ws uri="http://localhost:8081/Checkout" />

-        </service>

-        <reference name="trips" target="TripProvider/Trips" />

-    </component>

-

-    <component name="JMSTours">

-        <implementation.composite name="bb:Tours" />

-        <service name="BookTrip">

-            <binding.jms uri="jms:BookTrip" />

-        </service>

-        <service name="Checkout">

-            <binding.jms uri="jms:Checkout" />

-        </service>

-        <reference name="trips" target="TourProvider/Tours" />

-    </component>

-

-    <include name="gvt:Trips" />

-

-    <component name="TourProvider">

-        <implementation.java class="com.budgettours.impl.TourProviderImpl" />

-        <service name="Tours" />

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite
deleted file mode 100644
index 1441702a98..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl-include.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-           targetNamespace="http://tuscanyscatours.com/"

-           xmlns:bb="http://bb.tuscanyscatours.com/"

-           xmlns:gvt="http://goodvaluetrips.com/"

-           name="ToursImplInclude">

-

-    <component name="MyTours">

-        <implementation.composite name="bb:Tours" />

-        <reference name="trips" target="TripProvider/Trips" />

-        <property name="currency">GBP</property> 

-    </component>

-

-    <include name="gvt:Trips" />

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite
deleted file mode 100644
index c1a7643df6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours-impl.composite
+++ /dev/null
@@ -1,34 +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"

-           targetNamespace="http://tuscanyscatours.com/"

-           xmlns:bb="http://bb.tuscanyscatours.com/"

-           name="ToursImpl">

-

-    <component name="MyTours">

-        <implementation.composite name="bb:Tours" />

-        <reference name="trips" target="TripProvider/Trips" />

-        <property name="currency">GBP</property> 

-    </component>

-

-    <component name="TripProvider">

-        <implementation.java class="scatours.impl.TripProviderImpl" />

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite
deleted file mode 100644
index d2d74d08fc..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/main/resources/tours.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-      targetNamespace="http://bb.tuscanyscatours.com/"

-      xmlns:xs="http://www.w3.org/2001/XMLSchema"

-      name="Tours">

-

-    <service name="BookTrip" promote="TripBooking/Bookings" />

-    <service name="Checkout" promote="ShoppingCart/Checkout" />

-    <reference name="trips" promote="TripBooking/mytrips" />

-    <property name="currency" type="xs:string">USD</property>

-

-    <component name="TripBooking">

-        <implementation.java class="com.tuscanyscatours.impl.TripBookingImpl" />

-        <service name="Bookings" />

-        <reference name="mytrips" /> 

-        <reference name="cart" target="ShoppingCart/Updates" />

-    </component>

-

-    <component name="ShoppingCart">

-        <implementation.java class="com.tuscanyscatours.impl.ShoppingCartImpl"/>

-        <service name="Updates" />

-        <service name="Checkout" />

-        <property name="currency" source="$currency"/>                  

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
deleted file mode 100644
index 6c9079e5ab..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplIncludeTestCase.java
+++ /dev/null
@@ -1,66 +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 scatours;

-

-import java.math.BigDecimal;

-

-import com.tuscanyscatours.Bookings;

-import com.tuscanyscatours.Checkout;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests the Building Blocks Composite Implementation Include scenario

- */

-public class BuildingBlocksImplIncludeTestCase {

-

-    private Node node;

-

-    @Before

-    public void startServer() throws Exception {

-        node = NodeFactory.getInstance().createNode("tours-impl-include.composite",

-                   new Contribution("introducing-trips", "../introducing-trips/target/classes"),

-                   new Contribution("buildingblocks", "./target/classes"));

-        node.start();

-    }

-

-    @Test

-    public void testImplInclude() {

-        Bookings bookings = ((Node)node).getService(Bookings.class, "MyTours/BookTrip");

-        String bookingCode = bookings.newBooking("FS1APR4", 1);

-        System.out.println("Booking code is " + bookingCode);

-

-        Checkout checkout = ((Node)node).getService(Checkout.class, "MyTours/Checkout");

-        checkout.makePayment(new BigDecimal("1995.00"), "1234567801234567 11/10");

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        if (node != null) {

-            node.stop();

-        }

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java
deleted file mode 100644
index f74304409d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/buildingblocks/src/test/java/scatours/BuildingBlocksImplTestCase.java
+++ /dev/null
@@ -1,65 +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 scatours;

-

-import java.math.BigDecimal;

-

-import com.tuscanyscatours.Bookings;

-import com.tuscanyscatours.Checkout;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests the Building Blocks Composite Implementation scenario

- */

-public class BuildingBlocksImplTestCase {

-

-    private Node node;

-

-    @Before

-    public void startServer() throws Exception {

-        node = NodeFactory.getInstance().createNode("tours-impl.composite",

-                   new Contribution("buildingblocks", "./target/classes"));

-        node.start();

-    }

-

-    @Test

-    public void testImpl() {

-        Bookings bookings = ((Node)node).getService(Bookings.class, "MyTours/BookTrip");

-        String bookingCode = bookings.newBooking("FS1APR4", 1);

-        System.out.println("Booking code is " + bookingCode);

-

-        Checkout checkout = ((Node)node).getService(Checkout.class, "MyTours/Checkout");

-        checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10");

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        if (node != null) {

-            node.stop();

-        }

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/build.xml
deleted file mode 100644
index ae6a47dafb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-calendar" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/pom.xml
deleted file mode 100644
index b3926ca633..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/pom.xml
+++ /dev/null
@@ -1,64 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-calendar</artifactId>

-    <name>Apache Tuscany SCA Tours Calendar Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-node-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>test</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/Calendar.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/Calendar.java
deleted file mode 100644
index daa5127511..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/Calendar.java
+++ /dev/null
@@ -1,25 +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 com.tuscanyscatours.calendar;

-

-public interface Calendar {

-

-    String getEndDate(String startDate, int duration);

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/impl/CalendarImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/impl/CalendarImpl.java
deleted file mode 100644
index 4e6e7b161b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/java/com/tuscanyscatours/calendar/impl/CalendarImpl.java
+++ /dev/null
@@ -1,47 +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 com.tuscanyscatours.calendar.impl;

-

-import java.text.DateFormat;

-import java.util.Date;

-

-import com.tuscanyscatours.calendar.Calendar;

-

-/**

- * An implementation of the Calendar service

- */

-public class CalendarImpl implements Calendar {

-

-    public String getEndDate(String startDate, int duration) {

-        String returnDate = "Invalid Date";

-

-        try {

-            Date date = DateFormat.getInstance().parse(startDate);

-            java.util.Calendar calendar = java.util.Calendar.getInstance();

-            calendar.setTime(date);

-            calendar.add(java.util.Calendar.DATE, duration);

-            returnDate = DateFormat.getInstance().format(calendar.getTime());

-        } catch (Exception ex) {

-            // do nothing  

-            System.out.println(ex.toString());

-        }

-

-        return returnDate;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index e37c61d48b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-   <export.java package="com.tuscanyscatours.calendar" />

-   <export.java package="com.tuscanyscatours.calendar.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java
deleted file mode 100644
index 339c3ed41e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/java/scatours/calendar/CalendarTestCase.java
+++ /dev/null
@@ -1,57 +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 scatours.calendar;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-import com.tuscanyscatours.calendar.Calendar;

-

-/**

- * This shows how to test the Calculator service component.

- */

-public class CalendarTestCase {

-

-    private Node node;

-

-    @Before

-    public void startNode() throws Exception {

-        node =

-            NodeFactory.getInstance().createNode("calendar.composite",

-                                                       new Contribution("calendar", "./target/classes"),

-                                                       new Contribution("calendar-test", "./target/test-classes"));

-        node.start();

-    }

-

-    @Test

-    public void testCalendar() throws Exception {

-        Calendar calendar = ((Node)node).getService(Calendar.class, "Calendar");

-        System.out.println(calendar.getEndDate("07/10/96 04:05", 3));

-    }

-

-    @After

-    public void stopNode() throws Exception {

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 87e99010b8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-    <import.java package="com.tuscanyscatours.calendar" />

-    <import.java package="com.tuscanyscatours.calendar.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite
deleted file mode 100644
index 3ddb33db80..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/calendar/src/test/resources/calendar.composite
+++ /dev/null
@@ -1,28 +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"

-           targetNamespace="http://tuscanyscatours.com/"

-           name="calendar">

-

-    <component name="Calendar">

-		<implementation.java class="com.tuscanyscatours.calendar.impl.CalendarImpl"/>

-    </component>

-

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/build.xml
deleted file mode 100644
index 46392d4b24..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/build.xml
+++ /dev/null
@@ -1,25 +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="scatours-contribution-car" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../common/target/scatours-contribution-common.jar"/>

-    </path>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/pom.xml
deleted file mode 100644
index e71040dc04..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/pom.xml
+++ /dev/null
@@ -1,62 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-car</artifactId>

-    <name>Apache Tuscany SCA Tours Car Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-data-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-common</artifactId>

-            <version>${pom.version}</version>

-        </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/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
deleted file mode 100644
index 672afbc609..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarImpl.java
+++ /dev/null
@@ -1,91 +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 com.tuscanyscatours.car.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.common.Book;

-import com.tuscanyscatours.common.Search;

-import com.tuscanyscatours.common.SearchCallback;

-import com.tuscanyscatours.common.TripItem;

-import com.tuscanyscatours.common.TripLeg;

-

-/**

- * An implementation of the Car service

- */

-@Scope("STATELESS")

-@Service({Search.class, Book.class})

-public class CarImpl implements Search, Book {

-

-    private List<CarInfo> cars = new ArrayList<CarInfo>();

-

-    @Callback

-    protected SearchCallback searchCallback;

-

-    @Init

-    public void init() {

-        cars.add(new CarInfo("Premier Cars", "BMW 5 Series", "FLR", "06/12/09", "5", 100.00, "EUR",

-                             "http://localhost:8085/tbd"));

-        cars.add(new CarInfo("Premier Cars", "Ford Focus", "FLR", "06/12/09", "4", 60.00, "EUR",

-                             "http://localhost:8085/tbd"));

-    }

-

-    public TripItem[] searchSynch(TripLeg tripLeg) {

-        List<TripItem> items = new ArrayList<TripItem>();

-

-        // find available hotels

-        for (CarInfo car : cars) {

-            if (car.getLocation().equals(tripLeg.getToLocation())) {

-                TripItem item =

-                    new TripItem("", "", TripItem.CAR, car.getName(), car.getDescription(), car.getLocation(), tripLeg

-                        .getFromDate(), tripLeg.getToDate(), car.getPricePerDay(), car.getCurrency(), car.getLink());

-                items.add(item);

-            }

-        }

-

-        return items.toArray(new TripItem[items.size()]);

-    }

-

-    public void searchAsynch(TripLeg tripLeg) {

-        System.out.println("Starting car search");

-

-        try {

-            Thread.sleep(4000);

-        } catch (Exception ex) {

-            // do nothing

-        }

-

-        // return available hotels

-        searchCallback.searchResults(searchSynch(tripLeg));

-    }

-

-    public int getPercentComplete() {

-        return 100;

-    }

-

-    public String book(TripItem tripItem) {

-        return "car1";

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarInfo.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarInfo.java
deleted file mode 100644
index c373079ac1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/java/com/tuscanyscatours/car/impl/CarInfo.java
+++ /dev/null
@@ -1,118 +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 com.tuscanyscatours.car.impl;

-

-public class CarInfo {

-

-    private String name;

-    private String description;

-    private String location;

-    private String date;

-    private String seats;

-    private double pricePerDay;

-    private String currency;

-    private String link;

-

-    public CarInfo() {

-    }

-

-    public CarInfo(String name,

-                   String description,

-                   String location,

-                   String date,

-                   String seats,

-                   double pricePerDay,

-                   String currency,

-                   String link) {

-

-        this.name = name;

-        this.description = description;

-        this.location = location;

-        this.date = date;

-        this.seats = seats;

-        this.pricePerDay = pricePerDay;

-        this.currency = currency;

-        this.link = link;

-    }

-

-    public String getName() {

-        return name;

-    }

-

-    public void setName(String name) {

-        this.name = name;

-    }

-

-    public String getDescription() {

-        return description;

-    }

-

-    public void setDescription(String description) {

-        this.description = description;

-    }

-

-    public String getLocation() {

-        return location;

-    }

-

-    public void setLocation(String location) {

-        this.location = location;

-    }

-

-    public String getDate() {

-        return date;

-    }

-

-    public void setDate(String date) {

-        this.date = date;

-    }

-

-    public String getSeats() {

-        return seats;

-    }

-

-    public void setSeats(String seats) {

-        this.seats = seats;

-    }

-

-    public double getPricePerDay() {

-        return pricePerDay;

-    }

-

-    public void setPricePerDay(double pricePerDay) {

-        this.pricePerDay = pricePerDay;

-    }

-

-    public String getCurrency() {

-        return currency;

-    }

-

-    public void setCurrency(String currency) {

-        this.currency = currency;

-    }

-

-    public String getLink() {

-        return link;

-    }

-

-    public void setLink(String link) {

-        this.link = link;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 67fcaf8c6c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/car/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-   <import.java package="com.tuscanyscatours.common"/>

-   <export.java package="com.tuscanyscatours.car.impl"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/build.xml
deleted file mode 100644
index 85cec507ff..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-common" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml
deleted file mode 100644
index 2a8e684d5d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/pom.xml
+++ /dev/null
@@ -1,56 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-common</artifactId>

-    <name>Apache Tuscany SCA Tours Common Artefacts Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-data-api</artifactId>

-            <version>${tuscany.version}</version>

-        </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/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.java
deleted file mode 100644
index 797957250a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Book.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 com.tuscanyscatours.common;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Book {

-    String book(TripItem tripItem);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
deleted file mode 100644
index f304141a06..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/Search.java
+++ /dev/null
@@ -1,35 +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 com.tuscanyscatours.common;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-@Callback(SearchCallback.class)

-public interface Search {

-    TripItem[] searchSynch(TripLeg tripLeg);

-

-    @OneWay

-    void searchAsynch(TripLeg tripLeg);

-

-    int getPercentComplete();

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.java
deleted file mode 100644
index 2a527d0461..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/SearchCallback.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 com.tuscanyscatours.common;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface SearchCallback {

-    void searchResults(TripItem[] items);

-    void setPercentComplete(String searchComponent, int percentComplete);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/TripItem.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/TripItem.java
deleted file mode 100644
index 2f2a6299f9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/TripItem.java
+++ /dev/null
@@ -1,242 +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 com.tuscanyscatours.common;

-

-public class TripItem {

-

-    public static String FLIGHT = "Flight";

-    public static String HOTEL = "Hotel";

-    public static String CAR = "Car";

-    public static String TRIP = "Trip";

-

-    private String id;

-    private String tripId;

-    private String type;

-    private String name;

-    private String description;

-    private String location;

-    private String fromDate;

-    private String toDate;

-    private double price;

-    private String currency;

-    private String link;

-    private TripItem[] tripItems; // used for a trip made up of trip items

-    private String customerDetails;

-    private String agentDetails;

-    private String bookingCode;

-

-    public TripItem() {

-    }

-

-    public TripItem(TripItem item) {

-        this.id = item.getId();

-        this.tripId = item.getTripId();

-        this.type = item.getType();

-        this.name = item.getName();

-        this.description = item.getDescription();

-        this.location = item.getLocation();

-        this.fromDate = item.getFromDate();

-        this.toDate = item.getToDate();

-        this.price = item.getPrice();

-        this.currency = item.getCurrency();

-        this.link = item.getLink();

-    }

-

-    public TripItem(String id,

-                    String tripId,

-                    String type,

-                    String name,

-                    String description,

-                    String location,

-                    String fromDate,

-                    String toDate,

-                    double price,

-                    String currency,

-                    String link) {

-        this.id = id;

-        this.tripId = tripId;

-        this.type = type;

-        this.name = name;

-        this.description = description;

-        this.location = location;

-        this.fromDate = fromDate;

-        this.toDate = toDate;

-        this.price = price;

-        this.currency = currency;

-        this.link = link;

-    }

-

-    public String getId() {

-        return id;

-    }

-

-    public void setId(String id) {

-        this.id = id;

-    }

-

-    public String getTripId() {

-        return tripId;

-    }

-

-    public void setTripId(String tripId) {

-        this.tripId = tripId;

-    }

-

-    public String getType() {

-        return type;

-    }

-

-    public void setType(String type) {

-        this.type = type;

-    }

-

-    public String getName() {

-        return name;

-    }

-

-    public void setName(String name) {

-        this.name = name;

-    }

-

-    public String getDescription() {

-        return description;

-    }

-

-    public void setDescription(String description) {

-        this.description = description;

-    }

-

-    public String getLocation() {

-        return location;

-    }

-

-    public void setLocation(String location) {

-        this.location = location;

-    }

-

-    public String getFromDate() {

-        return fromDate;

-    }

-

-    public void setFromDate(String fromDate) {

-        this.fromDate = fromDate;

-    }

-

-    public String getToDate() {

-        return toDate;

-    }

-

-    public void setToDate(String toDate) {

-        this.toDate = toDate;

-    }

-

-    public double getPrice() {

-        return price;

-    }

-

-    public void setPrice(double price) {

-        this.price = price;

-    }

-

-    public String getCurrency() {

-        return currency;

-    }

-

-    public void setCurrency(String currency) {

-        this.currency = currency;

-    }

-

-    public String getLink() {

-        return link;

-    }

-

-    public void setLink(String link) {

-        this.link = link;

-    }

-

-    public TripItem[] getTripItems() {

-        return tripItems;

-    }

-

-    public void setTripItems(TripItem[] tripItems) {

-        this.tripItems = tripItems;

-    }

-

-    public String getCustomerDetails() {

-        return customerDetails;

-    }

-

-    public void setCustomerDetails(String customerDetails) {

-        this.customerDetails = customerDetails;

-    }

-

-    public String getAgentDetails() {

-        return agentDetails;

-    }

-

-    public void setAgentDetails(String agentDetails) {

-        this.agentDetails = agentDetails;

-    }

-

-    public String getBookingCode() {

-        return bookingCode;

-    }

-

-    public void setBookingCode(String bookingCode) {

-        this.bookingCode = bookingCode;

-    }

-

-    @Override

-    public String toString() {

-        String tripString =

-            "Trip: id " + this.tripId

-                + " type "

-                + this.type

-                + " name "

-                + this.name

-                + " description "

-                + this.description

-                + " location "

-                + this.location

-                + " fromDate "

-                + this.fromDate

-                + " toDate "

-                + this.toDate

-                + " price "

-                + this.price

-                + " currency "

-                + this.currency

-                + " link "

-                + this.link;

-        return tripString;

-    }

-

-    @Override

-    public boolean equals(Object obj) {

-

-        if (obj instanceof TripItem) {

-            if (((TripItem)obj).getId().equals(getId())) {

-                return true;

-            }

-        }

-

-        return super.equals(obj);

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/TripLeg.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/TripLeg.java
deleted file mode 100644
index 663634b1e9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/java/com/tuscanyscatours/common/TripLeg.java
+++ /dev/null
@@ -1,85 +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 com.tuscanyscatours.common;

-

-public class TripLeg {

-

-    private String id;

-    private String fromLocation;

-    private String toLocation;

-    private String fromDate;

-    private String toDate;

-    private String noOfPeople;

-

-    public TripLeg() {

-    }

-

-    public TripLeg(String id, String fromLocation, String toLocation, String fromDate, String toDate, String noOfPeople) {

-    }

-

-    public String getId() {

-        return id;

-    }

-

-    public void setId(String id) {

-        this.id = id;

-    }

-

-    public String getFromLocation() {

-        return fromLocation;

-    }

-

-    public void setFromLocation(String fromLocation) {

-        this.fromLocation = fromLocation;

-    }

-

-    public String getToLocation() {

-        return toLocation;

-    }

-

-    public void setToLocation(String toLocation) {

-        this.toLocation = toLocation;

-    }

-

-    public String getFromDate() {

-        return fromDate;

-    }

-

-    public void setFromDate(String fromDate) {

-        this.fromDate = fromDate;

-    }

-

-    public String getToDate() {

-        return toDate;

-    }

-

-    public void setToDate(String toDate) {

-        this.toDate = toDate;

-    }

-

-    public String getNoOfPeople() {

-        return noOfPeople;

-    }

-

-    public void setNoOfPeople(String noOfPeople) {

-        this.noOfPeople = noOfPeople;

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index cebda8d6d6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/common/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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">

-    <export.java package="com.tuscanyscatours.common" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/build.xml
deleted file mode 100644
index 93d1c4ad47..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/build.xml
+++ /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.

--->

-

-<project name="scatours-contribution-creditcard-payment-jaxb-policy" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-        </antcall>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/maven-eclipse.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/maven-eclipse.xml
deleted file mode 100644
index 3adfca89f4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/maven-eclipse.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<project default="copy-resources">
-  <target name="init"/>
-  <target name="copy-resources" depends="init">
-    <copy todir="target/classes/META-INF" filtering="true">
-      <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/>
-    </copy>
-  </target>
-</project>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml
deleted file mode 100644
index 9cf48a1c7d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/pom.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    *
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    *
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-creditcard-payment-jaxb-policy</artifactId>
-    <name>Apache Tuscany SCA Tours Credit Card Payment Contribution JAXB Policy</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-jaxws</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <executions>
-                    <execution>
-                        <id>wsimport</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment.creditcard</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources
-                        </wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source
-                        </sourceDestDir>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
deleted file mode 100644
index f7723ab5b5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package com.tuscanyscatours.payment.creditcard.impl;
-
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
-
-/**
- * 
- */
-@Service(CreditCardPayment.class)
-public class CreditCardPaymentImpl implements CreditCardPayment {
-
-    public String authorize(CreditCardDetailsType creditCard, float amount) {
-        if (creditCard != null) {
-            System.out.println("Checking card: name = " + creditCard.getCardOwner().getName()
-                + " number = "
-                + creditCard.getCreditCardNumber()
-                + " for amount "
-                + amount);
-        } else {
-            System.out.println("Checking card is null");
-        }
-
-        return "OK";
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index f313043bf8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,134 +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="CreditCardPayment"

-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"

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

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">

-

-            <!-- https://jaxb.dev.java.net/issues/show_bug.cgi?id=518 -->

-            <!-- I have to change the complex types to be annoymous -->

-            <xsd:element name="authorize">

-            <xsd:complexType>

-                <xsd:sequence>

-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>

-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            </xsd:element>

-

-            <xsd:element name="authorizeResponse">

-            <xsd:complexType>

-                <xsd:sequence>

-                    <xsd:element name="Status" type="xsd:string"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            </xsd:element>

-

-            <xsd:complexType name="CreditCardDetailsType">

-                <xsd:sequence>

-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />

-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />

-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />

-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:simpleType name="CreditCardTypeType">

-                <xsd:restriction base="xsd:token">

-                    <xsd:enumeration value="Visa" />

-                    <xsd:enumeration value="MasterCard" />

-                    <xsd:enumeration value="Discover" />

-                    <xsd:enumeration value="Amex" />

-                </xsd:restriction>

-            </xsd:simpleType>

-            <xsd:complexType name="PayerType">

-                <xsd:sequence>

-                    <xsd:element name="Name" type="xsd:string" />

-                    <xsd:element name="Address" type="tns:AddressType" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:complexType name="AddressType">

-                <xsd:sequence>

-                    <xsd:element name="Street" type="xsd:string" />

-                    <xsd:element name="City" type="xsd:string" />

-                    <xsd:element name="State" type="xsd:string" />

-                    <xsd:element name="ZipCode" type="xsd:string" />

-                    <xsd:element name="HomePhone" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:element name="authorizeFault">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="errorCode" type="xsd:string"></xsd:element>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="AuthorizeRequest">

-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeResponse">

-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeFault">

-        <wsdl:part name="parameters" element="tns:authorizeFault"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="CreditCardPayment">

-        <wsdl:operation name="authorize">

-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>

-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>

-            <wsdl:fault name="authorizationFailure" message="tns:AuthorizeFault"></wsdl:fault>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">

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

-        <wsdl:operation name="authorize">

-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="authorizationFailure">

-                <soap:fault name="authorizationFailure" use="literal"/>

-            </wsdl:fault>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="CreditCardPaymentService">

-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">

-            <soap:address location="http://localhost:8080/CreditCardPayment" />

-        </wsdl:port>

-    </wsdl:service>

-

-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">

-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>

-    </plnk:partnerLinkType>

-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 6348027529..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:creditcard" />
-    <export.java package="com.tuscanyscatours.payment.creditcard" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/creditcard.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/creditcard.composite
deleted file mode 100644
index 77ecdef0df..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/creditcard.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-           targetNamespace="http://tuscanyscatours.com/"
-           name="creditcard">
-
-    <component name="CreditCardPayment">
-        <implementation.java class="com.tuscanyscatours.payment.creditcard.impl.CreditCardPaymentImpl" />
-        <service name="CreditCardPayment">
-            <interface.wsdl interface="http://www.tuscanyscatours.com/CreditCardPayment/#wsdl.interface(CreditCardPayment)" /> 
-            <binding.ws uri="http://localhost:8082/CreditCardPayment" requires="authentication"/>
-            <binding.sca/>
-        </service>
-    </component>
-    
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml
deleted file mode 100644
index 97711eb9aa..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/main/resources/definitions.xml
+++ /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.    
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-             targetNamespace="http://itest/policy"
-    		 xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-    		 xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-             xmlns:ip="http://itest/policy" >
-
-
-    <policySet name="BasicAuthenticationPolicySet"
-               provides="authentication"
-               appliesTo="sca:binding.ws">
-        <tuscany:basicAuthentication>
-          <tuscany:userName>myname</tuscany:userName>
-          <tuscany:password>mypassword</tuscany:password>
-        </tuscany:basicAuthentication>
-    </policySet>  
-      
-</definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
deleted file mode 100644
index 38834709b0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb-policy/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
+++ /dev/null
@@ -1,100 +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 scatours.payment.creditcard;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.tuscanyscatours.payment.creditcard.AuthorizeFault_Exception;
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
-import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;
-import com.tuscanyscatours.payment.creditcard.ObjectFactory;
-import com.tuscanyscatours.payment.creditcard.PayerType;
-
-/**
- *
- */
-public class CreditCardPaymentTestCase {
-    private static Node node;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        try {
-            node =
-                NodeFactory.getInstance().createNode("creditcard.composite", new Contribution("creditcard", "./target/classes"));
-
-            node.start();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @Test
-    public void testCreditCardPayment() {
-        Node client = (Node)node;
-        CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPayment");
-
-        ObjectFactory objectFactory = new ObjectFactory();
-        CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();
-        ccDetails.setCreditCardType(CreditCardTypeType.fromValue("Visa"));
-        PayerType ccOwner = objectFactory.createPayerType();
-        ccOwner.setName("Fred");
-        ccDetails.setCardOwner(ccOwner);
-
-        try {
-            System.out.println(cc.authorize(ccDetails, 100.00f));
-        } catch (AuthorizeFault_Exception e) {
-            System.err.println("Fault: " + e.getFaultInfo().getErrorCode());
-        }
-    }
-
-    @Test
-    @Ignore
-    public void testWaitForInput() {
-        System.out.println("Press a key to end");
-        try {
-            System.in.read();
-        } catch (Exception ex) {
-        }
-        System.out.println("Shutting down");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        if (node != null) {
-            node.stop();
-            node = null;
-        }
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/build.xml
deleted file mode 100644
index 9e0ac7fff9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/build.xml
+++ /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.

--->

-

-<project name="scatours-contribution-creditcard-payment-jaxb" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-        </antcall>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml
deleted file mode 100644
index db519eb5cd..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/pom.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    *

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    *

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>

-    <name>Apache Tuscany SCA Tours Credit Card Payment Contribution JAXB</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-interface-java-jaxws</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <pluginRepositories>

-        <pluginRepository>

-            <id>java.net2</id>

-            <name>java.net Maven 2.x Repository</name>

-            <url>http://download.java.net/maven/2</url>

-            <snapshots>

-                <enabled>false</enabled>

-            </snapshots>

-        </pluginRepository>

-    </pluginRepositories>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <executions>

-                    <execution>

-                        <id>wsimport</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>com.tuscanyscatours.payment.creditcard</packageName>

-                            <wsdlDirectory>${basedir}/src/main/resources

-                        </wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <sourceDestDir>${project.build.directory}/jaxws-source

-                        </sourceDestDir>

-                            <verbose>false</verbose>

-                            <xnocompile>true</xnocompile>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
deleted file mode 100644
index 13dc7428d1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package com.tuscanyscatours.payment.creditcard.impl;

-

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

-import com.tuscanyscatours.payment.creditcard.CreditCardPayment;

-

-/**

- * 

- */

-@Service(CreditCardPayment.class)

-public class CreditCardPaymentImpl implements CreditCardPayment {

-

-    public String authorize(CreditCardDetailsType creditCard, float amount) {

-        if (creditCard != null) {

-            System.out.println("Checking card: name = " + creditCard.getCardOwner().getName()

-                + " number = "

-                + creditCard.getCreditCardNumber()

-                + " for amount "

-                + amount);

-        } else {

-            System.out.println("Checking card is null");

-        }

-

-        return "OK";

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 6dcc619c48..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,134 +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="CreditCardPayment"

-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"

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

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">

-

-            <!-- https://jaxb.dev.java.net/issues/show_bug.cgi?id=518 -->

-            <!-- I have to change the complex types to be annoymous -->

-            <xsd:element name="authorize">

-            <xsd:complexType>

-                <xsd:sequence>

-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>

-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            </xsd:element>

-

-            <xsd:element name="authorizeResponse">

-            <xsd:complexType>

-                <xsd:sequence>

-                    <xsd:element name="Status" type="xsd:string"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            </xsd:element>

-

-            <xsd:complexType name="CreditCardDetailsType">

-                <xsd:sequence>

-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />

-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />

-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />

-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:simpleType name="CreditCardTypeType">

-                <xsd:restriction base="xsd:token">

-                    <xsd:enumeration value="Visa" />

-                    <xsd:enumeration value="MasterCard" />

-                    <xsd:enumeration value="Discover" />

-                    <xsd:enumeration value="Amex" />

-                </xsd:restriction>

-            </xsd:simpleType>

-            <xsd:complexType name="PayerType">

-                <xsd:sequence>

-                    <xsd:element name="Name" type="xsd:string" />

-                    <xsd:element name="Address" type="tns:AddressType" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:complexType name="AddressType">

-                <xsd:sequence>

-                    <xsd:element name="Street" type="xsd:string" />

-                    <xsd:element name="City" type="xsd:string" />

-                    <xsd:element name="State" type="xsd:string" />

-                    <xsd:element name="ZipCode" type="xsd:string" />

-                    <xsd:element name="HomePhone" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:element name="authorizeFault">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="errorCode" type="xsd:string"></xsd:element>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="AuthorizeRequest">

-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeResponse">

-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeFault">

-        <wsdl:part name="parameters" element="tns:authorizeFault"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="CreditCardPayment">

-        <wsdl:operation name="authorize">

-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>

-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>

-            <wsdl:fault name="authorizationFailure" message="tns:AuthorizeFault"></wsdl:fault>
-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">

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

-        <wsdl:operation name="authorize">

-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="authorizationFailure">

-                <soap:fault name="authorizationFailure" use="literal"/>

-            </wsdl:fault>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="CreditCardPaymentService">

-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">

-            <soap:address location="http://localhost:8080/CreditCardPayment" />

-        </wsdl:port>

-    </wsdl:service>

-

-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">

-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>

-    </plnk:partnerLinkType>

-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index f29ddff781..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:scatours="http://tuscanyscatours.com/">

-    <deployable composite="scatours:creditcard" />

-    <export.java package="com.tuscanyscatours.payment.creditcard" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.composite
deleted file mode 100644
index 1e07159fbc..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/main/resources/creditcard.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://docs.oasis-open.org/ns/opencsa/sca/200912" name="creditcard" targetNamespace="http://tuscanyscatours.com/">
-  <component name="CreditCardPayment">
-    <implementation.java class="com.tuscanyscatours.payment.creditcard.impl.CreditCardPaymentImpl"/>
-    <service name="CreditCardPayment">
-      <interface.wsdl interface="http://www.tuscanyscatours.com/CreditCardPayment/#wsdl.interface(CreditCardPayment)"/>
-      <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
-      <binding.sca/>
-    </service>
-  </component>
-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
deleted file mode 100644
index ed3d33af21..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-jaxb/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
+++ /dev/null
@@ -1,100 +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 scatours.payment.creditcard;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Ignore;

-import org.junit.Test;

-

-import com.tuscanyscatours.payment.creditcard.AuthorizeFault_Exception;

-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

-import com.tuscanyscatours.payment.creditcard.CreditCardPayment;

-import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;

-import com.tuscanyscatours.payment.creditcard.ObjectFactory;

-import com.tuscanyscatours.payment.creditcard.PayerType;

-

-/**

- *

- */

-public class CreditCardPaymentTestCase {

-    private static Node node;

-

-    /**

-     * @throws java.lang.Exception

-     */

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-        try {

-            node =

-                NodeFactory.getInstance().createNode(new Contribution("creditcard", "./target/classes"));

-

-            node.start();

-        } catch (Exception ex) {

-            ex.printStackTrace();

-        }

-    }

-

-    @Test

-    public void testCreditCardPayment() {

-        Node client = (Node)node;

-        CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPayment");

-

-        ObjectFactory objectFactory = new ObjectFactory();

-        CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();

-        ccDetails.setCreditCardType(CreditCardTypeType.fromValue("Visa"));

-        PayerType ccOwner = objectFactory.createPayerType();

-        ccOwner.setName("Fred");

-        ccDetails.setCardOwner(ccOwner);

-

-        try {

-            System.out.println(cc.authorize(ccDetails, 100.00f));

-        } catch (AuthorizeFault_Exception e) {

-            System.err.println("Fault: " + e.getFaultInfo().getErrorCode());

-        }

-    }

-

-    @Test

-    @Ignore

-    public void testWaitForInput() {

-        System.out.println("Press a key to end");

-        try {

-            System.in.read();

-        } catch (Exception ex) {

-        }

-        System.out.println("Shutting down");

-    }

-

-    /**

-     * @throws java.lang.Exception

-     */

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

-        if (node != null) {

-            node.stop();

-            node = null;

-        }

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/build.xml
deleted file mode 100644
index 2f9f3d9625..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/build.xml
+++ /dev/null
@@ -1,31 +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="scatours-contribution-creditcard-payment-sdo" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="sdojavagen">

-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardDetailsType.class"/>

-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-            <param name="prefix" value="CreditCardPayment"/>

-        </antcall>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml
deleted file mode 100644
index 082d3e0fe5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/pom.xml
+++ /dev/null
@@ -1,142 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-creditcard-payment-sdo</artifactId>
-    <name>Apache Tuscany SCA Tours Credit Card Payment Contribution SDO</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/sdo-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sdo</groupId>
-                <artifactId>tuscany-sdo-plugin</artifactId>
-                <version>1.1.1</version>
-                <executions>
-                    <execution>
-                        <id>generate-sdo</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <schemaFile>
-                                ${basedir}/src/main/resources/CreditCardPayment.wsdl
-                            </schemaFile>
-                            <javaPackage>com.tuscanyscatours.payment.creditcard</javaPackage>
-                            <prefix>CreditCardPayment</prefix>
-                            <noNotification>true</noNotification>
-                            <noContainer>true</noContainer>
-                            <noUnsettable>true</noUnsettable>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/CreditCardPayment.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/CreditCardPayment.java
deleted file mode 100644
index 9f508ecc59..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/CreditCardPayment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.tuscanyscatours.payment.creditcard;

-

-import javax.jws.WebMethod;

-import javax.jws.WebParam;

-import javax.jws.WebResult;

-import javax.jws.WebService;

-import javax.xml.ws.RequestWrapper;

-import javax.xml.ws.ResponseWrapper;

-

-/**

- * This class was generated by the JAX-WS RI.

- * JAX-WS RI 2.1.3-b02-

- * Generated source version: 2.1

- * 

- */

-@WebService(name = "CreditCardPayment", targetNamespace = "http://tuscanyscatours.com/CreditCardPayment/")

-public interface CreditCardPayment {

-

-    /**

-     * 

-     * @param amount

-     * @param creditCard

-     * @return

-     *     returns java.lang.String

-     */

-    @WebMethod(action = "http://tuscanyscatours.com/CreditCardPayment/authorize")

-    @WebResult(name = "Status", targetNamespace = "")

-    @RequestWrapper(localName = "authorize", targetNamespace = "http://tuscanyscatours.com/CreditCardPayment/", className = "com.tuscanyscatours.payment.creditcard.AuthorizeType")

-    @ResponseWrapper(localName = "authorizeResponse", targetNamespace = "http://tuscanyscatours.com/CreditCardPayment/", className = "com.tuscanyscatours.payment.creditcard.AuthorizeResponseType")

-    public String authorize(@WebParam(name = "CreditCard", targetNamespace = "") CreditCardDetailsType creditCard,

-                            @WebParam(name = "Amount", targetNamespace = "") float amount);

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
deleted file mode 100644
index 13dc7428d1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/java/com/tuscanyscatours/payment/creditcard/impl/CreditCardPaymentImpl.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package com.tuscanyscatours.payment.creditcard.impl;

-

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

-import com.tuscanyscatours.payment.creditcard.CreditCardPayment;

-

-/**

- * 

- */

-@Service(CreditCardPayment.class)

-public class CreditCardPaymentImpl implements CreditCardPayment {

-

-    public String authorize(CreditCardDetailsType creditCard, float amount) {

-        if (creditCard != null) {

-            System.out.println("Checking card: name = " + creditCard.getCardOwner().getName()

-                + " number = "

-                + creditCard.getCreditCardNumber()

-                + " for amount "

-                + amount);

-        } else {

-            System.out.println("Checking card is null");

-        }

-

-        return "OK";

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index d7e274aeee..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,117 +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="CreditCardPayment" 

-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 

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

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">

-            

-            <xsd:element name="authorize" type="tns:AuthorizeType"/>

-            <xsd:complexType name="AuthorizeType">

-                <xsd:sequence>

-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>

-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>

-            <xsd:complexType name="AuthorizeResponseType">

-                <xsd:sequence>

-                    <xsd:element name="Status" type="xsd:string"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="CreditCardDetailsType">

-                <xsd:sequence>

-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />

-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />

-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />

-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:simpleType name="CreditCardTypeType">

-                <xsd:restriction base="xsd:token">

-                    <xsd:enumeration value="Visa" />

-                    <xsd:enumeration value="MasterCard" />

-                    <xsd:enumeration value="Discover" />

-                    <xsd:enumeration value="Amex" />

-                </xsd:restriction>

-            </xsd:simpleType>

-            <xsd:complexType name="PayerType">

-                <xsd:sequence>

-                    <xsd:element name="Name" type="xsd:string" />

-                    <xsd:element name="Address" type="tns:AddressType" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:complexType name="AddressType">

-                <xsd:sequence>

-                    <xsd:element name="Street" type="xsd:string" />

-                    <xsd:element name="City" type="xsd:string" />

-                    <xsd:element name="State" type="xsd:string" />

-                    <xsd:element name="ZipCode" type="xsd:string" />

-                    <xsd:element name="HomePhone" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType> 

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="AuthorizeRequest">

-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeResponse">

-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="CreditCardPayment">

-        <wsdl:operation name="authorize">

-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>

-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">

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

-        <wsdl:operation name="authorize">

-            <soap:operation soapAction="http://www.example.org/CreditCardPayment/authorize" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="CreditCardPaymentService">

-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">

-            <soap:address location="http://localhost:8080/CreditCardPayment" />

-        </wsdl:port>

-    </wsdl:service>

-

-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">

-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>

-    </plnk:partnerLinkType>

-    

-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 34f5ec3d0e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-              xmlns:tours="http://tuscanyscatours.com/">
-    <deployable composite="tours:creditcard" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite
deleted file mode 100644
index 392af83d2e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/main/resources/creditcard.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-           targetNamespace="http://tuscanyscatours.com/"
-           name="creditcard">
-
-    <component name="CreditCardPayment">
-        <implementation.java class="com.tuscanyscatours.payment.creditcard.impl.CreditCardPaymentImpl" />
-        <service name="CreditCardPayment">
-            <interface.wsdl interface="http://www.tuscanyscatours.com/CreditCardPayment/#wsdl.interface(CreditCardPayment)"/>
-            <binding.ws uri="http://localhost:8082/CreditCardPayment" />
-            <binding.sca />
-        </service>
-    </component>
-    
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
deleted file mode 100644
index b2ffc3fc4d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-sdo/src/test/java/scatours/payment/creditcard/CreditCardPaymentTestCase.java
+++ /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.    

- */

-

-package scatours.payment.creditcard;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

-import com.tuscanyscatours.payment.creditcard.CreditCardPayment;

-import com.tuscanyscatours.payment.creditcard.CreditCardPaymentFactory;

-import com.tuscanyscatours.payment.creditcard.PayerType;

-

-/**

- * 

- */

-public class CreditCardPaymentTestCase {

-    private static Node node;

-

-    /**

-     * @throws java.lang.Exception

-     */

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-        NodeFactory factory = NodeFactory.getInstance();

-        node = factory.createNode(new Contribution("creditcard-sdo", "./target/classes"));

-        node.start();

-    }

-

-    @Test

-    public void testCreditCardPayment() {

-        Node client = (Node)node;

-        CreditCardPayment cc = client.getService(CreditCardPayment.class, "CreditCardPayment");

-

-        CreditCardPaymentFactory factory = CreditCardPaymentFactory.INSTANCE;

-        CreditCardDetailsType ccDetails = factory.createCreditCardDetailsType();

-        ccDetails.setCreditCardType("Visa");

-        ccDetails.setCreditCardNumber("1111-2222-3333-4444");

-        ccDetails.setExpMonth(9);

-        ccDetails.setExpYear(2010);

-        PayerType ccOwner = factory.createPayerType();

-        ccOwner.setName("Fred");

-        ccDetails.setCardOwner(ccOwner);

-

-        System.out.println(cc.authorize(ccDetails, 100.00f));

-    }

-

-    /**

-     * @throws java.lang.Exception

-     */

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

-        if (node != null) {

-            node.stop();

-            node = null;

-        }

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml
deleted file mode 100644
index 7c3a55c530..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/build.xml
+++ /dev/null
@@ -1,164 +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="scatours-contribution-creditcard-payment-webapp" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-        </antcall>

-    </target>

-

-    <target name="copy-lib">

-        <antcall target="add-implementation-web"/>

-        <copy todir="target/lib">

-            <fileset file="../creditcard-payment-jaxb/target/scatours-contribution-creditcard-payment-jaxb.jar"/>

-            <fileset refid="tuscany-modules"/>

-            <fileset refid="tuscany-dependencies"/>

-        </copy>

-    </target>

-

-    <fileset id="tuscany-modules" dir="${env.TUSCANY_HOME}/modules">

-        <include name="tuscany-assembly-1.*.jar"/>

-        <include name="tuscany-assembly-xml-1.*.jar"/>

-        <include name="tuscany-assembly-xsd-1.*.jar"/>

-        <include name="tuscany-binding-jsonrpc-1.*.jar"/>

-        <include name="tuscany-binding-jsonrpc-runtime-1.*.jar"/>

-        <include name="tuscany-binding-sca-1.*.jar"/>

-        <include name="tuscany-binding-sca-xml-1.*.jar"/>

-        <include name="tuscany-binding-ws-1.*.jar"/>

-        <include name="tuscany-binding-ws-axis2-1.*.jar"/>

-        <include name="tuscany-binding-ws-axis2-policy-1.*.jar"/>

-        <include name="tuscany-binding-ws-wsdlgen-1.*.jar"/>

-        <include name="tuscany-binding-ws-xml-1.*.jar"/>

-        <include name="tuscany-contribution-1.*.jar"/>

-        <include name="tuscany-contribution-impl-1.*.jar"/>

-        <include name="tuscany-contribution-java-1.*.jar"/>

-        <include name="tuscany-contribution-jee-1.*.jar"/>

-        <include name="tuscany-contribution-namespace-1.*.jar"/>

-        <include name="tuscany-contribution-xml-1.*.jar"/>

-        <include name="tuscany-core-1.*.jar"/>

-        <include name="tuscany-core-databinding-1.*.jar"/>

-        <include name="tuscany-core-spi-1.*.jar"/>

-        <include name="tuscany-databinding-1.*.jar"/>

-        <include name="tuscany-databinding-axiom-1.*.jar"/>

-        <include name="tuscany-databinding-jaxb-1.*.jar"/>

-        <include name="tuscany-databinding-jaxb-axiom-1.*.jar"/>

-        <include name="tuscany-databinding-json-1.*.jar"/>

-        <include name="tuscany-definitions-1.*.jar"/>

-        <include name="tuscany-definitions-xml-1.*.jar"/>

-        <include name="tuscany-endpoint-1.*.jar"/>

-        <include name="tuscany-extensibility-1.*.jar"/>

-        <include name="tuscany-host-embedded-1.*.jar"/>

-        <include name="tuscany-host-http-1.*.jar"/>

-        <include name="tuscany-host-jetty-1.*.jar"/>

-        <include name="tuscany-host-webapp-1.*.jar"/>

-        <include name="tuscany-implementation-java-1.*.jar"/>

-        <include name="tuscany-implementation-java-runtime-1.*.jar"/>

-        <include name="tuscany-implementation-java-xml-1.*.jar"/>

-        <include name="tuscany-implementation-node-1.*.jar"/>

-        <include name="tuscany-implementation-web-1.*.jar"/>

-        <include name="tuscany-implementation-web-runtime-1.*.jar"/>

-        <include name="tuscany-interface-1.*.jar"/>

-        <include name="tuscany-interface-java-1.*.jar"/>

-        <include name="tuscany-interface-java-jaxws-1.*.jar"/>

-        <include name="tuscany-interface-java-xml-1.*.jar"/>

-        <include name="tuscany-interface-wsdl-1.*.jar"/>

-        <include name="tuscany-interface-wsdl-xml-1.*.jar"/>

-        <include name="tuscany-monitor-1.*.jar"/>

-        <include name="tuscany-node-api-1.*.jar"/>

-        <include name="tuscany-node-impl-1.*.jar"/>

-        <include name="tuscany-policy-1.*.jar"/>

-        <include name="tuscany-policy-security-1.*.jar"/>

-        <include name="tuscany-policy-xml-1.*.jar"/>

-        <include name="tuscany-policy-xml-ws-1.*.jar"/>

-        <include name="tuscany-sca-api-1.*.jar"/>

-        <include name="tuscany-sca-api-extension-1.*.jar"/>

-        <include name="tuscany-xsd-1.*.jar"/>

-        <include name="tuscany-xsd-xml-1.*.jar"/>

-    </fileset>

-

-    <fileset id="tuscany-dependencies" dir="${env.TUSCANY_HOME}/lib">

-        <include name="activation-1.1.jar"/>

-        <include name="annogen-0.1.0.jar"/>

-        <include name="asm-3.1.jar"/>

-        <include name="axiom-api-1.2.7.jar"/>

-        <include name="axiom-dom-1.2.7.jar"/>

-        <include name="axiom-impl-1.2.7.jar"/>

-        <include name="axis-ant-1.4.jar"/>

-        <include name="axis2-adb-1.4.1.jar"/>

-        <include name="axis2-codegen-1.4.1.jar"/>

-        <include name="axis2-java2wsdl-1.4.1.jar"/>

-        <include name="axis2-kernel-1.4.1.jar"/>

-        <include name="axis2-mtompolicy-1.4.1.jar"/>

-        <include name="backport-util-concurrent-3.1.jar"/>

-        <include name="cglib-nodep-2.2.jar"/>

-        <include name="common-2.2.3.jar"/>

-        <include name="commons-codec-1.3.jar"/>

-        <include name="commons-collections-3.1.jar"/>

-        <include name="commons-discovery-0.2.jar"/>

-        <include name="commons-fileupload-1.2.jar"/>

-        <include name="commons-httpclient-3.1.jar"/>

-        <include name="commons-io-1.4.jar"/>

-        <include name="commons-logging-1.1.1.jar"/>

-        <include name="dom4j-1.6.1.jar"/>

-        <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>

-        <include name="geronimo-javamail_1.4_spec-1.2.jar"/>

-        <include name="geronimo-jms_1.1_spec-1.1.jar"/>

-        <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>

-        <include name="httpcore-4.0-beta1.jar"/>

-        <include name="httpcore-nio-4.0-beta1.jar"/>

-        <include name="jaxb-api-2.1.jar"/>

-        <include name="jaxb-impl-2.1.7.jar"/>

-        <include name="jaxen-1.1.1.jar"/>

-        <include name="jaxws-api-2.1.jar"/>

-        <include name="jdom-1.0.jar"/>

-        <include name="jettison-1.0.1.jar"/>

-        <include name="jetty-6.1.7.jar"/>

-        <include name="jetty-util-6.1.7.jar"/>

-        <include name="json-rpc-1.0.jar"/>

-        <include name="jsr181-api-1.0-MR1.jar"/>

-        <include name="jsr250-api-1.0.jar"/>

-        <include name="junit-4.5.jar"/>

-        <include name="log4j-1.2.15.jar"/>

-        <include name="mail-1.4.jar"/>

-        <include name="mex-1.41-impl.jar"/>

-        <include name="neethi-2.0.4.jar"/>

-        <include name="opensaml-1.1.jar"/>

-        <include name="rampart-core-1.4.jar"/>

-        <include name="rampart-policy-1.4.jar"/>

-        <include name="rampart-trust-1.4.jar"/>

-        <include name="servlet-api-2.5.jar"/>

-        <include name="stax-api-1.0-2.jar"/>

-        <include name="woden-api-1.0M8.jar"/>

-        <include name="woden-impl-dom-1.0M8.jar"/>

-        <include name="wsdl4j-1.6.2.jar"/>

-        <include name="wss4j-1.5.4.jar"/>

-        <include name="wstx-asl-3.2.4.jar"/>

-        <include name="xalan-2.7.0.jar"/>

-        <include name="xercesImpl-2.8.1.jar"/>

-        <include name="xml-apis-1.3.03.jar"/>

-        <include name="xmlParserAPIs-2.6.0.jar"/>

-        <include name="XmlSchema-1.4.2.jar"/>

-        <include name="xmlsec-1.4.2.jar"/>

-    </fileset>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
deleted file mode 100644
index 60df41705a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
+++ /dev/null
@@ -1,66 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-creditcard-payment-webapp</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Tours CreditCard Payment WebApp Contribution</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>compile</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 6dcc619c48..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,134 +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="CreditCardPayment"

-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"

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

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">

-

-            <!-- https://jaxb.dev.java.net/issues/show_bug.cgi?id=518 -->

-            <!-- I have to change the complex types to be annoymous -->

-            <xsd:element name="authorize">

-            <xsd:complexType>

-                <xsd:sequence>

-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>

-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            </xsd:element>

-

-            <xsd:element name="authorizeResponse">

-            <xsd:complexType>

-                <xsd:sequence>

-                    <xsd:element name="Status" type="xsd:string"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            </xsd:element>

-

-            <xsd:complexType name="CreditCardDetailsType">

-                <xsd:sequence>

-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />

-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />

-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />

-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:simpleType name="CreditCardTypeType">

-                <xsd:restriction base="xsd:token">

-                    <xsd:enumeration value="Visa" />

-                    <xsd:enumeration value="MasterCard" />

-                    <xsd:enumeration value="Discover" />

-                    <xsd:enumeration value="Amex" />

-                </xsd:restriction>

-            </xsd:simpleType>

-            <xsd:complexType name="PayerType">

-                <xsd:sequence>

-                    <xsd:element name="Name" type="xsd:string" />

-                    <xsd:element name="Address" type="tns:AddressType" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:complexType name="AddressType">

-                <xsd:sequence>

-                    <xsd:element name="Street" type="xsd:string" />

-                    <xsd:element name="City" type="xsd:string" />

-                    <xsd:element name="State" type="xsd:string" />

-                    <xsd:element name="ZipCode" type="xsd:string" />

-                    <xsd:element name="HomePhone" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:element name="authorizeFault">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="errorCode" type="xsd:string"></xsd:element>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="AuthorizeRequest">

-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeResponse">

-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeFault">

-        <wsdl:part name="parameters" element="tns:authorizeFault"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="CreditCardPayment">

-        <wsdl:operation name="authorize">

-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>

-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>

-            <wsdl:fault name="authorizationFailure" message="tns:AuthorizeFault"></wsdl:fault>
-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">

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

-        <wsdl:operation name="authorize">

-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="authorizationFailure">

-                <soap:fault name="authorizationFailure" use="literal"/>

-            </wsdl:fault>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="CreditCardPaymentService">

-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">

-            <soap:address location="http://localhost:8080/CreditCardPayment" />

-        </wsdl:port>

-    </wsdl:service>

-

-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">

-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>

-    </plnk:partnerLinkType>

-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index a0bfe2c713..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-              xmlns:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:creditcard-webapp" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index cf146e4f5b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/META-INF/sca-deployables/web.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           targetNamespace="http://tuscanyscatours.com/"

-           name="creditcard-webapp">

-

-   <component name="CreditCardPaymentWeb">

-        <implementation.web web-uri="" />

-        <reference name="service" target="CreditCardPayment">

-            <interface.java interface="com.tuscanyscatours.payment.creditcard.CreditCardPayment"/>

-            <!-- 

-            <binding.ws uri="http://localhost:8082/CreditCardPayment" />

-             -->

-        </reference>

-    </component>

-

-    <component name="CreditCardPayment">

-        <implementation.java class="com.tuscanyscatours.payment.creditcard.impl.CreditCardPaymentImpl" />

-        <service name="CreditCardPayment">

-            <interface.wsdl interface="http://www.tuscanyscatours.com/CreditCardPayment/#wsdl.interface(CreditCardPayment)" /> 

-            <binding.ws uri="http://localhost:8080/CreditCardPayment" />

-            <binding.sca/>

-        </service>

-    </component>

-    

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a6188e25ba..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<web-app version="2.4"

-    xmlns="http://java.sun.com/xml/ns/j2ee"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >

-

-    <display-name>SCA Tours Credit Card Payment WebApp</display-name>

-

-    <filter>

-        <filter-name>tuscany</filter-name>

-        <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>

-    </filter>

-

-    <filter-mapping>

-        <filter-name>tuscany</filter-name>

-        <url-pattern>/*</url-pattern>

-    </filter-mapping>

-

-    <welcome-file-list>

-        <welcome-file>creditcard.jsp</welcome-file>

-    </welcome-file-list>

-</web-app>

-

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/creditcard.jsp b/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/creditcard.jsp
deleted file mode 100644
index 98b7f41e7b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/src/main/webapp/creditcard.jsp
+++ /dev/null
@@ -1,71 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<%@ page contentType="text/html;charset=UTF-8" language="java"%>

-<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca"%>

-

-<sca:reference name="service"

-	type="com.tuscanyscatours.payment.creditcard.CreditCardPayment" />

-

-

-<%@page import="com.tuscanyscatours.payment.creditcard.CreditCardPaymentService"%>

-<%@page import="com.tuscanyscatours.payment.creditcard.ObjectFactory"%>

-<%@page import="com.tuscanyscatours.payment.creditcard.CreditCardDetailsType"%>

-<%@page import="com.tuscanyscatours.payment.creditcard.CreditCardTypeType"%>

-<%@page import="com.tuscanyscatours.payment.creditcard.PayerType"%><html>

-<body>

-

-<h2>SCATours Credit Card Payment Web Application</h2>

-

-<p>

-<form action="creditcard.jsp" method="get">Card Type: <select

-	name="type">

-	<option value="Visa" selected="selected">Visa</option>

-	<option value="MasterCard">MasterCard</option>

-	<option value="Amex">Amex</option>

-	<option value="Discover">Discover</option>

-</select> <br />

-Card Number: <input type="text" name="cardNumber" /><br />

-Card Holder: <input type="text" name="cardHolder" /><br />

-Amount (EUR): <input type="text" name="amount" /><br />

-<p>

-<input type="submit" name="charge" value="Submit" /></form>

-

-<%

-    String c = request.getParameter("charge");

-    if (c != null) {

-        ObjectFactory objectFactory = new ObjectFactory();

-        CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();

-        ccDetails.setCreditCardType(CreditCardTypeType.fromValue(request.getParameter("type")));

-        ccDetails.setCreditCardNumber(request.getParameter("cardNumber"));

-        ccDetails.setCVV2("123");

-        ccDetails.setExpMonth(12);

-        ccDetails.setExpYear(2011);

-        PayerType ccOwner = objectFactory.createPayerType();

-        ccOwner.setName(request.getParameter("cardHolder"));

-        ccDetails.setCardOwner(ccOwner);

-        float amount = Float.parseFloat(request.getParameter("amount"));

-%>

-<%=service.authorize(ccDetails, amount)%>

-<%

-    }

-%>

-

-</body>

-</html>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/build.xml
deleted file mode 100644
index fa2ac47a64..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-currency-corba" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/pom.xml
deleted file mode 100644
index dbcacc4d7f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/pom.xml
+++ /dev/null
@@ -1,51 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-currency-corba</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter Contribution With CORBA Binding</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 6a067411f1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-    <import.java package="com.tuscanyscatours.currencyconverter"/>

-    <import.java package="com.tuscanyscatours.currencyconverter.impl"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.composite
deleted file mode 100644
index bd1c23e6f6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-corba/src/main/resources/currency-converter-corba.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-    targetNamespace="http://tuscanyscatours.com/"

-    name="currencyconverter">

-

-    <component name="CurrencyConverter">

-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />

-        <service name="CurrencyConverter">

-            <interface.java interface="com.tuscanyscatours.currencyconverter.CurrencyConverter" />

-                <tuscany:binding.corba host="localhost" port="5080" name="CurrencyConverterCORBAService"/>

-        </service>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/build.xml
deleted file mode 100644
index 1b5cef445b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-currency-jms" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml
deleted file mode 100644
index 1b63b608fc..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/pom.xml
+++ /dev/null
@@ -1,77 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-currency-jms</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter Contribution With JMS Binding</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-all</artifactId>

-            <version>5.2.0</version>

-            <scope>test</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.activemq</groupId>

-                    <artifactId>activemq-web-demo</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 0eea8a6b52..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

--->

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-    <import.java package="com.tuscanyscatours.currencyconverter" />

-    <import.java package="com.tuscanyscatours.currencyconverter.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
deleted file mode 100644
index cc73ceb3ef..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
+++ /dev/null
@@ -1,37 +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"

-    targetNamespace="http://tuscanyscatours.com/"

-    name="currencyconverter">

-

-    <component name="CurrencyConverter">

-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>

-        <service name="CurrencyConverter">

-            <interface.java interface="com.tuscanyscatours.currencyconverter.CurrencyConverter"/>

-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"

-                             jndiURL="tcp://localhost:61619">

-                <destination name="RequestQueue" create="ifnotexist"/>

-                <response>

-                    <destination name="ResponseQueue" create="ifnotexist"/>

-                </response>

-            </binding.jms>

-        </service>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/build.xml
deleted file mode 100644
index d1b0d955ac..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/build.xml
+++ /dev/null
@@ -1,97 +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="scatours-contribution-currency-jsp" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="copy-lib">

-        <antcall target="add-implementation-web"/>

-        <copy todir="target/lib">

-            <fileset file="../currency/target/scatours-contribution-currency.jar"/>

-            <fileset refid="tuscany-modules"/>

-            <fileset refid="tuscany-dependencies"/>

-        </copy>

-    </target>

-

-    <fileset id="tuscany-modules" dir="${env.TUSCANY_HOME}/modules">

-        <include name="tuscany-assembly-1.*.jar"/>

-        <include name="tuscany-assembly-xml-1.*.jar"/>

-        <include name="tuscany-assembly-xsd-1.*.jar"/>

-        <include name="tuscany-binding-sca-1.*.jar"/>

-        <include name="tuscany-binding-sca-xml-1.*.jar"/>

-        <include name="tuscany-contribution-1.*.jar"/>

-        <include name="tuscany-contribution-impl-1.*.jar"/>

-        <include name="tuscany-contribution-java-1.*.jar"/>

-        <include name="tuscany-contribution-jee-1.*.jar"/>

-        <include name="tuscany-contribution-namespace-1.*.jar"/>

-        <include name="tuscany-contribution-xml-1.*.jar"/>

-        <include name="tuscany-core-1.*.jar"/>

-        <include name="tuscany-core-databinding-1.*.jar"/>

-        <include name="tuscany-core-spi-1.*.jar"/>

-        <include name="tuscany-databinding-1.*.jar"/>

-        <include name="tuscany-databinding-jaxb-1.*.jar"/>

-        <include name="tuscany-definitions-1.*.jar"/>

-        <include name="tuscany-definitions-xml-1.*.jar"/>

-        <include name="tuscany-endpoint-1.*.jar"/>

-        <include name="tuscany-extensibility-1.*.jar"/>

-        <include name="tuscany-host-embedded-1.*.jar"/>

-        <include name="tuscany-host-http-1.*.jar"/>

-        <include name="tuscany-host-webapp-1.*.jar"/>

-        <include name="tuscany-implementation-java-1.*.jar"/>

-        <include name="tuscany-implementation-java-runtime-1.*.jar"/>

-        <include name="tuscany-implementation-java-xml-1.*.jar"/>

-        <include name="tuscany-implementation-node-1.*.jar"/>

-        <include name="tuscany-implementation-web-1.*.jar"/>

-        <include name="tuscany-implementation-web-runtime-1.*.jar"/>

-        <include name="tuscany-interface-1.*.jar"/>

-        <include name="tuscany-interface-java-1.*.jar"/>

-        <include name="tuscany-interface-java-jaxws-1.*.jar"/>

-        <include name="tuscany-interface-java-xml-1.*.jar"/>

-        <include name="tuscany-monitor-1.*.jar"/>

-        <include name="tuscany-node-api-1.*.jar"/>

-        <include name="tuscany-node-impl-1.*.jar"/>

-        <include name="tuscany-policy-1.*.jar"/>

-        <include name="tuscany-policy-xml-1.*.jar"/>

-        <include name="tuscany-sca-api-1.*.jar"/>

-        <include name="tuscany-sca-api-extension-1.*.jar"/>

-        <include name="tuscany-xsd-1.*.jar"/>

-    </fileset>

-

-    <fileset id="tuscany-dependencies" dir="${env.TUSCANY_HOME}/lib">

-        <include name="activation-1.1.jar"/>

-        <include name="asm-3.1.jar"/>

-        <include name="axiom-api-1.2.7.jar"/>

-        <include name="axiom-impl-1.2.7.jar"/>

-        <include name="cglib-nodep-2.2.jar"/>

-        <include name="common-2.2.3.jar"/>

-        <include name="commons-logging-1.1.1.jar"/>

-        <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>

-        <include name="geronimo-javamail_1.4_spec-1.2.jar"/>

-        <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>

-        <include name="jaxb-api-2.1.jar"/>

-        <include name="jaxb-impl-2.1.7.jar"/>

-        <include name="jaxen-1.1.1.jar"/>

-        <include name="jaxws-api-2.1.jar"/>

-        <include name="jsr181-api-1.0-MR1.jar"/>

-        <include name="jsr250-api-1.0.jar"/>

-        <include name="stax-api-1.0-2.jar"/>

-        <include name="wstx-asl-3.2.4.jar"/>

-        <include name="XmlSchema-1.4.2.jar"/>

-    </fileset>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml
deleted file mode 100644
index 3aa04a0b7d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/pom.xml
+++ /dev/null
@@ -1,65 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-currency-jsp</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Tours Currency Converter JSP Contribution</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>compile</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-currency</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 2c209b0651..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
+++ /dev/null
@@ -1,34 +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://tuscanyscatours.com/"

-    name="CurrencyConverterJSP">

-

-    <component name="WebClient">

-        <implementation.web web-uri=""/>

-        <reference name="currencyConverter" target="CurrencyConverter"/>

-    </component>

-

-    <component name="CurrencyConverter">

-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>

-        <service name="CurrencyConverter"/>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 3b2c79ca76..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<web-app version="2.4"

-    xmlns="http://java.sun.com/xml/ns/j2ee"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >

-

-    <display-name>SCA Tours Currency Converter JSP</display-name>

-

-    <filter>

-        <filter-name>tuscany</filter-name>

-        <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>

-    </filter>

-

-    <filter-mapping>

-        <filter-name>tuscany</filter-name>

-        <url-pattern>/*</url-pattern>

-    </filter-mapping>

-

-    <welcome-file-list>

-        <welcome-file>currency-converter.jsp</welcome-file>

-    </welcome-file-list>

-</web-app>

-

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp
deleted file mode 100644
index daf8c5cff1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<%@ page contentType="text/html;charset=UTF-8" language="java" %>

-<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>

-

-<sca:reference name="currencyConverter" type="com.tuscanyscatours.currencyconverter.CurrencyConverter"/>

-

-<html>

-<body>

-<h2>SCA Tours Currency Converter JSP</h2>

-Welcome to the SCA Tours Currency Converter:

-<p>

-

-<form method=post action="currency-converter.jsp">

-Enter value in US Dollars

-<input type=text name=dollars size=15>

-<p>

-<input type=submit>

-</form>

-

-<p>

-

-<%

-   String dollarsStr = request.getParameter( "dollars" );

-   if ( dollarsStr != null) {

-       double dollars = Double.parseDouble(dollarsStr);

-       double converted = currencyConverter.convert("USD", "GBP", dollars);

-       out.println(dollars + " US Dollars = " + converted + " GB Pounds");

-   }

-%>

-</body>

-</html>

-

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/build.xml
deleted file mode 100644
index a969f0c819..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-currency-rmi" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/pom.xml
deleted file mode 100644
index 7c3f88c18f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/pom.xml
+++ /dev/null
@@ -1,51 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-currency-rmi</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter Contribution With RMI Binding</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index e335c8d4f3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-    <import.java package="com.tuscanyscatours.currencyconverter" />

-    <import.java package="com.tuscanyscatours.currencyconverter.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
deleted file mode 100644
index 55a815572b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-    targetNamespace="http://tuscanyscatours.com/"

-    name="currencyconverter">

-

-    <component name="CurrencyConverter">

-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />

-        <service name="CurrencyConverter">

-            <interface.java interface="com.tuscanyscatours.currencyconverter.CurrencyConverter" />

-            <tuscany:binding.rmi host="localhost" port="8099" serviceName="CurrencyConverterRMI"/>

-        </service>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/build.xml
deleted file mode 100644
index 23edaad6a6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/build.xml
+++ /dev/null
@@ -1,100 +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="scatours-contribution-currency-servlet" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../currency/target/scatours-contribution-currency.jar"/>

-    </path>

-

-    <target name="copy-lib">

-        <antcall target="add-implementation-web"/>

-        <copy todir="target/lib">

-            <fileset file="../currency/target/scatours-contribution-currency.jar"/>

-            <fileset refid="tuscany-modules"/>

-            <fileset refid="tuscany-dependencies"/>

-        </copy>

-    </target>

-

-    <fileset id="tuscany-modules" dir="${env.TUSCANY_HOME}/modules">

-        <include name="tuscany-assembly-1.*.jar"/>

-        <include name="tuscany-assembly-xml-1.*.jar"/>

-        <include name="tuscany-assembly-xsd-1.*.jar"/>

-        <include name="tuscany-binding-sca-1.*.jar"/>

-        <include name="tuscany-binding-sca-xml-1.*.jar"/>

-        <include name="tuscany-contribution-1.*.jar"/>

-        <include name="tuscany-contribution-impl-1.*.jar"/>

-        <include name="tuscany-contribution-java-1.*.jar"/>

-        <include name="tuscany-contribution-jee-1.*.jar"/>

-        <include name="tuscany-contribution-namespace-1.*.jar"/>

-        <include name="tuscany-contribution-xml-1.*.jar"/>

-        <include name="tuscany-core-1.*.jar"/>

-        <include name="tuscany-core-databinding-1.*.jar"/>

-        <include name="tuscany-core-spi-1.*.jar"/>

-        <include name="tuscany-databinding-1.*.jar"/>

-        <include name="tuscany-databinding-jaxb-1.*.jar"/>

-        <include name="tuscany-definitions-1.*.jar"/>

-        <include name="tuscany-definitions-xml-1.*.jar"/>

-        <include name="tuscany-endpoint-1.*.jar"/>

-        <include name="tuscany-extensibility-1.*.jar"/>

-        <include name="tuscany-host-embedded-1.*.jar"/>

-        <include name="tuscany-host-http-1.*.jar"/>

-        <include name="tuscany-host-webapp-1.*.jar"/>

-        <include name="tuscany-implementation-java-1.*.jar"/>

-        <include name="tuscany-implementation-java-runtime-1.*.jar"/>

-        <include name="tuscany-implementation-java-xml-1.*.jar"/>

-        <include name="tuscany-implementation-node-1.*.jar"/>

-        <include name="tuscany-implementation-web-1.*.jar"/>

-        <include name="tuscany-implementation-web-runtime-1.*.jar"/>

-        <include name="tuscany-interface-1.*.jar"/>

-        <include name="tuscany-interface-java-1.*.jar"/>

-        <include name="tuscany-interface-java-jaxws-1.*.jar"/>

-        <include name="tuscany-interface-java-xml-1.*.jar"/>

-        <include name="tuscany-monitor-1.*.jar"/>

-        <include name="tuscany-node-api-1.*.jar"/>

-        <include name="tuscany-node-impl-1.*.jar"/>

-        <include name="tuscany-policy-1.*.jar"/>

-        <include name="tuscany-policy-xml-1.*.jar"/>

-        <include name="tuscany-sca-api-1.*.jar"/>

-        <include name="tuscany-sca-api-extension-1.*.jar"/>

-        <include name="tuscany-xsd-1.*.jar"/>

-    </fileset>

-

-    <fileset id="tuscany-dependencies" dir="${env.TUSCANY_HOME}/lib">

-        <include name="activation-1.1.jar"/>

-        <include name="asm-3.1.jar"/>

-        <include name="axiom-api-1.2.7.jar"/>

-        <include name="axiom-impl-1.2.7.jar"/>

-        <include name="cglib-nodep-2.2.jar"/>

-        <include name="common-2.2.3.jar"/>

-        <include name="commons-logging-1.1.1.jar"/>

-        <include name="geronimo-activation_1.1_spec-1.0.1.jar"/>

-        <include name="geronimo-javamail_1.4_spec-1.2.jar"/>

-        <include name="geronimo-stax-api_1.0_spec-1.0.1.jar"/>

-        <include name="jaxb-api-2.1.jar"/>

-        <include name="jaxb-impl-2.1.7.jar"/>

-        <include name="jaxen-1.1.1.jar"/>

-        <include name="jaxws-api-2.1.jar"/>

-        <include name="jsr181-api-1.0-MR1.jar"/>

-        <include name="jsr250-api-1.0.jar"/>

-        <include name="stax-api-1.0-2.jar"/>

-        <include name="wstx-asl-3.2.4.jar"/>

-        <include name="XmlSchema-1.4.2.jar"/>

-    </fileset>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml
deleted file mode 100644
index bce29ad874..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/pom.xml
+++ /dev/null
@@ -1,72 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-currency-servlet</artifactId>

-    <packaging>war</packaging>

-    <name>Apache Tuscany SCA Tours Currency Converter Servlet Contribution</name>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>compile</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-web-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-webapp</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-            <version>2.3</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-currency</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java
deleted file mode 100644
index 465c667f0b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/java/com/tuscanyscatours/currencyconverter/servlet/CurrencyConverterServlet.java
+++ /dev/null
@@ -1,73 +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 com.tuscanyscatours.currencyconverter.servlet;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Reference;
-
-import com.tuscanyscatours.currencyconverter.CurrencyConverter;
-
-public class CurrencyConverterServlet extends HttpServlet {
-
-    @Reference
-    protected CurrencyConverter currencyConverter;
-
-    @Override
-    public void init(ServletConfig config) {
-        if (currencyConverter == null) {
-            // The Currency Converter reference will only be injected from the @Reference 
-            // annotation in containers supporting SCA "deep" integration. In other 
-            // environments in can be looked up from the ComponentContext.
-            ComponentContext context =
-                (ComponentContext)config.getServletContext().getAttribute("org.oasisopen.sca.ComponentContext");
-            currencyConverter = context.getService(CurrencyConverter.class, "currencyConverter");
-        }
-    }
-
-    @Override
-    protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        Writer out = response.getWriter();
-        out.write("<html><body><h2>SCA Tours Currency Converter Servlet</h2>");
-        out.write("Welcome to the SCA Tours Currency Converter Servlet<p>");
-        out.write("<form method=post action=\"CurrencyConverterServlet\">");
-        out.write("Enter value in US Dollars");
-        out.write("<input type=text name=dollars size=15><p>");
-        out.write("<input type=submit>");
-        out.write("</form><p>");
-
-        String dollarsStr = request.getParameter("dollars");
-        if (dollarsStr != null) {
-            double dollars = Double.parseDouble(dollarsStr);
-            double converted = currencyConverter.convert("USD", "GBP", dollars);
-            out.write(dollars + " US Dollars = " + converted + " GB Pounds");
-        }
-
-        out.write("</body></html>");
-        out.flush();
-        out.close();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index bea526802f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
+++ /dev/null
@@ -1,34 +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://scatours.com"

-    name="CurrencyConverterServlet">

-

-    <component name="WebClient">

-        <implementation.web web-uri=""/>

-        <reference name="currencyConverter" target="CurrencyConverter"/>

-    </component>

-

-    <component name="CurrencyConverter">

-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>

-        <service name="CurrencyConverter"/>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 2204c67870..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-servlet/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<web-app version="2.4"

-    xmlns="http://java.sun.com/xml/ns/j2ee"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >

-

-    <display-name>SCA Tours Currency Converter Servlet</display-name>

-

-    <filter>

-        <filter-name>tuscany</filter-name>

-        <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>

-    </filter>

-

-    <filter-mapping>

-        <filter-name>tuscany</filter-name>

-        <url-pattern>/*</url-pattern>

-    </filter-mapping>

-

-    <servlet>

-        <servlet-name>CurrencyConverterServlet</servlet-name>

-        <servlet-class>com.tuscanyscatours.currencyconverter.servlet.CurrencyConverterServlet</servlet-class>

-    </servlet>

-

-    <servlet-mapping>

-        <servlet-name>CurrencyConverterServlet</servlet-name>

-        <url-pattern>/CurrencyConverterServlet</url-pattern>

-    </servlet-mapping>

-

-    <welcome-file-list>

-        <welcome-file>CurrencyConverterServlet</welcome-file>

-    </welcome-file-list>

-</web-app>

-

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/build.xml
deleted file mode 100644
index bf87bbfba6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-currency-ws" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml
deleted file mode 100644
index 5286b36170..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/pom.xml
+++ /dev/null
@@ -1,57 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-currency-ws</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter Contribution With Web Service Binding</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index e335c8d4f3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-    <import.java package="com.tuscanyscatours.currencyconverter" />

-    <import.java package="com.tuscanyscatours.currencyconverter.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
deleted file mode 100644
index a1be5f52c3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency-ws/src/main/resources/currency-converter-ws.composite
+++ /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.    

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-    targetNamespace="http://tuscanyscatours.com/"

-    name="currencyconverter">

-

-    <component name="CurrencyConverter">

-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />

-        <service name="CurrencyConverter">

-            <interface.java interface="com.tuscanyscatours.currencyconverter.CurrencyConverter" />

-            <binding.ws />

-        </service>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/build.xml
deleted file mode 100644
index 0f5811e299..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-currency" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/pom.xml
deleted file mode 100644
index fa9a7a4f34..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/pom.xml
+++ /dev/null
@@ -1,57 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-currency</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
deleted file mode 100644
index 3ebd23b2d0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package com.tuscanyscatours.currencyconverter;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The CurrencyConverter service interface

- */

-@Remotable

-public interface CurrencyConverter {

-

-    double getExchangeRate(String fromCurrencyCode, String toCurrencyCode);

-

-    double convert(String fromCurrencyCode, String toCurrencyCode, double amount);

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.java
deleted file mode 100644
index ee81973986..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/java/com/tuscanyscatours/currencyconverter/impl/CurrencyConverterImpl.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 com.tuscanyscatours.currencyconverter.impl;

-

-import java.util.HashMap;

-import java.util.Map;

-

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.currencyconverter.CurrencyConverter;

-

-/**

- * An implementation of the CurrencyConverter service

- */

-@Service({CurrencyConverter.class})

-public class CurrencyConverterImpl implements CurrencyConverter {

-

-    // currency index

-    private Map<String, Integer> currencyIndex = new HashMap<String, Integer>();

-

-    // exchange rates

-    private final double rates[][] = { {1.00, 0.50, 0.66}, {2.00, 1.00, 1.33}, {1.50, 0.75, 1.00}};

-

-    public CurrencyConverterImpl() {

-        currencyIndex.put("USD", new Integer(0));

-        currencyIndex.put("GBP", new Integer(1));

-        currencyIndex.put("EUR", new Integer(2));

-    }

-

-    public double getExchangeRate(String fromCurrencyCode, String toCurrencyCode) {

-        return rates[currencyIndex.get(fromCurrencyCode).intValue()][currencyIndex.get(toCurrencyCode).intValue()];

-    }

-

-    public double convert(String fromCurrencyCode, String toCurrencyCode, double amount) {

-        return amount * getExchangeRate(fromCurrencyCode, toCurrencyCode);

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index cfd2a68821..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-    <export.java package="com.tuscanyscatours.currencyconverter" />

-    <export.java package="com.tuscanyscatours.currencyconverter.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.composite
deleted file mode 100644
index edfa249cb9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/currency/src/main/resources/currency-converter.composite
+++ /dev/null
@@ -1,28 +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"

-    targetNamespace="http://tuscanyscatours.com/"

-    name="currencyconverter">

-

-    <component name="CurrencyConverter">

-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl" />

-        <service name="CurrencyConverter"/>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/build.xml
deleted file mode 100644
index 94f9290854..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/build.xml
+++ /dev/null
@@ -1,25 +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="scatours-contribution-databinding-client" default="compile">
-    <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../payment-java/target/scatours-contribution-payment-java.jar"/>
-    </path>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/pom.xml
deleted file mode 100644
index b64ebb984f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    *
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    *
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-databinding-client</artifactId>
-    <name>Apache Tuscany SCA Tours Databinding Client Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-contribution-payment-java</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/java/scatours/client/TestClient.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/java/scatours/client/TestClient.java
deleted file mode 100644
index cf5b20f902..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/java/scatours/client/TestClient.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package scatours.client;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.payment.Payment;
-
-@Service(Runnable.class)
-public class TestClient {
-    @Reference
-    protected Payment payment;
-
-    public TestClient() {
-    }
-
-    public void run() {
-        System.out.println("Call Payment component");
-        System.out.println(payment.makePaymentMember("c-0", 100.00f));
-        System.out.println(payment.makePaymentMember("c-1", 100.00f));
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 1df20c6ecd..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:client="http://client.scatours/">
-    <deployable composite="client:Client" />
-    <import.java package="com.tuscanyscatours.payment" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/client.composite
deleted file mode 100644
index bb5a4952c4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/databinding-client/src/main/resources/client.composite
+++ /dev/null
@@ -1,28 +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"
-    targetNamespace="http://client.scatours/"
-    name="Client">
-
-    <component name="TestClient">
-        <implementation.java class="scatours.client.TestClient" />
-        <reference name="payment" target="Payment" />
-    </component>
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/build.xml
deleted file mode 100644
index ec234bcb4a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/build.xml
+++ /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.

--->

-

-<project name="scatours-contribution-emailgateway" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="EmailGateway.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/emailgateway/EmailGateway.class"/>

-            <param name="package" value="com.tuscanyscatours.emailgateway"/>

-        </antcall>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml
deleted file mode 100644
index d2a4b6777a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/pom.xml
+++ /dev/null
@@ -1,137 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-emailgateway</artifactId>

-    <name>Apache Tuscany SCA Tours Email Gateway Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <pluginRepositories>

-        <pluginRepository>

-            <id>java.net2</id>

-            <name>java.net Maven 2.x Repository</name>

-            <url>http://download.java.net/maven/2</url>

-            <snapshots>

-                <enabled>false</enabled>

-            </snapshots>

-        </pluginRepository>

-    </pluginRepositories>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <executions>

-                    <execution>

-                        <id>wsimport</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>com.tuscanyscatours.emailgateway</packageName>

-                            <wsdlDirectory>${basedir}/src/main/resources

-                        </wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>EmailGateway.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <sourceDestDir>${project.build.directory}/jaxws-source

-                            </sourceDestDir>

-                            <verbose>false</verbose>

-                            <xnocompile>true</xnocompile>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
deleted file mode 100644
index 1371811619..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.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 com.tuscanyscatours.emailgateway.impl;

-

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.emailgateway.EmailGateway;

-import com.tuscanyscatours.emailgateway.EmailType;

-

-/**

- * 

- */

-@Service(EmailGateway.class)

-public class EmailGatewayImpl implements EmailGateway {

-

-    public String sendEmail(EmailType email) {

-        System.out.println("Sending mail to " + email.getTo());

-        return "SENT";

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/EmailGateway.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/EmailGateway.wsdl
deleted file mode 100644
index bb9cd27027..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/EmailGateway.wsdl
+++ /dev/null
@@ -1,89 +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="EmailGateway" 

-                  targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 

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

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

-                    targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"

-                    xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/">

-                    

-            <xsd:element name="sendEmail" type="tns:SendEmailType"/>

-            <xsd:complexType name="SendEmailType">

-                <xsd:sequence>

-                    <xsd:element name="Email" type="tns:EmailType"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>

-            <xsd:complexType name="SendEmailResponseType">

-                <xsd:sequence>

-                    <xsd:element name="Status" type="xsd:string"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="EmailType">

-                <xsd:sequence>

-                    <xsd:element name="To" type="xsd:string"/>

-                    <xsd:element name="Title" type="xsd:string"/>

-                    <xsd:element name="Body" type="xsd:string"/>

-                </xsd:sequence>

-            </xsd:complexType>

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="SendEmailRequest">

-        <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="SendEmailResponse">

-        <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="EmailGateway">

-        <wsdl:operation name="sendEmail">

-            <wsdl:input message="tns:SendEmailRequest"></wsdl:input>

-            <wsdl:output message="tns:SendEmailResponse"></wsdl:output>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="EmailGatewayBinding" type="tns:EmailGateway">

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

-        <wsdl:operation name="sendEmail">

-            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="EmailGatewayService">

-        <wsdl:port name="EmailGatewayPort" binding="tns:EmailGatewayBinding">

-            <soap:address location="http://localhost:8088/EmailGateway" />

-        </wsdl:port>

-    </wsdl:service>

-    

-    <plnk:partnerLinkType name="EmailGatewayLinkType">

-        <plnk:role name="forward" portType="tns:EmailGateway"/>

-    </plnk:partnerLinkType>

-</wsdl:definitions>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 2bb1f7f6d1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/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:e="http://emailgateway" >

-    <deployable composite="e:emailgateway" />

-    <export.java package="com.tuscanyscatours.emailgateway" />

-    <export.java package="com.tuscanyscatours.emailgateway.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
deleted file mode 100644
index aae417fb23..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/main/resources/emailgateway.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-           xmlns:e="http://emailgateway" 
-           targetNamespace="http://emailgateway" 
-           name="emailgateway">
-
-    <component name="EmailGateway">
-        <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl" />
-        <service name="EmailGateway">
-            <binding.ws uri="http://localhost:8088/EmailGateway" />
-        </service>
-    </component>
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
deleted file mode 100644
index e6afc6c62f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/EmailGatewayTestCase.java
+++ /dev/null
@@ -1,76 +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 scatours.emailgateway;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-import com.tuscanyscatours.emailgateway.EmailGateway;

-import com.tuscanyscatours.emailgateway.EmailType;

-import com.tuscanyscatours.emailgateway.ObjectFactory;

-

-/**

- * 

- */

-public class EmailGatewayTestCase {

-    private static Node node;

-

-    /**

-     * @throws java.lang.Exception

-     */

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-        NodeFactory factory = NodeFactory.getInstance();

-        node =

-            factory.createNode(

-                                  new Contribution("emailgateway", "./target/classes"),

-                                  new Contribution("emailgateway-test", "./target/test-classes"));

-        node.start();

-    }

-

-    @Test

-    public void testEmailGateway() {

-        Node client = (Node)node;

-        EmailGateway cc = client.getService(EmailGateway.class, "EmailGatewayClient");

-        ObjectFactory objectFactory = new ObjectFactory();

-        EmailType email = objectFactory.createEmailType();

-        email.setTo("Fred");

-        email.setTitle("An email");

-        email.setBody("A message");

-        System.out.println(cc.sendEmail(email));

-    }

-

-    /**

-     * @throws java.lang.Exception

-     */

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

-        if (node != null) {

-            node.stop();

-            node = null;

-        }

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java
deleted file mode 100644
index 7b21cdecf3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/java/scatours/emailgateway/client/impl/EmailGatewayClientImpl.java
+++ /dev/null
@@ -1,41 +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 scatours.emailgateway.client.impl;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.emailgateway.EmailGateway;

-import com.tuscanyscatours.emailgateway.EmailType;

-

-/**

- * 

- */

-@Service(EmailGateway.class)

-public class EmailGatewayClientImpl implements EmailGateway {

-    @Reference

-    protected EmailGateway emailGateway;

-

-    public String sendEmail(EmailType email) {

-        // Delegate the external web service

-        return emailGateway.sendEmail(email);

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index ee15d8e5ed..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/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:e="http://emailgateway-test">

-    <deployable composite="e:emailgateway-test" />

-    <import.java package="com.tuscanyscatours.emailgateway" />

-    <import.java package="com.tuscanyscatours.emailgateway.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite
deleted file mode 100644
index 8283d54ab6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/emailgateway/src/test/resources/emailgateway-test.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"

-           xmlns:e="http://emailgateway-test" 

-           targetNamespace="http://emailgateway-test" 

-           name="emailgateway-test">

-    <component name="EmailGatewayClient">

-        <implementation.java class="scatours.emailgateway.client.impl.EmailGatewayClientImpl" />

-        <reference name="emailGateway">

-            <binding.ws uri="http://localhost:8088/EmailGateway" />

-        </reference>

-    </component>

-

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/build.xml
deleted file mode 100644
index c23a99e6ca..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-feed-logger" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml
deleted file mode 100644
index 547ebe5d78..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/pom.xml
+++ /dev/null
@@ -1,80 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-feed-logger</artifactId>

-    <name>Apache Tuscany SCA Tours Feed Logger Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-atom</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-atom-runtime</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rss-runtime</artifactId>

-            <version>${tuscany.version}</version>

-        </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/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.java
deleted file mode 100644
index 0f5d18d53b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/FeedLogger.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 com.tuscanyscatours.feedlogger;
-
-public interface FeedLogger {
-
-    /**
-     * Captures the configured feeds and logs the feed entries.
-     * 
-     * @param maxEntriesPerFeed The maximum number of entries to log per feed 
-     */
-    public void logFeeds(int maxEntriesPerFeed);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java
deleted file mode 100644
index daab1be2b4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/java/com/tuscanyscatours/feedlogger/impl/FeedLoggerImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package com.tuscanyscatours.feedlogger.impl;
-
-import java.util.List;
-
-import org.apache.abdera.model.Entry;
-import org.apache.abdera.model.Feed;
-import org.oasisopen.sca.annotation.Reference;
-
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.tuscanyscatours.feedlogger.FeedLogger;
-
-public class FeedLoggerImpl implements FeedLogger {
-
-    /**
-     * Reference to the SCA Tours Blog Atom feed.
-     */
-    @Reference
-    public org.apache.tuscany.sca.binding.atom.collection.Collection scaToursBlogAtom;
-
-    /**
-     * Reference to the SCA Tours Blog RSS feed.
-     */
-    @Reference
-    public org.apache.tuscany.sca.binding.rss.collection.Collection scaToursBlogRSS;
-
-    /**
-     * Reference to the BBC News RSS feed.
-     */
-    @Reference
-    public org.apache.tuscany.sca.binding.rss.collection.Collection bbcNews;
-
-    /**
-     * {@inheritDoc}
-     */
-    public void logFeeds(int maxEntriesPerFeed) {
-        System.out.println("Logging SCA Tours Blog Atom feed:");
-        logAtomFeed(scaToursBlogAtom, maxEntriesPerFeed);
-
-        System.out.println("Logging SCA Tours Blog RSS feed:");
-        logRSSFeed(scaToursBlogRSS, maxEntriesPerFeed);
-
-        System.out.println("Logging BBC News feed:");
-        logRSSFeed(bbcNews, maxEntriesPerFeed);
-    }
-
-    /**
-     * Logs up to maxEntries entries from the specified feed.
-     * 
-     * @param maxEntries The maximum number of entries to log per feed 
-     */
-    private void logAtomFeed(org.apache.tuscany.sca.binding.atom.collection.Collection atomFeed, int maxEntries) {
-        final Feed feed = atomFeed.getFeed();
-        System.out.println("Feed: " + feed.getTitle());
-        final List<Entry> entries = feed.getEntries();
-
-        for (int i = 0; i < entries.size() && i < maxEntries; i++) {
-            Entry entry = entries.get(i);
-            System.out.println("Entry: " + entry.getTitle());
-        }
-        System.out.println();
-    }
-
-    /**
-     * Logs up to maxEntries entries from the specified feed.
-     * 
-     * @param maxEntries The maximum number of entries to log
-     */
-    private void logRSSFeed(org.apache.tuscany.sca.binding.rss.collection.Collection rssFeed, int maxEntries) {
-        SyndFeed feed = rssFeed.getFeed();
-        System.out.println("Feed: " + feed.getTitle());
-
-        List<SyndEntry> entries = feed.getEntries();
-        for (int i = 0; i < entries.size() && i < maxEntries; i++) {
-            SyndEntry entry = entries.get(i);
-            System.out.println("Entry: " + entry.getTitle());
-        }
-        System.out.println();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index dd76faefad..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,21 +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">

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite
deleted file mode 100644
index 7dac81cfc8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/feed-logger/src/main/resources/feed-logger.composite
+++ /dev/null
@@ -1,40 +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://tuscanyscatours.com/"

-    name="feedLogger">

-

-    <service name="FeedLogger" promote="FeedLogger">

-    </service>

-

-    <component name="FeedLogger">

-        <implementation.java class="com.tuscanyscatours.feedlogger.impl.FeedLoggerImpl"/>

-        <reference name="scaToursBlogAtom">

-            <tuscany:binding.atom uri="http://scatours.wordpress.com/?feed=atom"/>

-        </reference>

-        <reference name="scaToursBlogRSS">

-            <tuscany:binding.rss uri="http://scatours.wordpress.com/?feed=rss"/>

-        </reference>

-        <reference name="bbcNews">

-            <tuscany:binding.rss uri="http://newsrss.bbc.co.uk/rss/newsonline_uk_edition/world/rss.xml"/>

-        </reference>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/build.xml
deleted file mode 100644
index 0a151c1a20..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/build.xml
+++ /dev/null
@@ -1,25 +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="scatours-contribution-flight" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../common/target/scatours-contribution-common.jar"/>

-    </path>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/pom.xml
deleted file mode 100644
index 9ece98565f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/pom.xml
+++ /dev/null
@@ -1,62 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-flight</artifactId>

-    <name>Apache Tuscany SCA Tours Flight Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-data-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-common</artifactId>

-            <version>${pom.version}</version>

-        </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/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightImpl.java
deleted file mode 100644
index 82caab00e3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightImpl.java
+++ /dev/null
@@ -1,121 +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 com.tuscanyscatours.flight.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.ComponentName;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.common.Book;

-import com.tuscanyscatours.common.Search;

-import com.tuscanyscatours.common.SearchCallback;

-import com.tuscanyscatours.common.TripItem;

-import com.tuscanyscatours.common.TripLeg;

-

-/**

- * An implementation of the Flight service

- */

-@Scope("CONVERSATION")

-@Service({Search.class, Book.class})

-public class FlightImpl implements Search, Book {

-

-    private List<FlightInfo> flights = new ArrayList<FlightInfo>();

-

-    @Callback

-    protected SearchCallback searchCallback;

-

-    @ComponentName

-    protected String componentName;

-

-    private int percentComplete = 0;

-

-    @Init

-    public void init() {

-        flights.add(new FlightInfo("EA26", "Europe Airlines Airbus A300", "LGW", "FLR", "06/12/09", "06/12/09", "350",

-                                   250, "EUR", "http://localhost:8085/tbd"));

-        flights.add(new FlightInfo("EA27", "Europe Airlines Airbus A300", "FLR", "LGW", "13/12/09", "13/12/09", "350",

-                                   250, "EUR", "http://localhost:8085/tbd"));

-

-    }

-

-    public TripItem[] searchSynch(TripLeg tripLeg) {

-        List<TripItem> items = new ArrayList<TripItem>();

-

-        // find outbound leg

-        for (FlightInfo flight : flights) {

-            if ((flight.getFromLocation().equals(tripLeg.getFromLocation())) && (flight.getToLocation().equals(tripLeg

-                .getToLocation()))

-                && (flight.getFromDate().equals(tripLeg.getFromDate()))) {

-                TripItem item =

-                    new TripItem("", "", TripItem.FLIGHT, flight.getName(), flight.getDescription(), flight

-                        .getFromLocation() + " - "

-                        + flight.getToLocation(), flight.getFromDate(), flight.getToDate(), flight.getPricePerSeat(),

-                                 flight.getCurrency(), flight.getLink());

-                items.add(item);

-            }

-        }

-

-        // find return leg

-        for (FlightInfo flight : flights) {

-            if ((flight.getFromLocation().equals(tripLeg.getToLocation())) && (flight.getToLocation().equals(tripLeg

-                .getFromLocation()))

-                && (flight.getFromDate().equals(tripLeg.getToDate()))) {

-                TripItem item =

-                    new TripItem("", "", TripItem.FLIGHT, flight.getName(), flight.getDescription(), flight

-                        .getFromLocation() + " - "

-                        + flight.getToLocation(), flight.getFromDate(), tripLeg.getToDate(), flight.getPricePerSeat(),

-                                 flight.getCurrency(), flight.getLink());

-                items.add(item);

-            }

-        }

-

-        return items.toArray(new TripItem[items.size()]);

-    }

-

-    public void searchAsynch(TripLeg tripLeg) {

-        System.out.println("Starting flight search");

-

-        // pretend that this processing takes some time to complete

-        while (percentComplete < 100) {

-            try {

-                Thread.sleep(50);

-            } catch (Exception ex) {

-                // do nothing

-            }

-            percentComplete = percentComplete + 10;

-            searchCallback.setPercentComplete(componentName, percentComplete);

-        }

-

-        // return available flights

-        searchCallback.searchResults(searchSynch(tripLeg));

-    }

-

-    public int getPercentComplete() {

-        return 100;

-    }

-

-    public String book(TripItem tripItem) {

-        return "flight1";

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightInfo.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightInfo.java
deleted file mode 100644
index 5f7de69229..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/java/com/tuscanyscatours/flight/impl/FlightInfo.java
+++ /dev/null
@@ -1,140 +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 com.tuscanyscatours.flight.impl;

-

-public class FlightInfo {

-

-    private String name;

-    private String description;

-    private String fromLocation;

-    private String toLocation;

-    private String fromDate;

-    private String toDate;

-    private String seats;

-    private double pricePerSeat;

-    private String currency;

-    private String link;

-

-    public FlightInfo() {

-    }

-

-    public FlightInfo(String name,

-                      String description,

-                      String fromLocation,

-                      String toLocation,

-                      String fromDate,

-                      String toDate,

-                      String seats,

-                      double pricePerSeat,

-                      String currency,

-                      String link) {

-

-        this.name = name;

-        this.description = description;

-        this.fromLocation = fromLocation;

-        this.toLocation = toLocation;

-        this.fromDate = fromDate;

-        this.toDate = toDate;

-        this.seats = seats;

-        this.pricePerSeat = pricePerSeat;

-        this.currency = currency;

-        this.link = link;

-    }

-

-    public String getName() {

-        return name;

-    }

-

-    public void setName(String name) {

-        this.name = name;

-    }

-

-    public String getDescription() {

-        return description;

-    }

-

-    public void setDescription(String description) {

-        this.description = description;

-    }

-

-    public String getFromLocation() {

-        return fromLocation;

-    }

-

-    public void setFromLocation(String fromLocation) {

-        this.fromLocation = fromLocation;

-    }

-

-    public String getToLocation() {

-        return toLocation;

-    }

-

-    public void setToLocation(String toLocation) {

-        this.toLocation = toLocation;

-    }

-

-    public String getFromDate() {

-        return fromDate;

-    }

-

-    public void setFromDate(String fromDate) {

-        this.fromDate = fromDate;

-    }

-

-    public String getToDate() {

-        return toDate;

-    }

-

-    public void setToDate(String toDate) {

-        this.toDate = toDate;

-    }

-

-    public String getSeats() {

-        return seats;

-    }

-

-    public void setSeats(String seats) {

-        this.seats = seats;

-    }

-

-    public double getPricePerSeat() {

-        return pricePerSeat;

-    }

-

-    public void setPricePerSeat(double pricePerSeat) {

-        this.pricePerSeat = pricePerSeat;

-    }

-

-    public String getCurrency() {

-        return currency;

-    }

-

-    public void setCurrency(String currency) {

-        this.currency = currency;

-    }

-

-    public String getLink() {

-        return link;

-    }

-

-    public void setLink(String link) {

-        this.link = link;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 2d4964501a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/flight/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-   <import.java package="com.tuscanyscatours.common"/>

-   <export.java package="com.tuscanyscatours.flight.impl"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/build.xml
deleted file mode 100644
index 8428af49f5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-fullapp-bespoketrip" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml
deleted file mode 100644
index bf4bbfca77..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/pom.xml
+++ /dev/null
@@ -1,90 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId>
-    <name>Apache Tuscany SCA Tours Full Application Bespoke Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <!--
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>${tuscany.version}</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>scatours.LaunchNode</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-       -->
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 4de92453fe..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,28 +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:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:fullapp-bespoketrip" />
-    <import.java package="com.tuscanyscatours.common" />
-    <import.java package="com.tuscanyscatours.hotel" />
-    <import.java package="com.tuscanyscatours.hotel.impl" />
-    <import.java package="com.tuscanyscatours.flight.impl" />
-    <import.java package="com.tuscanyscatours.car.impl" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
deleted file mode 100644
index 12dad69674..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-bespoketrip/src/main/resources/fullapp-bespoketrip.composite
+++ /dev/null
@@ -1,63 +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"
-           targetNamespace="http://tuscanyscatours.com/"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           name="fullapp-bespoketrip">
-    
-    <component name="HotelPartner">
-        <implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
-        <service name="Search">
-            <binding.ws name="searchws" uri="http://localhost:8086/Hotel/Search"/>
-            <!-- tuscany:binding.jsonrpc name="searchjsonrpc"/-->
-            <callback>
-                <binding.ws/>
-            </callback> 
-        </service>
-        <service name="Book"/>
-    </component>  
-    
-    <component name="FlightPartner">
-        <implementation.java class="com.tuscanyscatours.flight.impl.FlightImpl"/>
-        <service name="Search">
-            <interface.java interface="com.tuscanyscatours.common.Search" 
-                            callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
-            <binding.ws name="searchws" uri="http://localhost:8086/Flight/Search"/>
-            <tuscany:binding.jsonrpc name="searchjsonrpc"/>
-            <callback>
-                <binding.ws/>
-            </callback>            
-        </service>
-        <service name="Book"/>
-    </component> 
-    
-    <component name="CarPartner">
-        <implementation.java class="com.tuscanyscatours.car.impl.CarImpl"/>
-        <service name="Search">
-            <binding.ws name="searchws" uri="http://localhost:8086/Car/Search"/>
-            <tuscany:binding.jsonrpc name="searchjsonrpc"/>
-            <callback>
-                <binding.ws/>
-            </callback> 
-        </service>
-        <service name="Book"/>        
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/build.xml
deleted file mode 100644
index 0da4e5aebd..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-fullapp-coordination" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml
deleted file mode 100644
index a752d4e102..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/pom.xml
+++ /dev/null
@@ -1,90 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-fullapp-coordination</artifactId>
-    <name>Apache Tuscany SCA Tours Full Application Coordination Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <!--
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>${tuscany.version}</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>scatours.LaunchNode</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-       -->
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index f7973ba37a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/META-INF/sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-              xmlns:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:fullapp-coordination" />
-    <import.java package="com.tuscanyscatours.common" />
-    <import.java package="com.tuscanyscatours.currencyconverter" /> 
-    <import.java package="com.tuscanyscatours.travelcatalog" /> 
-    <import.java package="com.tuscanyscatours.travelcatalog.impl" /> 
-    <import.java package="com.tuscanyscatours.shoppingcart" />
-    <import.java package="com.tuscanyscatours.tripbooking" />
-    <import.java package="com.tuscanyscatours.tripbooking.impl" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
deleted file mode 100644
index ee8978a615..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-coordination/src/main/resources/fullapp-coordination.composite
+++ /dev/null
@@ -1,72 +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"
-           targetNamespace="http://tuscanyscatours.com/"
-           name="fullapp-coordination">
-    
-    <component name="TravelCatalog">
-        <implementation.java class="com.tuscanyscatours.travelcatalog.impl.TravelCatalogImpl"/>
-        <service name="TravelCatalogSearch"/>
-        <reference name="hotelSearch">
-            <binding.ws uri="http://localhost:8086/Hotel/Search"/>
-            <callback>
-                <binding.ws name="callback"
-                            uri="http://localhost:8084/Hotel/SearchCallback"/>
-            </callback>
-        </reference>
-        <reference name="flightSearch">
-            <interface.java interface="com.tuscanyscatours.common.Search" 
-                            callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
-            <binding.ws uri="http://localhost:8086/Flight/Search"/>
-            <callback>
-                <binding.ws name="callback"
-                            uri="http://localhost:8084/Flight/SearchCallback"/>
-            </callback>
-        </reference> 
-        <reference name="carSearch">
-            <binding.ws uri="http://localhost:8086/Car/Search"/>
-            <callback>
-                <binding.ws name="callback"
-                            uri="http://localhost:8084/Car/SearchCallback"/>
-            </callback>
-        </reference>    
-        <reference name="tripSearch">
-            <binding.ws uri="http://localhost:8085/Trip/Search"/>
-            <callback>
-                <binding.ws name="callback"
-                            uri="http://localhost:8084/Trip/SearchCallback"/>
-            </callback>
-        </reference>     
-        <reference name="currencyConverter" target="CurrencyConverter">
-        </reference>
-        <property name="quoteCurrencyCode">GBP</property>
-    </component>
-    
-    <component name="TripBooking">
-        <implementation.java class="com.tuscanyscatours.tripbooking.impl.TripBookingImpl"/>
-        <service name="TripBooking"/>
-        <reference name="hotelBook" target="HotelPartner/Book"/>
-        <reference name="flightBook" target="TripPartner/Book"/>
-        <reference name="carBook" target="CarPartner/Book"/>   
-        <reference name="tripBook" target="TripPartner/Book"/>  
-        <reference name="cartUpdates" target="ShoppingCart/CartUpdates"/>      
-    </component>    
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/build.xml
deleted file mode 100644
index aa6127daf0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-fullapp-currency" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml
deleted file mode 100644
index a21140d871..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/pom.xml
+++ /dev/null
@@ -1,90 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-fullapp-currency</artifactId>
-    <name>Apache Tuscany SCA Tours Full Application Currency Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <!--
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>${tuscany.version}</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>scatours.LaunchNode</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-       -->
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 98673ded6e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/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:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:fullapp-currency" />
-    <import.java package="com.tuscanyscatours.currencyconverter" />
-    <import.java package="com.tuscanyscatours.currencyconverter.impl" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
deleted file mode 100644
index 3bbcfca7d9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-currency/src/main/resources/fullapp-currency.composite
+++ /dev/null
@@ -1,28 +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"
-           targetNamespace="http://tuscanyscatours.com/"
-           name="fullapp-currency">
-  
-    <component name="CurrencyConverter">
-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>
-    </component> 
-    
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/build.xml
deleted file mode 100644
index 491f9cafd1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-fullapp-packagedtrip" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml
deleted file mode 100644
index 184814d0fb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/pom.xml
+++ /dev/null
@@ -1,90 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-fullapp-packagedtrip</artifactId>
-    <name>Apache Tuscany SCA Tours Full Application Packaged Trip Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <!--
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>${tuscany.version}</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>scatours.LaunchNode</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-       -->
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 7ec170f9cb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/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:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:fullapp-packagedtrip" />
-    <import.java package="com.tuscanyscatours.common" />
-    <import.java package="com.tuscanyscatours.trip.impl" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
deleted file mode 100644
index 72c5ae93c5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-packagedtrip/src/main/resources/fullapp-packagedtrip.composite
+++ /dev/null
@@ -1,37 +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"
-           targetNamespace="http://tuscanyscatours.com/"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           name="fullapp-packagedtrip">
-
-    <component name="TripPartner">
-        <implementation.java class="com.tuscanyscatours.trip.impl.TripImpl"/>
-        <service name="Search">
-            <binding.ws name="searchws" uri="http://localhost:8085/Trip/Search"/>
-            <tuscany:binding.jsonrpc name="searchjsonrpc"/>
-            <callback>
-                <binding.ws/>
-            </callback> 
-        </service>
-        <service name="Book"/>        
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/build.xml
deleted file mode 100644
index eccff2291f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-fullapp-shoppingcart" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml
deleted file mode 100644
index d56ced5852..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/pom.xml
+++ /dev/null
@@ -1,90 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-fullapp-shoppingcart</artifactId>
-    <name>Apache Tuscany SCA Tours Full Application Shopping Cart Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <!--
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>${tuscany.version}</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>scatours.LaunchNode</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-       -->
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 1c1fe43b53..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:fullapp-shoppingcart" />
-    <import.java package="com.tuscanyscatours.payment" />
-    <import.java package="com.tuscanyscatours.shoppingcart" />
-    <import.java package="com.tuscanyscatours.shoppingcart.impl" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.composite
deleted file mode 100644
index 1d6a5d60b6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-shoppingcart/src/main/resources/fullapp-shoppingcart.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://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://tuscanyscatours.com/"
-           name="fullapp-shoppingcart">
-    
-    <component name="ShoppingCart">
-        <implementation.java class="com.tuscanyscatours.shoppingcart.impl.ShoppingCartImpl"/>
-        <reference name="cartStore" target="CartStore"/>     
-        <reference name="payment">
-            <binding.ws uri="http://localhost:8081/Payment" />
-        </reference> 
-    </component>    
-    
-    <component name="CartStore">
-        <implementation.java class="com.tuscanyscatours.shoppingcart.impl.CartStoreImpl"/>
-    </component> 
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/build.xml
deleted file mode 100644
index 51aef70837..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-fullapp-ui" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml
deleted file mode 100644
index 7320851863..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/pom.xml
+++ /dev/null
@@ -1,90 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-fullapp-ui</artifactId>
-    <name>Apache Tuscany SCA Tours Full Application User Interface Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>test</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-       <!--
-       <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>${tuscany.version}</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <mainClass>scatours.LaunchNode</mainClass>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-       </plugins>
-       -->
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 96ff425edb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,28 +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:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:fullapp-ui" />
-    <import.java package="com.tuscanyscatours" />
-    <import.java package="com.tuscanyscatours.impl" />
-    <import.java package="com.tuscanyscatours.shoppingcart" />
-    <import.java package="com.tuscanyscatours.travelcatalog" />
-    <import.java package="com.tuscanyscatours.tripbooking" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
deleted file mode 100644
index 34c4d66059..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
+++ /dev/null
@@ -1,58 +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"
-           targetNamespace="http://tuscanyscatours.com/"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           name="fullapp-ui">
-           
-    <component name="SCAToursUserInterface">
-        <tuscany:implementation.widget location="scatours.html"/>
-        <service name="Widget">
-            <tuscany:binding.http uri="/scatours"/>
-        </service>
-        <reference name="scaToursCatalog" target="SCATours/SCAToursSearch">
-            <tuscany:binding.jsonrpc/>
-        </reference> 
-        <reference name="scaToursBooking" target="SCATours/SCAToursBooking">
-            <tuscany:binding.jsonrpc/>
-        </reference>
-        <reference name="scaToursCart" target="SCATours/SCAToursCart">
-            <tuscany:binding.jsonrpc/>
-        </reference>                
-    </component>   
-    
-    <component name="SCATours">
-        <implementation.java class="com.tuscanyscatours.impl.SCAToursImpl"/>
-        <service name="SCAToursSearch">
-            <tuscany:binding.jsonrpc/>
-        </service>
-        <service name="SCAToursBooking">
-            <tuscany:binding.jsonrpc/>
-        </service>
-        <service name="SCAToursCart">
-            <tuscany:binding.jsonrpc/>
-        </service>        
-        <reference name="travelCatalogSearch" target="TravelCatalog/TravelCatalogSearch"/>
-        <reference name="tripBooking" target="TripBooking"/>
-        <reference name="cartInitialize" target="ShoppingCart/CartInitialize"/>    
-        <reference name="cartCheckout" target="ShoppingCart/CartCheckout"/>       
-    </component>    
-   
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/scatours.html b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/scatours.html
deleted file mode 100644
index 52479c1cde..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/scatours.html
+++ /dev/null
@@ -1,399 +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.
--->
-<html>
-<head>
-<title>SCA Tours</title>
-
-<link rel="stylesheet" type="text/css" href="style.css" />
-
-<script type="text/javascript" src="scatours.js"></script>
-
-<script language="JavaScript">
-
-    //@Reference
-    var scaToursCatalog = new tuscany.sca.Reference("scaToursCatalog");
-
-    //@Reference
-    var scaToursBooking = new tuscany.sca.Reference("scaToursBooking");
-
-    //@Reference
-    var scaToursCart = new tuscany.sca.Reference("scaToursCart");
-
-    //local state
-    var packagedItems;
-    var bespokeItems;
-    var cartId;
-
-    //the constructor for trip leg beans
-    function TripLegType(id,
-                         fromLocation,
-                         toLocation,
-                         fromDate,
-                         toDate,
-                         noOfPeople) {
-          this.id           = id;
-          this.fromLocation = fromLocation;
-          this.toLocation   = toLocation;
-          this.fromDate     = fromDate;
-          this.toDate       = toDate;
-          this.noOfPeople   = noOfPeople;
-    }
-
-    function getTripLeg(){
-        return new TripLegType(cartId,
-                               document.searchForm.fromLocation.value,
-                               document.searchForm.toLocation.value,
-                               document.searchForm.fromDate.value,
-                               document.searchForm.toDate.value,
-                               document.searchForm.noOfPeople.value);
-    }
-
-    //the constructor for bespoke trip beans
-    function TripType() {
-          this.id           = cartId;
-          this.type         = "Bespoke";
-          this.tripItems    = new Array();
-          // json databinding can't tolerate having a class hint set as the
-          // databinding transformer is not in the right classloader to load
-          // the class pointed to by the hint
-          //this.javaClass    = "scatours.common.TripItem";
-    }
-
-    function getTrip(){
-        return new TripType();
-    }
-
-    // remove class hint from the trip object
-    // can also be used to limit the amount of
-    // data returned to the server
-    function copyTrip(trip){
-        var tripCopy = new TripType();
-
-        tripCopy.id = trip.id;
-        tripCopy.tripId = trip.tripId;
-        tripCopy.type = trip.type;
-        tripCopy.name = trip.name;
-        tripCopy.description = trip.description;
-        tripCopy.location = trip.location;
-        tripCopy.fromDate = trip.fromDate;
-        tripCopy.toDate = trip.toDate;
-        tripCopy.price = trip.price;
-        tripCopy.currency = trip.currency;
-        tripCopy.link = trip.link;
-
-        return tripCopy;
-    }
-
-    function init() {
-	   try {
-           newCart();
-	   }
-	   catch(e) {
-	       alert(e);
-	   }
-    }
-
-    function reset() {
-        document.getElementById('packagedTripItems').innerHTML = "";
-        document.getElementById('bespokeTripItems').innerHTML = "";
-        document.getElementById('cartItems').innerHTML = "";
-        document.getElementById('cartPrice').innerHTML = "";
-        packagedItems = new Array();
-        bespokeItems = new Array();
-    }
-
-    function newCart() {
-        scaToursCart.newCart(newCart_response);
-        reset();
-    }
-
-    function newCart_response(newCartId, exception) {
-        if(exception){
-            alert(exception.javaStack);
-            return;
-        }
-        cartId = newCartId
-    }
-
-    function searchTravelCatalog() {
-        scaToursCatalog.search(getTripLeg(), search_response);
-    }
-
-    function search_response(items, exception) {
-        if(exception){
-            alert(exception.javaStack);
-            return;
-        }
-
-        var packagedHTML = '<h3>Packaged Trip Items</h3>';
-        packagedHTML    += '<table border="0">';
-        packagedHTML    += '<tr>';
-        packagedHTML    += '<td>Select</td><td>Name</td><td>Description</td><td>Location</td><td>From - To</td><td>Price</td>';
-        packagedHTML    += '</tr>';
-
-        var bespokeHTML = '<h3>Bespoke Trip Items</h3>';
-        bespokeHTML    += '<table border="0">';
-        bespokeHTML    += '<tr>';
-        bespokeHTML    += '<td>Select</td><td>Name</td><td>Description</td><td>Location</td><td>From - To</td><td>Price</td>';
-        bespokeHTML    += '</tr>';
-
-        for (var i=0; i<items.length; i++) {
-            if (items[i].type == "Trip") {
-                packagedHTML += '<tr>';
-                packagedHTML += '<td><input onClick="processPackagedSelection()" name="packagedTripItemSelection" type="checkbox" value="' + items[i].id + '"></td>'
-                packagedHTML += '<td>' +  items[i].name + '</td>';
-                packagedHTML += '<td>' +  items[i].description + '</td>';
-                packagedHTML += '<td>' +  items[i].location + '</td>';
-                packagedHTML += '<td>' +  items[i].fromDate + ' - ' + items[i].toDate +'</td>';
-                packagedHTML += '<td>' +  items[i].price + ' ' + items[i].currency + '</td>';
-                packagedHTML += '</tr>';
-                packagedItems.push(items[i]);
-            } else {
-                bespokeHTML += '<tr>';
-                bespokeHTML += '<td><input onClick="processBespokeSelection()" name="bespokeTripItemSelection" type="checkbox" value="' + items[i].id + '"></td>'
-                bespokeHTML += '<td>' +  items[i].name + '</td>';
-                bespokeHTML += '<td>' +  items[i].description + '</td>';
-                bespokeHTML += '<td>' +  items[i].location + '</td>';
-                bespokeHTML += '<td>' +  items[i].fromDate + ' - ' + items[i].toDate +'</td>';
-                bespokeHTML += '<td>' +  items[i].price + ' ' + items[i].currency + '</td>';
-                bespokeHTML += '</tr>';
-                bespokeItems.push(items[i]);
-            }
-        }
-
-        packagedHTML    += '</table>';
-        packagedHTML    += '<input type="button" onClick="bookPackagedTrip()" value="Book Packaged Trip">';
-
-        bespokeHTML    += '<tr><td/><td/><td>Total Price</td><td/><td/><td><div id="bespokeTripPrice"></div> </td></tr>';
-        bespokeHTML    += '</table>';
-        bespokeHTML    += '<input type="button" onClick="bookBespokeTrip()" value="Book Bespoke Trip">';
-
-        if (packagedItems.length > 0){
-            document.getElementById('packagedTripItems').innerHTML = packagedHTML;
-        }
-
-        if (bespokeItems.length > 0){
-            document.getElementById('bespokeTripItems').innerHTML = bespokeHTML;
-        }
-    }
-
-    function processPackagedSelection() {
-        // do nothing at the moment
-    }
-
-    function processBespokeSelection() {
-        // calculate total price
-        var items  = document.getElementsByName("bespokeTripItemSelection");
-        var totalPrice = 0.0;
-        for (var i=0; i<items.length; i++) {
-
-            // find the items that are checked
-            if (items[i].checked == true) {
-                totalPrice = totalPrice + bespokeItems[i].price;
-            }
-        }
-        document.getElementById('bespokeTripPrice').innerHTML = totalPrice + ' ' + bespokeItems[0]. currency;
-    }
-
-    function bookPackagedTrip() {
-        // find first selected trip item
-        var trip = null;
-        var items  = document.getElementsByName("packagedTripItemSelection");
-        for (var i=0; i<items.length; i++) {
-
-            // find the items that are checked
-            if (items[i].checked == true) {
-                trip = copyTrip(packagedItems[i]);
-                break;
-            }
-        }
-
-        if (trip != null) {
-            // book trip
-            scaToursBooking.bookTrip(cartId, trip);
-
-            // reset the display
-            reset();
-
-            // re-populate the cart with all entries
-            getCartTrips();
-        } else {
-            alert ("Please select a trip")
-        }
-    }
-
-    function bookBespokeTrip() {
-        // create a trip object
-        var trip = getTrip();
-
-        // add selected trip items to trip
-        var items  = document.getElementsByName("bespokeTripItemSelection");
-        for (var i=0; i<items.length; i++) {
-
-            // find the items that are checked
-            if (items[i].checked == true) {
-                trip.tripItems.push(copyTrip(bespokeItems[i]));
-            }
-        }
-
-        if (trip.tripItems.length > 0) {
-            // book trip
-            scaToursBooking.bookTrip(cartId, trip);
-
-            // reset the display
-            reset();
-
-            // re-populate the cart with all entries
-            getCartTrips();
-        } else {
-            alert ("Please select some trip items!")
-        }
-    }
-
-    function getCartTrips() {
-        scaToursCart.getTrips(cartId, getCartTrips_response);
-    }
-
-    function getCartTrips_response(trips, exception) {
-        if(exception){
-            alert(exception.javaStack);
-            return;
-        }
-        var itemsHTML = '';
-        var totalPrice  = 0.0;
-        var currency = '?';
-
-        for (var x=0; x<trips.length; x++){
-            itemsHTML += '<h3>Trip - ' + trips[x].id + '</h3>';
-            itemsHTML += '<table border="0">';
-            itemsHTML += '<tr>';
-            itemsHTML += '<td>Booking Ref</td><td>Name</td><td>Description</td><td>Location</td><td>From - To</td><td>Price</td>';
-            itemsHTML += '</tr>';
-
-            if (trips[x].type == "Trip") {
-                itemsHTML += '<tr>';
-                itemsHTML += '<td>' +  trips[x].bookingCode + '</td>';
-                itemsHTML += '<td>' +  trips[x].name + '</td>';
-                itemsHTML += '<td>' +  trips[x].description + '</td>';
-                itemsHTML += '<td>' +  trips[x].location + '</td>';
-                itemsHTML += '<td>' +  trips[x].fromDate + ' - ' + trips[x].toDate +'</td>';
-                itemsHTML += '<td>' +  trips[x].price + ' ' + trips[x].currency + '</td>';
-                itemsHTML += '</tr>';
-                if (totalPrice == 0.0) {
-                    currency = trips[x].currency;
-                }
-                totalPrice = totalPrice + trips[x].price;
-
-            } else {
-                var tripItems = trips[x].tripItems;
-
-                for (var i=0; i<tripItems.length; i++) {
-                    itemsHTML += '<tr>';
-                    itemsHTML += '<td>' +  tripItems[i].bookingCode + '</td>';
-                    itemsHTML += '<td>' +  tripItems[i].name + '</td>';
-                    itemsHTML += '<td>' +  tripItems[i].description + '</td>';
-                    itemsHTML += '<td>' +  tripItems[i].location + '</td>';
-                    itemsHTML += '<td>' +  tripItems[i].fromDate + ' - ' + tripItems[i].toDate +'</td>';
-                    itemsHTML += '<td>' +  tripItems[i].price + ' ' + tripItems[i].currency + '</td>';
-                    itemsHTML += '</tr>';
-                    if (totalPrice == 0.0) {
-                        currency = tripItems[i].currency;
-                    }
-                    totalPrice = totalPrice + tripItems[i].price;
-                }
-            }
-
-            itemsHTML    += '</table>';
-        }
-
-        document.getElementById('cartItems').innerHTML = itemsHTML;
-        document.getElementById('cartPrice').innerHTML = totalPrice + ' ' + currency;
-    }
-
-    function checkout() {
-        scaToursCart.checkout(cartId);
-
-        document.getElementById('packagedTripItems').innerHTML = "";
-        document.getElementById('bespokeTripItems').innerHTML = "";
-        document.getElementById('cartItems').innerHTML = "Thank you for shopping with SCA Tours";
-        document.getElementById('cartPrice').innerHTML = "";
-        searchResponseItems = null;
-        tripItems = null;
-        init();
-    }
-
-    function purchase() {
-    }
-
-</script>
-
-</head>
-
-<body onload="init()" background="">
-	<img src="scatours.png" border="0" />
-	<div id="scatours">
-        <form name="searchForm">
-            <h3>Search for trips, hotels, flights and cars</h3>
-            <br/>
-            <table border="0">
-                <tr>
-                    <td>From Location:</td>
-                    <td><input type="text" name="fromLocation" value="LGW"></td>
-                    <td>To Location:</td>
-                    <td><input type="text" name="toLocation" value="FLR"></td>
-                </tr>
-                <tr>
-                    <td>Start Date:</td>
-                    <td><input type="text" name="fromDate" value="06/12/09"></td>
-                    <td>End Date:</td>
-                    <td><input type="text" name="toDate" value="13/12/09"></td>
-                </tr>
-                <tr>
-                    <td>Number of people:</td>
-                    <td><select name="noOfPeople">
-                        <option>1
-                        <option selected>2
-                        <option>3
-                        <option>4
-                    </select></td>
-                    <td/>
-                    <td/>
-                </tr>
-            </table>
-            <br/>
-            <input type="button" onClick="searchTravelCatalog()" value="Search">
-        </form>
-        <form name="packagedTripForm">
-            <div id="packagedTripItems"></div>
-        </form>
-        <form name="bespokeTripForm">
-            <div id="bespokeTripItems"></div>
-        </form>
-        <form name="cartForm">
-            <h3>Shopping Cart</h3>
-            <div id="cartItems"></div>
-            <br/>
-            Total Price: <div id="cartPrice"></div>
-            <br/>
-            <input type="button" onClick="checkout()" value="Checkout">
-        </form>
-	</div>
-
-</body>
-</html>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/scatours.odg b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/scatours.odg
deleted file mode 100644
index 8466377374..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/scatours.odg
+++ /dev/null
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/scatours.png b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/scatours.png
deleted file mode 100644
index 563bf4ea91..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/scatours.png
+++ /dev/null
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/style.css b/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/style.css
deleted file mode 100644
index 6e17c2747b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/fullapp-ui/src/main/resources/style.css
+++ /dev/null
@@ -1,135 +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.
- */
-
-
-
-/*******************************************/
-
-p,table,li,h1,h2,h3
-{
-font-family: verdana, arial, 'sans serif'; 
-}
-
-p, h1, h2, h3, table, li, hr
-{
-margin-left: 10pt;
-}
-
-table
-{
-border-color: black;
-border-collapse: separate;
-border-spacing: 0px 1px;
-
-margin-right: 10pt;
-margin-left: 10pt;
-width: 800px;
-}
-
-.sourceDetailsTable
-{
-width: 600px;
-}
-
-tr, td
-{
-margin-left: 0pt;
-margin-right: 0pt;
-padding-left: 10pt;
-font-size: 90%;
-}
-
-p,li,th
-{
-font-size: 90%;
-margin-left: 10pt;
-}
-
-pre
-{
-margin-left: 10pt;
-}
-
-body
-{
-#ffffff;
-}
-
-h1,h2,h3,hr
-{
-color: firebrick;
-}
-
-a:link {COLOR: firebrick;}
-a:visited {COLOR: firebrick;}
-a:active {COLOR: navy;}
-
-.link
-{
-COLOR: firebrick;
-text-decoration: underline;
-}
-
-.clickable
-{
-cursor: pointer
-}
-
-.unread_title
-{
-font-weight: bold;
-}
-
-.read_title
-{
-font-weight: normal;
-}
-
-.summary
-{
-color: DimGrey;
-}
-
-.hidden
-{
-display: none;
-}
-
-.source_name
-{
-width: 600px;
-}
-
-.alert_text
-{
-width: 600px;
-}
-
-.alert_data
-{
-margin-left: 10px;
-width: 800px;
-height: 800px;
-}
-
-.source_0
-{
-background-color: LightGreen;
-}    
-
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/build.xml
deleted file mode 100644
index 7f77b9270d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-help-pages" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml
deleted file mode 100644
index 92dda106b6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/pom.xml
+++ /dev/null
@@ -1,71 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-help-pages</artifactId>

-    <name>Apache Tuscany SCA Tours Help Pages Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-resource-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-http-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 2b875a4906..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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">

-   <export.resource uri="help_pages"/>

-</contribution>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help-pages.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help-pages.composite
deleted file mode 100644
index e68c5873c2..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help-pages.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-  xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-  targetNamespace="http://www.tuscanyscatours.com/"
-  name="helpPages">
-
-    <component name="Help">
-        <tuscany:implementation.resource location="help_pages"/>
-        <service name="Resource">
-            <tuscany:binding.http uri="http://localhost:8085/help/"/>
-        </service>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/BookingAHoliday.html b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/BookingAHoliday.html
deleted file mode 100644
index 194ecd1183..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/BookingAHoliday.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<!--
- * 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.
- -->
-
-<head>
-<title>Tuscany SCA Tours Help - Booking a holiday</title>
-</head>
-
-<body>
-<h1>Tuscany SCA Tours Help Pages - Booking a holiday</h1>
-
-<p>This page contains instructions on how to book a holiday with SCA Tours</p>
-
-<p>More help text would go here.....</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/BookingAHotel.html b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/BookingAHotel.html
deleted file mode 100644
index bde4d25226..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/BookingAHotel.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<!--
- * 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.    
- -->
-
-<head>
-<title>Tuscany SCA Tours Help - Booking a hotel</title>
-</head>
-
-<body>
-<h1>Tuscany SCA Tours Help Pages - Booking a hotel</h1>
-
-<p>This page contains instructions on how to book a hotel with SCA Tours</p>
-
-<p>More help text would go here.....</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/MakingPayments.html b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/MakingPayments.html
deleted file mode 100644
index a1b24f4d23..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/MakingPayments.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<!--
- * 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.    
- -->
-
-<head>
-<title>Tuscany SCA Tours Help - Making Payments</title>
-</head>
-
-<body>
-<h1>Tuscany SCA Tours Help Pages - Making Payments</h1>
-
-<p>This page contains instructions on how to make payments to SCA Tours</p>
-
-<p>More help text would go here.....</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/index.html b/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/index.html
deleted file mode 100644
index 4972752ea1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/help-pages/src/main/resources/help_pages/index.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<!--
- * 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.    
- -->
-
-<head>
-<title>Tuscany SCA Tours Help</title>
-</head>
-
-<body>
-<h1>Tuscany SCA Tours Help Pages</h1>
-
-<p>Welcome to the Tuscany SCA Tours help pages.</p>
-<p>How can we help you?</p>
-
-<h3>Making a booking</h3>
-<ul>
-<li><a href="BookingAHoliday.html">Booking a holiday</a></li>
-<li><a href="BookingAHotel.html">Booking a hotel</a></li>
-<li>Booking a car</li>
-</ul>
-
-<h3>Making payments</h3>
-<ul>
-<li><a href="MakingPayments.html">Paying for my bookings</a></li>
-<li>Checking the status of my payment</li>
-</ul>
-
-<h3>Preparing to travel</h3>
-<ul>
-<li>Passports and Visas</li>
-<li>Pre-travel health checks</li>
-<li>Things to pack checklist</li>
-</ul>
-
-<h3>Contact customer support</h3>
-<ul>
-<li>By Email</li>
-<li>By Phone</li>
-<li>By Post</li>
-</ul>
-</body>
-</html>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/build.xml
deleted file mode 100644
index f624c43a01..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/build.xml
+++ /dev/null
@@ -1,25 +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="scatours-contribution-hotel" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../common/target/scatours-contribution-common.jar"/>

-    </path>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml
deleted file mode 100644
index d023268437..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/pom.xml
+++ /dev/null
@@ -1,62 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-hotel</artifactId>

-    <name>Apache Tuscany SCA Tours Hotel Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-data-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-common</artifactId>

-            <version>${pom.version}</version>

-        </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/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/HotelInfo.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/HotelInfo.java
deleted file mode 100644
index e2912c50fc..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/HotelInfo.java
+++ /dev/null
@@ -1,118 +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 com.tuscanyscatours.hotel;

-

-public class HotelInfo {

-

-    private String name;

-    private String description;

-    private String location;

-    private String date;

-    private String beds;

-    private double pricePerBed;

-    private String currency;

-    private String link;

-

-    public HotelInfo() {

-    }

-

-    public HotelInfo(String name,

-                     String description,

-                     String location,

-                     String date,

-                     String beds,

-                     double pricePerBed,

-                     String currency,

-                     String link) {

-

-        this.name = name;

-        this.description = description;

-        this.location = location;

-        this.date = date;

-        this.beds = beds;

-        this.pricePerBed = pricePerBed;

-        this.currency = currency;

-        this.link = link;

-    }

-

-    public String getName() {

-        return name;

-    }

-

-    public void setName(String name) {

-        this.name = name;

-    }

-

-    public String getDescription() {

-        return description;

-    }

-

-    public void setDescription(String description) {

-        this.description = description;

-    }

-

-    public String getLocation() {

-        return location;

-    }

-

-    public void setLocation(String location) {

-        this.location = location;

-    }

-

-    public String getDate() {

-        return date;

-    }

-

-    public void setDate(String date) {

-        this.date = date;

-    }

-

-    public String getBeds() {

-        return beds;

-    }

-

-    public void setBeds(String beds) {

-        this.beds = beds;

-    }

-

-    public double getPricePerBed() {

-        return pricePerBed;

-    }

-

-    public void setPricePerBed(double pricePerBed) {

-        this.pricePerBed = pricePerBed;

-    }

-

-    public String getCurrency() {

-        return currency;

-    }

-

-    public void setCurrency(String currency) {

-        this.currency = currency;

-    }

-

-    public String getLink() {

-        return link;

-    }

-

-    public void setLink(String link) {

-        this.link = link;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/HotelManagement.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/HotelManagement.java
deleted file mode 100644
index 476da9a544..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/HotelManagement.java
+++ /dev/null
@@ -1,24 +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 com.tuscanyscatours.hotel;
-
-public interface HotelManagement {
-    void addHotelInfo(HotelInfo hotelInfo);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/impl/HotelImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/impl/HotelImpl.java
deleted file mode 100644
index c56b5ad1d3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/java/com/tuscanyscatours/hotel/impl/HotelImpl.java
+++ /dev/null
@@ -1,105 +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 com.tuscanyscatours.hotel.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.common.Book;

-import com.tuscanyscatours.common.Search;

-import com.tuscanyscatours.common.SearchCallback;

-import com.tuscanyscatours.common.TripItem;

-import com.tuscanyscatours.common.TripLeg;

-import com.tuscanyscatours.hotel.HotelInfo;

-import com.tuscanyscatours.hotel.HotelManagement;

-

-/**

- * An implementation of the Hotel service

- */

-@Scope("STATELESS")

-@Service({Search.class, Book.class, HotelManagement.class})

-public class HotelImpl implements Search, Book, HotelManagement {

-

-    private List<HotelInfo> hotels = new ArrayList<HotelInfo>();

-

-    @Callback

-    protected SearchCallback searchCallback;

-

-    @Init

-    public void init() {

-        hotels.add(new HotelInfo("Deep Bay Hotel", "Wonderful sea views and a relaxed atmosphere", "FLR", "06/12/09",

-                                 "200", 100, "EUR", "http://localhost:8085/tbd"));

-        hotels.add(new HotelInfo("Long Bay Hotel", "Friendly staff and an ocean breeze", "FLR", "06/12/09", "200", 100,

-                                 "EUR", "http://localhost:8085/tbd"));

-        hotels.add(new HotelInfo("City Hotel", "Smart rooms and early breakfasts", "FLR", "06/12/09", "200", 100,

-                                 "EUR", "http://localhost:8085/tbd"));

-        hotels.add(new HotelInfo("County Hotel", "The smell of the open country", "FLR", "06/12/09", "200", 100, "EUR",

-                                 "http://localhost:8085/tbd"));

-    }

-

-    public TripItem[] searchSynch(TripLeg tripLeg) {

-        List<TripItem> items = new ArrayList<TripItem>();

-

-        // find available hotels

-        for (HotelInfo hotel : hotels) {

-            if (hotel.getLocation().equals(tripLeg.getToLocation())) {

-                TripItem item =

-                    new TripItem("", "", TripItem.HOTEL, hotel.getName(), hotel.getDescription(), hotel.getLocation(),

-                                 tripLeg.getFromDate(), tripLeg.getToDate(), hotel.getPricePerBed(), hotel

-                                     .getCurrency(), hotel.getLink());

-                items.add(item);

-            }

-        }

-

-        return items.toArray(new TripItem[items.size()]);

-    }

-

-    public void searchAsynch(TripLeg tripLeg) {

-        System.out.println("Starting hotel search");

-

-        // pretend that this processing takes some time to complete

-        try {

-            Thread.sleep(3000);

-        } catch (Exception ex) {

-            // do nothing

-        }

-

-        // return available hotels

-        TripItem[] items = searchSynch(tripLeg);

-        searchCallback.searchResults(items);

-    }

-

-    public int getPercentComplete() {

-        return 100;

-    }

-

-    public String book(TripItem tripItem) {

-        return "hotel1";

-    }

-

-    public void addHotelInfo(HotelInfo hotelInfo) {

-        hotels.add(hotelInfo);

-        System.out.println("Added hotel info - " + hotelInfo.getName());

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 4dac3ec671..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/hotel/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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">

-   <import.java package="com.tuscanyscatours.common"/>

-   <export.java package="com.tuscanyscatours.hotel"/>

-   <export.java package="com.tuscanyscatours.hotel.impl"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/build.xml
deleted file mode 100644
index 0d03b5401d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/build.xml
+++ /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.
--->
-
-<project name="scatours-contribution-interaction-client" default="compile">
-    <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../calendar/target/scatours-contribution-calendar.jar"/>
-        <pathelement path="../common/target/scatours-contribution-common.jar"/>
-        <pathelement path="../currency/target/scatours-contribution-currency.jar"/>
-        <pathelement path="../shoppingcart/target/scatours-contribution-shoppingcart.jar"/>
-    </path>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml
deleted file mode 100644
index fd34f4cf36..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/pom.xml
+++ /dev/null
@@ -1,72 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-interaction-client</artifactId>
-    <name>Apache Tuscany SCA Tours Interaction Client Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-contribution-common</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-contribution-calendar</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-contribution-hotel</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-contribution-currency</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-contribution-shoppingcart</artifactId>
-            <version>${pom.version}</version>
-        </dependency>        
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClientImpl.java
deleted file mode 100644
index 7ad0d15442..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionConversationClientImpl.java
+++ /dev/null
@@ -1,73 +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 scatours.client.impl;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.common.TripItem;
-import com.tuscanyscatours.shoppingcart.CartStore;
-
-@Scope("COMPOSITE")
-@Service(Runnable.class)
-public class InteractionConversationClientImpl implements Runnable {
-
-    @Reference
-    protected CartStore cartStoreConversation;
-
-    public void run() {
-        System.out.println("\nCalling cart store using the conversational interaction pattern");
-
-        // add some trip items to the cart store
-        TripItem tripItem = getTestTripItem();
-        cartStoreConversation.addTrip(tripItem);
-
-        tripItem.setDescription("2nd trip item");
-        cartStoreConversation.addTrip(tripItem);
-
-        tripItem.setDescription("3rd trip item");
-        cartStoreConversation.addTrip(tripItem);
-
-        System.out.println("Trip items now in cart");
-        TripItem[] tripItems = cartStoreConversation.getTrips();
-        for (TripItem item : tripItems) {
-            System.out.println("Item - " + item.getDescription());
-        }
-
-        System.out.println("Reset the cart");
-        cartStoreConversation.reset();
-
-        System.out.println("Trip items now in cart");
-        tripItems = cartStoreConversation.getTrips();
-        for (TripItem item : tripItems) {
-            System.out.println("Item - " + item.getDescription());
-        }
-    }
-
-    private TripItem getTestTripItem() {
-        TripItem tripItem = new TripItem();
-        tripItem.setLocation("FLR");
-        tripItem.setFromDate("06/12/09 00:00");
-        tripItem.setToDate("13/12/09 00:00");
-        tripItem.setDescription("1st trip item");
-        return tripItem;
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClientImpl.java
deleted file mode 100644
index c12c709461..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionLocalClientImpl.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 scatours.client.impl;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.calendar.Calendar;
-import com.tuscanyscatours.common.TripLeg;
-
-@Service(Runnable.class)
-public class InteractionLocalClientImpl implements Runnable {
-
-    @Reference
-    protected Calendar calendarLocal;
-
-    public void run() {
-        System.out.println("\nCalling calendar component over a local binding");
-        TripLeg tripLeg = getTestTripLeg();
-        String toDate = calendarLocal.getEndDate(tripLeg.getFromDate(), 10);
-        tripLeg.setToDate(toDate);
-        System.out.println("Calculated trip end date - " + toDate);
-        ;
-    }
-
-    private TripLeg getTestTripLeg() {
-        TripLeg tripLeg = new TripLeg();
-        tripLeg.setFromLocation("LGW");
-        tripLeg.setToLocation("FLR");
-        tripLeg.setFromDate("06/12/09 00:00");
-        tripLeg.setToDate("13/12/09 00:00");
-        tripLeg.setNoOfPeople("1");
-        tripLeg.setId("TRIP27");
-        return tripLeg;
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClientImpl.java
deleted file mode 100644
index 0b52d2d516..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionOneWayCallbackClientImpl.java
+++ /dev/null
@@ -1,78 +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 scatours.client.impl;
-
-import java.util.concurrent.CountDownLatch;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.common.Search;
-import com.tuscanyscatours.common.SearchCallback;
-import com.tuscanyscatours.common.TripItem;
-import com.tuscanyscatours.common.TripLeg;
-
-@Scope("COMPOSITE")
-@Service(Runnable.class)
-public class InteractionOneWayCallbackClientImpl implements Runnable, SearchCallback {
-
-    @Reference
-    protected Search hotelSearchOneWayCallback;
-
-    CountDownLatch resultsReceivedCountdown;
-
-    public void run() {
-        System.out.println("\nCalling hotel component using both one way and callback interation patterns");
-        resultsReceivedCountdown = new CountDownLatch(1);
-        TripLeg tripLeg = getTestTripLeg();
-        hotelSearchOneWayCallback.searchAsynch(tripLeg);
-
-        // start other searched here while the hotel search progresses
-
-        // wait for responses to come back
-        try {
-            resultsReceivedCountdown.await();
-        } catch (InterruptedException ex) {
-        }
-    }
-
-    public void searchResults(TripItem[] items) {
-        for (TripItem tripItem : items) {
-            System.out.println("Found hotel - " + tripItem.getName());
-        }
-        resultsReceivedCountdown.countDown();
-    }
-
-    public void setPercentComplete(String searchComponent, int percentComplete) {
-        // Not used in this sample
-    }
-
-    private TripLeg getTestTripLeg() {
-        TripLeg tripLeg = new TripLeg();
-        tripLeg.setFromLocation("LGW");
-        tripLeg.setToLocation("FLR");
-        tripLeg.setFromDate("06/12/09 00:00");
-        tripLeg.setToDate("13/12/09 00:00");
-        tripLeg.setNoOfPeople("1");
-        tripLeg.setId("TRIP27");
-        return tripLeg;
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClientImpl.java
deleted file mode 100644
index 0026b2e0b7..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRemoteClientImpl.java
+++ /dev/null
@@ -1,64 +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 scatours.client.impl;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.common.Search;
-import com.tuscanyscatours.common.SearchCallback;
-import com.tuscanyscatours.common.TripItem;
-import com.tuscanyscatours.common.TripLeg;
-
-@Service(Runnable.class)
-public class InteractionRemoteClientImpl implements Runnable, SearchCallback {
-
-    @Reference
-    protected Search hotelSearchRemote;
-
-    public void run() {
-        System.out.println("\nCalling hotel component over a remote binding");
-        TripLeg tripLeg = getTestTripLeg();
-        TripItem[] tripItems = hotelSearchRemote.searchSynch(tripLeg);
-        for (TripItem tripItem : tripItems) {
-            System.out.println("Found hotel - " + tripItem.getName());
-        }
-    }
-
-    public void searchResults(TripItem[] items) {
-        // we are calling the hotel component synchronously here
-        // so the callback interface is not used
-    }
-
-    public void setPercentComplete(String searchComponent, int percentComplete) {
-        // Not used in this sample
-    }
-
-    private TripLeg getTestTripLeg() {
-        TripLeg tripLeg = new TripLeg();
-        tripLeg.setFromLocation("LGW");
-        tripLeg.setToLocation("FLR");
-        tripLeg.setFromDate("06/12/09 00:00");
-        tripLeg.setToDate("13/12/09 00:00");
-        tripLeg.setNoOfPeople("1");
-        tripLeg.setId("TRIP27");
-        return tripLeg;
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClientImpl.java
deleted file mode 100644
index f25a069713..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/java/scatours/client/impl/InteractionRequestResponseClientImpl.java
+++ /dev/null
@@ -1,39 +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 scatours.client.impl;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.currencyconverter.CurrencyConverter;
-
-@Service(Runnable.class)
-public class InteractionRequestResponseClientImpl implements Runnable {
-
-    @Reference
-    protected CurrencyConverter currencyConverterRequestResponse;
-
-    public void run() {
-        System.out.println("\nCalling currency converter component using request response interation pattern");
-        double exchangeRate = currencyConverterRequestResponse.getExchangeRate("GBP", "USD");
-        System.out.println("GBP to USD exchange rate is " + exchangeRate);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 24349299a4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/META-INF/sca-contribution.xml
+++ /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.    
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-              xmlns:tours="http://tucsanyscatours.com/">
-    <deployable composite="tours:client" />
-    <import.java package="com.tuscanyscatours.calendar" />
-    <import.java package="com.tuscanyscatours.calendar.impl" />
-    <import.java package="com.tuscanyscatours.common" />
-    <import.java package="com.tuscanyscatours.currencyconverter" />
-    <import.java package="com.tuscanyscatours.currencyconverter.impl" />
-    <import.java package="com.tuscanyscatours.shoppingcart" />
-    <import.java package="com.tuscanyscatours.shoppingcart.impl" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite
deleted file mode 100644
index 5fc2006cf0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-client/src/main/resources/client.composite
+++ /dev/null
@@ -1,77 +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"
-    targetNamespace="http://tuscanyscatours.com/"
-    name="Client">
-
-    <!-- Local interaction -->
-    <component name="InteractionLocalClient">
-        <implementation.java class="scatours.client.impl.InteractionLocalClientImpl" />
-        <reference name="calendarLocal" 
-                   target="Calendar"/>
-     </component>
-     
-    <component name="Calendar">
-		<implementation.java class="com.tuscanyscatours.calendar.impl.CalendarImpl"/>
-    </component> 
-    
-    <!-- Remote interaction -->
-    <component name="InteractionRemoteClient">
-        <implementation.java class="scatours.client.impl.InteractionRemoteClientImpl" />
-        <reference name="hotelSearchRemote">
-            <binding.ws uri="http://localhost:8081/Hotel/Search"/>
-        </reference>
-    </component>
-     
-    <!-- Request response interaction -->
-    <component name="InteractionRequestResponseClient">
-        <implementation.java class="scatours.client.impl.InteractionRequestResponseClientImpl" />
-        <reference name="currencyConverterRequestResponse" target="CurrencyConverter"/>
-    </component>
-     
-    <component name="CurrencyConverter">
-        <implementation.java class="com.tuscanyscatours.currencyconverter.impl.CurrencyConverterImpl"/>
-    </component> 
-    
-    <!-- One way and callback interaction -->
-    <component name="InteractionOneWayCallbackClient">
-        <implementation.java class="scatours.client.impl.InteractionOneWayCallbackClientImpl" />
-        <reference name="hotelSearchOneWayCallback">
-            <interface.java interface="com.tuscanyscatours.common.Search" 
-                    callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
-            <binding.ws uri="http://localhost:8081/Hotel/Search"/>
-            <callback>
-                <binding.ws name="callback" uri="http://localhost:8080/Client/SearchCallback"/>
-            </callback>
-        </reference>
-     </component>
-     
-     <!-- Conversational interaction -->
-     <component name="InteractionConversationClient">
-        <implementation.java class="scatours.client.impl.InteractionConversationClientImpl" />
-        <reference name="cartStoreConversation" target="CartStore"/>
-     </component>
-              
-    <component name="CartStore">
-        <implementation.java class="com.tuscanyscatours.shoppingcart.impl.CartStoreImpl"/>
-        <service name="CartStore"/>
-    </component>   
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/build.xml
deleted file mode 100644
index 10451b6248..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-interaction-service-remote" default="compile">
-    <import file="../../antdefs.xml"/>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml
deleted file mode 100644
index 0b0ffd41c3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/pom.xml
+++ /dev/null
@@ -1,57 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-interaction-service-remote</artifactId>
-    <name>Apache Tuscany SCA Tours Interaction Service Remote Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-contribution-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-contribution-flight</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-contribution-hotel</artifactId>
-            <version>${pom.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index bcd545afe3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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:tours="http://com.tuscanyscatours/">
-    <deployable composite="tours:service" />
-    <import.java package="com.tuscanyscatours.common" />
-    <import.java package="com.tuscanyscatours.flight.impl" />
-    <import.java package="com.tuscanyscatours.hotel.impl" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite
deleted file mode 100644
index 4f070ea934..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/interaction-service-remote/src/main/resources/service.composite
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-    targetNamespace="http://tuscanyscatours.com/"
-    name="Service">
-     
-     <component name="Hotel">
-        <implementation.java class="com.tuscanyscatours.hotel.impl.HotelImpl"/>
-        <service name="Search">
-            <interface.java interface="com.tuscanyscatours.common.Search" 
-                    callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
-            <binding.ws uri="http://localhost:8081/Hotel/Search"/>
-            <callback>
-                <binding.ws name="callback"/>
-            </callback>            
-        </service>
-    </component> 
-    
-     <component name="Flight">
-        <implementation.java class="com.tuscanyscatours.flight.impl.FlightImpl"/>
-        <service name="Search">
-            <interface.java interface="com.tuscanyscatours.common.Search" 
-                    callbackInterface="com.tuscanyscatours.common.SearchCallback"/>
-            <binding.ws uri="http://localhost:8081/Hotel/SearchConversational"/>
-            <callback>
-                <binding.ws name="callback"/>
-            </callback>            
-        </service>
-    </component>     
-   
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/build.xml
deleted file mode 100644
index 6a85f2066e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/build.xml
+++ /dev/null
@@ -1,25 +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="scatours-contribution-introducing-client" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../introducing-tours/target/scatours-contribution-introducing-tours.jar"/>

-    </path>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml
deleted file mode 100644
index b163304934..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    *

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    *

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-introducing-client</artifactId>

-    <name>Apache Tuscany SCA Tours Introducing Client Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-tours</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java
deleted file mode 100644
index c89eec07fe..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/java/scatours/client/impl/TestClientImpl.java
+++ /dev/null
@@ -1,47 +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 scatours.client.impl;

-

-import java.math.BigDecimal;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.Bookings;

-import com.tuscanyscatours.Checkout;

-

-@Service(Runnable.class)

-public class TestClientImpl {

-    @Reference

-    protected Bookings bookings;

-

-    @Reference

-    protected Checkout checkout;

-

-    public TestClientImpl() {

-    }

-

-    public void run() {

-        String bookingCode = bookings.newBooking("FS1APR4", 1);

-        System.out.println("Booking code is " + bookingCode);

-

-        checkout.makePayment(new BigDecimal("1995.00"), "1234567843218765 10/10");

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 7548d3d99e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:client="http://client.scatours/">

-    <deployable composite="client:Client" />

-    <import.java package="com.tuscanyscatours" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/client.composite
deleted file mode 100644
index fbefc7b35b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-client/src/main/resources/client.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://docs.oasis-open.org/ns/opencsa/sca/200912"

-    targetNamespace="http://client.scatours/"

-    name="Client">

-

-    <component name="TestClient">

-        <implementation.java class="scatours.client.impl.TestClientImpl" />

-        <reference name="bookings" target="TripBooking/Bookings" />

-        <reference name="checkout" target="ShoppingCart/Checkout" />

-     </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/build.xml
deleted file mode 100644
index f269f6577b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-introducing-tours" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/pom.xml
deleted file mode 100644
index ba0c405364..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/pom.xml
+++ /dev/null
@@ -1,42 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-introducing-tours</artifactId>

-    <name>Apache Tuscany SCA Tours Introducing Tours Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>        

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/goodvaluetrips/Trips.java
deleted file mode 100644
index 5026d23c95..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/goodvaluetrips/Trips.java
+++ /dev/null
@@ -1,26 +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 com.goodvaluetrips;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Trips {

-    String checkAvailability(String trip, int people);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Bookings.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Bookings.java
deleted file mode 100644
index 4ddd145778..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Bookings.java
+++ /dev/null
@@ -1,26 +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 com.tuscanyscatours;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Bookings {

-    String newBooking(String trip, int people);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Checkout.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Checkout.java
deleted file mode 100644
index 4e8f1481f5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Checkout.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 com.tuscanyscatours;

-

-import java.math.BigDecimal;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Checkout {

-    void makePayment(BigDecimal amount, String cardInfo);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Updates.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Updates.java
deleted file mode 100644
index beb5f529b1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/Updates.java
+++ /dev/null
@@ -1,26 +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 com.tuscanyscatours;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Updates {

-    void addTrip(String resCode);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java
deleted file mode 100644
index 629ea7b5ec..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/ShoppingCartImpl.java
+++ /dev/null
@@ -1,49 +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 com.tuscanyscatours.impl;

-

-import java.math.BigDecimal;

-import java.util.ArrayList;

-import java.util.List;

-

-import com.tuscanyscatours.Checkout;

-import com.tuscanyscatours.Updates;

-

-public class ShoppingCartImpl implements Checkout, Updates {

-    private static List<String> bookedTrips = new ArrayList<String>();

-

-    protected String currency = "USD";

-

-    public void makePayment(BigDecimal amount, String cardInfo) {

-        System.out.print("Charged " + currency + " " + amount

-            + " to card "

-            + cardInfo

-            + " for "

-            + (bookedTrips.size() > 1 ? "trips" : "trip"));

-        for (String trip : bookedTrips) {

-            System.out.print(" " + trip);

-        }

-        System.out.println();

-        bookedTrips.clear();

-    }

-

-    public void addTrip(String resCode) {

-        bookedTrips.add(resCode);

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java
deleted file mode 100644
index 1259fa7d82..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/java/com/tuscanyscatours/impl/TripBookingImpl.java
+++ /dev/null
@@ -1,39 +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 com.tuscanyscatours.impl;

-

-import org.oasisopen.sca.annotation.Reference;

-

-import com.goodvaluetrips.Trips;

-import com.tuscanyscatours.Bookings;

-import com.tuscanyscatours.Updates;

-

-public class TripBookingImpl implements Bookings {

-    @Reference

-    protected Trips mytrips;

-

-    @Reference

-    protected Updates cart;

-

-    public String newBooking(String trip, int people) {

-        String resCode = mytrips.checkAvailability(trip, people);

-        cart.addTrip(resCode);

-        return "GV" + resCode;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index f2f0a85f00..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:tst="http://tuscanyscatours.com/">

-    <deployable composite="tst:Tours" />

-    <export.java package="com.tuscanyscatours" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/tours.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/tours.composite
deleted file mode 100644
index b468b9c053..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-tours/src/main/resources/tours.composite
+++ /dev/null
@@ -1,46 +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"

-    targetNamespace="http://tuscanyscatours.com/"

-    name="Tours">

-

-    <component name="TripBooking">

-        <implementation.java class="com.tuscanyscatours.impl.TripBookingImpl" />

-        <service name="Bookings">

-            <interface.java interface="com.tuscanyscatours.Bookings" />

-        </service>

-        <reference name="mytrips" target="TripProvider/Trips">

-            <interface.java interface="com.goodvaluetrips.Trips" />

-        </reference>

-        <reference name="cart" target="ShoppingCart/Updates">

-            <interface.java interface="com.tuscanyscatours.Updates" />

-        </reference>

-    </component>

-

-    <component name="ShoppingCart">

-        <implementation.java class="com.tuscanyscatours.impl.ShoppingCartImpl"/>

-        <service name="Checkout">

-            <interface.java interface="com.tuscanyscatours.Checkout" />

-        </service>

-        <service name="Updates">

-            <interface.java interface="com.tuscanyscatours.Updates" />

-        </service>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/build.xml
deleted file mode 100644
index 9d65c703b7..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-introducing-trips" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/pom.xml
deleted file mode 100644
index 9d601ab670..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/pom.xml
+++ /dev/null
@@ -1,42 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-introducing-trips</artifactId>

-    <name>Apache Tuscany SCA Tours Introducing Trips Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/Trips.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/Trips.java
deleted file mode 100644
index 5026d23c95..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/Trips.java
+++ /dev/null
@@ -1,26 +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 com.goodvaluetrips;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Trips {

-    String checkAvailability(String trip, int people);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.java
deleted file mode 100644
index 06f93f2637..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/java/com/goodvaluetrips/impl/TripProviderImpl.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 com.goodvaluetrips.impl;

-

-import com.goodvaluetrips.Trips;

-

-public class TripProviderImpl implements Trips {

-    public String checkAvailability(String trip, int people) {

-        // call non-SCA code to reserve trip and return booking code

-        return "6R98Y";

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 12ac4d4327..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:gvt="http://goodvaluetrips.com/">

-    <deployable composite="gvt:Trips" />

-    <export namespace="http://goodvaluetrips.com/" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/trips.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/trips.composite
deleted file mode 100644
index 28c6f0c4a0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/introducing-trips/src/main/resources/trips.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"

-    targetNamespace="http://goodvaluetrips.com/"

-    name="Trips">

-

-    <component name="TripProvider">

-        <implementation.java class="com.goodvaluetrips.impl.TripProviderImpl" />

-        <service name="Trips">

-            <interface.java interface="com.goodvaluetrips.Trips" />

-        </service>

-    </component>

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/build.xml
deleted file mode 100644
index 1baf6ab153..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-notification-corba" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml
deleted file mode 100644
index 99a5deaa79..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/pom.xml
+++ /dev/null
@@ -1,57 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-notification-corba</artifactId>

-    <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway CORBA Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 68b39b735a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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">

-    <import.java package="com.tuscanyscatours.notification" />

-    <import.java package="com.tuscanyscatours.notification.impl" />

-    <import.java package="com.tuscanyscatours.smsgateway" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/notification-corba.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/notification-corba.composite
deleted file mode 100644
index 67ede84df1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-corba/src/main/resources/notification-corba.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://docs.oasis-open.org/ns/opencsa/sca/200912"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-    targetNamespace="http://tuscanyscatours.com/"
-    name="notification">
-
-    <component name="Notification">
-        <implementation.java class="com.tuscanyscatours.notification.impl.NotificationImpl" />
-        <service name="Notification">
-            <interface.java interface="com.tuscanyscatours.notification.Notification"/>
-        </service>
-
-        <reference name="smsGateway">
-            <interface.java interface="com.tuscanyscatours.smsgateway.SMSGateway"/>
-                <tuscany:binding.corba host="localhost" port="5080" name="SMSGatewayCORBAService"/>
-        </reference>
-    </component>
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/build.xml
deleted file mode 100644
index 3b7e660a5d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-notification-ejb" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml
deleted file mode 100644
index 7eb553d975..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/pom.xml
+++ /dev/null
@@ -1,56 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-notification-ejb</artifactId>

-    <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway EJB Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 68b39b735a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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">

-    <import.java package="com.tuscanyscatours.notification" />

-    <import.java package="com.tuscanyscatours.notification.impl" />

-    <import.java package="com.tuscanyscatours.smsgateway" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/notification-ejb.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/notification-ejb.composite
deleted file mode 100644
index 333eeb2d97..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ejb/src/main/resources/notification-ejb.composite
+++ /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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-    targetNamespace="http://tuscanyscatours.com/"
-    name="notification">
-
-    <component name="Notification">
-        <implementation.java class="com.tuscanyscatours.notification.impl.NotificationImpl" />
-        <service name="Notification">
-            <interface.java interface="com.tuscanyscatours.notification.Notification"/>
-        </service>
-
-        <reference name="smsGateway">
-            <interface.java interface="com.tuscanyscatours.smsgateway.SMSGateway"/>
-            <binding.ejb uri="SMSGatewayImplRemote"/>
-        </reference>
-    </component>
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/build.xml
deleted file mode 100644
index 0b1b80c44f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-notification-jms" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml
deleted file mode 100644
index 5a34e41dc5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/pom.xml
+++ /dev/null
@@ -1,57 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-notification-jms</artifactId>

-    <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway JMS Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 68b39b735a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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">

-    <import.java package="com.tuscanyscatours.notification" />

-    <import.java package="com.tuscanyscatours.notification.impl" />

-    <import.java package="com.tuscanyscatours.smsgateway" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/notification-jms.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/notification-jms.composite
deleted file mode 100644
index 9b965ca8b8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-jms/src/main/resources/notification-jms.composite
+++ /dev/null
@@ -1,41 +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"
-    targetNamespace="http://tuscanyscatours.com/"
-    name="notification">
-
-    <component name="Notification">
-        <implementation.java class="com.tuscanyscatours.notification.impl.NotificationImpl" />
-        <service name="Notification">
-            <interface.java interface="com.tuscanyscatours.notification.Notification"/>
-        </service>
-
-        <reference name="smsGateway">
-            <interface.java interface="com.tuscanyscatours.smsgateway.SMSGateway"/>
-            <binding.jms initialContextFactory="org.apache.activemq.jndi.ActiveMQInitialContextFactory"
-                             jndiURL="tcp://localhost:61619">
-                <destination name="SMSRequestQueue" create="ifnotexist"/>
-                <response>
-                    <destination name="SMSResponseQueue" create="ifnotexist"/>
-                </response>
-            </binding.jms>
-        </reference>
-    </component>
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/build.xml
deleted file mode 100644
index de8d5bbb06..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-notification-rmi" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml
deleted file mode 100644
index fb427a243b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/pom.xml
+++ /dev/null
@@ -1,57 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-notification-rmi</artifactId>

-    <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway RMI Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 68b39b735a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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">

-    <import.java package="com.tuscanyscatours.notification" />

-    <import.java package="com.tuscanyscatours.notification.impl" />

-    <import.java package="com.tuscanyscatours.smsgateway" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.composite
deleted file mode 100644
index 6c74fe9143..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-rmi/src/main/resources/notification-rmi.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://docs.oasis-open.org/ns/opencsa/sca/200912"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-    targetNamespace="http://tuscanyscatours.com/"
-    name="notification">
-
-    <component name="Notification">
-        <implementation.java class="com.tuscanyscatours.notification.impl.NotificationImpl" />
-        <service name="Notification">
-            <interface.java interface="com.tuscanyscatours.notification.Notification"/>
-        </service>
-
-        <reference name="smsGateway">
-            <interface.java interface="com.tuscanyscatours.smsgateway.SMSGateway"/>
-            <tuscany:binding.rmi host="localhost" port="8099" serviceName="SMSGatewayRMI"/>
-        </reference>
-    </component>
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/build.xml
deleted file mode 100644
index bac935bc5a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-notification-ws" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml
deleted file mode 100644
index 0e7fd6c692..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/pom.xml
+++ /dev/null
@@ -1,57 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-notification-ws</artifactId>

-    <name>Apache Tuscany SCA Tours Notification Contribution Which Uses SMSGateway Web Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 68b39b735a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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">

-    <import.java package="com.tuscanyscatours.notification" />

-    <import.java package="com.tuscanyscatours.notification.impl" />

-    <import.java package="com.tuscanyscatours.smsgateway" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/notification-ws.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/notification-ws.composite
deleted file mode 100644
index 6e3fba0a75..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification-ws/src/main/resources/notification-ws.composite
+++ /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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-    targetNamespace="http://tuscanyscatours.com/"
-    name="notification">
-
-    <component name="Notification">
-        <implementation.java class="com.tuscanyscatours.notification.impl.NotificationImpl" />
-        <service name="Notification">
-            <interface.java interface="com.tuscanyscatours.notification.Notification" />
-        </service>
-
-        <reference name="smsGateway">
-            <interface.java interface="com.tuscanyscatours.smsgateway.SMSGateway" />
-            <binding.ws uri="http://localhost:8081/SMSGatewayService" />
-        </reference>
-    </component>
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/build.xml
deleted file mode 100644
index ff7e56c8b7..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-contribution-notification" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/pom.xml
deleted file mode 100644
index b48e92150e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/pom.xml
+++ /dev/null
@@ -1,57 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-notification</artifactId>

-    <name>Apache Tuscany SCA Tours Notification Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</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/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/Notification.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/Notification.java
deleted file mode 100644
index 7ae26b93e4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/Notification.java
+++ /dev/null
@@ -1,26 +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 com.tuscanyscatours.notification;
-
-public interface Notification {
-
-    boolean notify(String accountID, String subject, String message);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/impl/NotificationImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/impl/NotificationImpl.java
deleted file mode 100644
index cdd61f901b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/notification/impl/NotificationImpl.java
+++ /dev/null
@@ -1,58 +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 com.tuscanyscatours.notification.impl;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.notification.Notification;
-import com.tuscanyscatours.smsgateway.SMSGateway;
-
-@Service(Notification.class)
-public class NotificationImpl implements Notification {
-
-    /**
-     * Use "Fake" phone number that has been reserved by Ofcom.
-     * See: http://www.ofcom.org.uk/telecoms/ioi/numbers/num_drama?a=87101
-     */
-    private static final String SCA_TOURS_SMS = "+44(0)2079460723";
-
-    @Reference
-    protected SMSGateway smsGateway;
-
-    public boolean notify(String accountID, String subject, String message) {
-
-        boolean result = true;
-
-        String sms = getSMSAddress(accountID);
-        if (sms != null) {
-            System.out.println("Sending SMS to " + sms + " for accountID " + accountID);
-            result &= smsGateway.sendSMS(SCA_TOURS_SMS, sms, subject + ". " + message);
-        }
-
-        return result;
-    }
-
-    private String getSMSAddress(String accountID) {
-        // Use "Fake" phone number that has been reserved by Ofcom.
-        // See: http://www.ofcom.org.uk/telecoms/ioi/numbers/num_drama?a=87101
-        return "+44(0)7700900812";
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
deleted file mode 100644
index 7699868da5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.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 com.tuscanyscatours.smsgateway;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * A gateway to send SMS messages.
- */
-@Remotable
-public interface SMSGateway {
-    boolean sendSMS(String fromNumber, String toNumber, String text);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 3442da25d5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/notification/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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">

-    <export.java package="com.tuscanyscatours.notification" />

-    <export.java package="com.tuscanyscatours.notification.impl" />

-    <export.java package="com.tuscanyscatours.smsgateway" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/build.xml
deleted file mode 100644
index 5e2921995c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/build.xml
+++ /dev/null
@@ -1,23 +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="scatours-contribution-payment-bpel-process" default="compile">

-    <import file="../../antdefs.xml"/>

-    <target name="wsdljava"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml
deleted file mode 100644
index 4b3b63aa9d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/pom.xml
+++ /dev/null
@@ -1,47 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-payment-bpel-process</artifactId>

-    <name>Apache Tuscany SCA Tours Payment BPEL Process Contribution</name>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <excludes>

-                        <exclude>**/*.cbp</exclude>

-                    </excludes>

-                </configuration>

-            </plugin>

-        </plugins>              

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 22ef6de317..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,117 +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="CreditCardPayment" 
-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"
-                    elementFormDefault="unqualified">
-            
-            <xsd:element name="authorize" type="tns:AuthorizeType"/>
-            <xsd:complexType name="AuthorizeType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>
-            <xsd:complexType name="AuthorizeResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:complexType name="CreditCardDetailsType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:simpleType name="CreditCardTypeType">
-                <xsd:restriction base="xsd:token">
-                    <xsd:enumeration value="Visa" />
-                    <xsd:enumeration value="MasterCard" />
-                    <xsd:enumeration value="Discover" />
-                    <xsd:enumeration value="Amex" />
-                </xsd:restriction>
-            </xsd:simpleType>
-            <xsd:complexType name="PayerType">
-                <xsd:sequence>
-                    <xsd:element name="Name" type="xsd:string" />
-                    <xsd:element name="Address" type="tns:AddressType" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:complexType name="AddressType">
-                <xsd:sequence>
-                    <xsd:element name="Street" type="xsd:string" />
-                    <xsd:element name="City" type="xsd:string" />
-                    <xsd:element name="State" type="xsd:string" />
-                    <xsd:element name="ZipCode" type="xsd:string" />
-                    <xsd:element name="HomePhone" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="AuthorizeRequest">
-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="AuthorizeResponse">
-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="CreditCardPayment">
-        <wsdl:operation name="authorize">
-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="authorize">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="CreditCardPaymentService">
-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
-            <soap:address location="http://localhost:8081/CreditCardPayment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">
-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>
-    </plnk:partnerLinkType>    
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/EmailGateway.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/EmailGateway.wsdl
deleted file mode 100644
index a097d9b7e4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/EmailGateway.wsdl
+++ /dev/null
@@ -1,89 +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="EmailGateway" 
-                  targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
-                    xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/">
-                    
-            <xsd:element name="sendEmail" type="tns:SendEmailType"/>
-            <xsd:complexType name="SendEmailType">
-                <xsd:sequence>
-                    <xsd:element name="Email" type="tns:EmailType"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>
-            <xsd:complexType name="SendEmailResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:complexType name="EmailType">
-                <xsd:sequence>
-                    <xsd:element name="To" type="xsd:string"/>
-                    <xsd:element name="Title" type="xsd:string"/>
-                    <xsd:element name="Body" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="SendEmailRequest">
-        <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="SendEmailResponse">
-        <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="EmailGateway">
-        <wsdl:operation name="sendEmail">
-            <wsdl:input message="tns:SendEmailRequest"></wsdl:input>
-            <wsdl:output message="tns:SendEmailResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="sendEmail">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="EmailGatewayService">
-        <wsdl:port name="EmailGatewayPort" binding="tns:EmailGatwayBinding">
-            <soap:address location="http://localhost:8082/EmailGateway" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="EmailGatewayLinkType">
-        <plnk:role name="forward" portType="tns:EmailGateway"/>
-    </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 9ce3ed273c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +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">

-   <export namespace="http://www.tuscanyscatours.com/Payment"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/Payment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/Payment.wsdl
deleted file mode 100644
index e2c4062f2e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/Payment.wsdl
+++ /dev/null
@@ -1,83 +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="Payment" 
-                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
-
-            <xsd:complexType name="MakePaymentMemberType">
-                <xsd:sequence>
-                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>                    
-            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
-      
-            <xsd:complexType name="MakePaymentMemberResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
-            
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="MakePaymentMemberRequest">
-        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="MakePaymentMemberResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="Payment">
-        <wsdl:operation name="makePaymentMember">
-            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="PaymentBinding" type="tns:Payment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePaymentMember">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PaymentService">
-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8080/Payment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="PaymentLinkType">
-       <plnk:role name="forward" portType="tns:Payment"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/payment.bpel b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/payment.bpel
deleted file mode 100644
index 8f11d76888..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel-process/src/main/resources/payment.bpel
+++ /dev/null
@@ -1,164 +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="Payment"
-    targetNamespace="http://www.tuscanyscatours.com/Payment"
-    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/Payment"    
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:pp="http://www.tuscanyscatours.com/Payment/"
-    xmlns:ccp="http://www.tuscanyscatours.com/CreditCardPayment/"
-    xmlns:eg="http://www.tuscanyscatours.com/EmailGateway/"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-  <import location="Payment.wsdl" 
-          importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.tuscanyscatours.com/Payment/"/>     
-
-  <import location="CreditCardPayment.wsdl" 
-          importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.tuscanyscatours.com/CreditCardPayment/"/>
-          
-  <import location="EmailGateway.wsdl" 
-          importType="http://schemas.xmlsoap.org/wsdl/"
-          namespace="http://www.tuscanyscatours.com/EmailGateway/"/>          
-          
-   <partnerLinks>
-      <partnerLink name="paymentPartnerLink" partnerLinkType="pp:PaymentLinkType" myRole="forward" />
-      <partnerLink name="creditCardPaymentPartnerLink" partnerLinkType="ccp:CreditCardPaymentLinkType" partnerRole="forward" initializePartnerRole="yes" />
-      <partnerLink name="emailGatewayPartnerLink" partnerLinkType="eg:EmailGatewayLinkType" partnerRole="forward" initializePartnerRole="yes" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="makePaymentMemberRequestMessage" messageType="pp:MakePaymentMemberRequest"/>
-     <variable name="makePaymentMemberResponseMessage" messageType="pp:MakePaymentMemberResponse"/>
-     <variable name="authorizeRequestMessage" messageType="ccp:AuthorizeRequest"/>
-     <variable name="authorizeResponseMessage" messageType="ccp:AuthorizeResponse"/>
-     <variable name="sendEmailRequestMessage" messageType="eg:SendEmailRequest"/>
-     <variable name="sendEmailResponseMessage" messageType="eg:SendEmailResponse"/>
-   </variables>
-
-   <sequence>
-       <receive name="start"
-                partnerLink="paymentPartnerLink"
-                portType="pp:Payment"
-           	    operation="makePaymentMember"
-                variable="makePaymentMemberRequestMessage"
-                createInstance="yes"/>
-
-       <!-- set up call to payments service -->
-       <assign name="assign1">
-          <copy>
-              <from>
-                  <literal>
-                  <authorize xmlns="http://www.tuscanyscatours.com/CreditCardPayment/">
-                    <CreditCard xmlns="">
-                      <CreditCardType>Visa</CreditCardType>
-                      <CreditCardNumber>12345678</CreditCardNumber>
-                      <ExpMonth>2</ExpMonth>
-                      <ExpYear>2010</ExpYear>
-                      <CardOwner>
-                        <Name>Empty</Name>
-                        <Address>
-                           <Street>1 The Road</Street>
-                           <City>Winchester</City>
-                           <State>Hampshire</State>
-                           <ZipCode>AB1 2CD</ZipCode>
-                           <HomePhone>12345678</HomePhone>
-                        </Address>
-                      </CardOwner>                      
-                    </CreditCard>
-                    <Amount xmlns="">0.0</Amount>
-                  </authorize>
-                  </literal>
-              </from>
-              <to>$authorizeRequestMessage.parameters</to>
-          </copy>
-          <copy>
-              <from>$makePaymentMemberRequestMessage.parameters/CustomerId/text()</from>
-              <to>$authorizeRequestMessage.parameters/CreditCard/CardOwner/Name</to>
-          </copy>
-          <copy>
-              <from>$makePaymentMemberRequestMessage.parameters/Amount/text()</from>
-              <to>$authorizeRequestMessage.parameters/Amount</to>
-          </copy>                    
-       </assign>
-       
-       <invoke name="invokeCreditCardPayment"
-               operation="authorize"
-               inputVariable="authorizeRequestMessage"
-               outputVariable="authorizeResponseMessage"
-               partnerLink="creditCardPaymentPartnerLink"
-               portType="ccp:CreditCardPayment" />
-       
-       <!-- set up call to email gateway service -->
-       <assign name="assign2">
-          <copy>
-              <from>
-                  <literal>
-                  <sendEmail xmlns="http://www.tuscanyscatours.com/EmailGateway/">
-                    <Email xmlns="">
-                      <To>Default</To>
-                      <Title>Payment Confirmation</Title>
-                      <Body>Your payment has been confirmed</Body>
-                    </Email>
-                  </sendEmail>
-                  </literal>
-              </from>
-              <to>$sendEmailRequestMessage.parameters</to>
-          </copy>
-          <copy>
-              <from>$makePaymentMemberRequestMessage.parameters/CustomerId/text()</from>
-              <to>$sendEmailRequestMessage.parameters/Email/To</to>
-          </copy>                   
-       </assign>                  
-       
-       <!-- call the email gateway to send a confirmation -->
-       <invoke name="invokeEmailGateway"
-               operation="sendEmail"
-               inputVariable="sendEmailRequestMessage"
-               outputVariable="sendEmailResponseMessage"
-               partnerLink="emailGatewayPartnerLink"
-               portType="eg:EmailGateway" />
-       
-       <!-- set up the response -->
-       <assign name="assign3">
-          <copy>
-              <from>
-                  <literal> 
-                  <makePaymentMemberResponse xmlns="http://www.tuscanyscatours.com/Payment">
-                    <Status xmlns="">OK</Status>
-                  </makePaymentMemberResponse>
-                  </literal>
-              </from>
-              <to>$makePaymentMemberResponseMessage.parameters</to>
-          </copy>
-       </assign>
-       
-       
-       <reply name="end"  
-              partnerLink="paymentPartnerLink"
-              portType="pp:Payment" 
-              operation="makePaymentMember"
-              variable="makePaymentMemberResponseMessage">
-       </reply>
-   </sequence>
-</process>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/build.xml
deleted file mode 100644
index 29e317cf4d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/build.xml
+++ /dev/null
@@ -1,49 +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="scatours-contribution-payment-bpel" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="EmailGateway.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/emailgateway/EmailGateway.class"/>

-            <param name="package" value="com.tuscanyscatours.emailgateway"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="Payment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment"/>

-        </antcall>

-    </target>

-

-    <property name="test-setup" value="yes"/>

-    <target name="testsetup">

-        <unzip dest="target/test-classes">

-            <fileset dir="${env.TUSCANY_HOME}/lib">

-                <include name="ode-dao-jpa-ojpa-derby-*.zip"/>

-            </fileset>

-        </unzip>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/log4j.properties b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/log4j.properties
deleted file mode 100644
index 7ed0bcaf77..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/log4j.properties
+++ /dev/null
@@ -1,36 +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=DEBUG
-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF
-log4j.category.org.apache.ode.bpel.epr=OFF
-log4j.category.org.apache.tuscany.sca.implementation.bpel=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.ode=DEBUG
-log4j.category.org.apache.tuscany.sca.implementation.bpel.provider=DEBUG
-
-# 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/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
deleted file mode 100644
index 63a047ee49..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
+++ /dev/null
@@ -1,221 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-payment-bpel</artifactId>
-    <name>Apache Tuscany SCA Tours Payment BPEL Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <finalName>${artifactId}</finalName>
-    <plugins>
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>1.0</version>
-            <executions>
-                <execution>
-                    <id>add-source</id>
-                    <phase>generate-sources</phase>
-                    <goals>
-                        <goal>add-source</goal>
-                    </goals>
-                    <configuration>
-                        <sources>
-                            <source>target/jaxws-source</source>
-                        </sources>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>jaxws-maven-plugin</artifactId>
-            <version>1.12</version>
-            <executions>
-                <execution>
-                    <id>wsimport</id>
-                    <phase>generate-sources</phase>
-                    <goals>
-                        <goal>wsimport</goal>
-                    </goals>
-                    <configuration>
-                        <packageName>com.tuscanyscatours.payment</packageName>
-                        <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                        <wsdlFiles>
-                            <wsdlFile>Payment.wsdl</wsdlFile>
-                        </wsdlFiles>
-                        <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                        <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
-                        <verbose>false</verbose>
-                        <xnocompile>true</xnocompile>
-                    </configuration>
-                </execution>
-                <execution>
-                    <id>payment.creditcard</id>
-                    <phase>process-sources</phase>
-                    <goals>
-                        <goal>wsimport</goal>
-                    </goals>
-                    <configuration>
-                        <packageName>com.tuscanyscatours.payment.creditcard</packageName>
-                        <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                        <wsdlFiles>
-                            <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                        </wsdlFiles>
-                        <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                        <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                        <verbose>false</verbose>
-                        <xnocompile>true</xnocompile>
-                    </configuration>
-                </execution> 
-                <execution>
-                    <id>emailgateway</id>
-                    <phase>process-sources</phase>
-                    <goals>
-                        <goal>wsimport</goal>
-                    </goals>
-                    <configuration>
-                        <packageName>com.tuscanyscatours.emailgateway</packageName>
-                        <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                        <wsdlFiles>
-                            <wsdlFile>EmailGateway.wsdl</wsdlFile>
-                        </wsdlFiles>
-                        <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                        <staleFile>${project.build.directory}/jaxws-source/stale/emailgateway.stale</staleFile>
-                        <verbose>false</verbose>
-                        <xnocompile>true</xnocompile>
-                    </configuration>
-                </execution> 
-            </executions>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-                            <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
-                            <version>2.3.1</version>
-            <configuration>
-                <useFile>false</useFile>
-                <trimStackTrace>false</trimStackTrace>
-                <useSystemClassLoader>true</useSystemClassLoader>
-            </configuration>
-        </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.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/tutorials/travelsample/contributions/payment-bpel/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 22ef6de317..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,117 +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="CreditCardPayment" 
-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"
-                    elementFormDefault="unqualified">
-            
-            <xsd:element name="authorize" type="tns:AuthorizeType"/>
-            <xsd:complexType name="AuthorizeType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>
-            <xsd:complexType name="AuthorizeResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:complexType name="CreditCardDetailsType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:simpleType name="CreditCardTypeType">
-                <xsd:restriction base="xsd:token">
-                    <xsd:enumeration value="Visa" />
-                    <xsd:enumeration value="MasterCard" />
-                    <xsd:enumeration value="Discover" />
-                    <xsd:enumeration value="Amex" />
-                </xsd:restriction>
-            </xsd:simpleType>
-            <xsd:complexType name="PayerType">
-                <xsd:sequence>
-                    <xsd:element name="Name" type="xsd:string" />
-                    <xsd:element name="Address" type="tns:AddressType" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:complexType name="AddressType">
-                <xsd:sequence>
-                    <xsd:element name="Street" type="xsd:string" />
-                    <xsd:element name="City" type="xsd:string" />
-                    <xsd:element name="State" type="xsd:string" />
-                    <xsd:element name="ZipCode" type="xsd:string" />
-                    <xsd:element name="HomePhone" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="AuthorizeRequest">
-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="AuthorizeResponse">
-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="CreditCardPayment">
-        <wsdl:operation name="authorize">
-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="authorize">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="CreditCardPaymentService">
-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
-            <soap:address location="http://localhost:8081/CreditCardPayment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">
-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>
-    </plnk:partnerLinkType>    
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/EmailGateway.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/EmailGateway.wsdl
deleted file mode 100644
index a097d9b7e4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/EmailGateway.wsdl
+++ /dev/null
@@ -1,89 +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="EmailGateway" 
-                  targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
-                    xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/">
-                    
-            <xsd:element name="sendEmail" type="tns:SendEmailType"/>
-            <xsd:complexType name="SendEmailType">
-                <xsd:sequence>
-                    <xsd:element name="Email" type="tns:EmailType"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>
-            <xsd:complexType name="SendEmailResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:complexType name="EmailType">
-                <xsd:sequence>
-                    <xsd:element name="To" type="xsd:string"/>
-                    <xsd:element name="Title" type="xsd:string"/>
-                    <xsd:element name="Body" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="SendEmailRequest">
-        <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="SendEmailResponse">
-        <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="EmailGateway">
-        <wsdl:operation name="sendEmail">
-            <wsdl:input message="tns:SendEmailRequest"></wsdl:input>
-            <wsdl:output message="tns:SendEmailResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="sendEmail">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="EmailGatewayService">
-        <wsdl:port name="EmailGatewayPort" binding="tns:EmailGatwayBinding">
-            <soap:address location="http://localhost:8082/EmailGateway" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="EmailGatewayLinkType">
-        <plnk:role name="forward" portType="tns:EmailGateway"/>
-    </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 10d81a42e2..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:pp="http://www.tuscanyscatours.com/Payment">
-   <deployable composite="pp:payment"/>
-   <import namespace="http://www.tuscanyscatours.com/Payment"/>
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/Payment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/Payment.wsdl
deleted file mode 100644
index e2c4062f2e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/Payment.wsdl
+++ /dev/null
@@ -1,83 +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="Payment" 
-                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
-
-            <xsd:complexType name="MakePaymentMemberType">
-                <xsd:sequence>
-                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>                    
-            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
-      
-            <xsd:complexType name="MakePaymentMemberResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
-            
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="MakePaymentMemberRequest">
-        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="MakePaymentMemberResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="Payment">
-        <wsdl:operation name="makePaymentMember">
-            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="PaymentBinding" type="tns:Payment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePaymentMember">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PaymentService">
-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8080/Payment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="PaymentLinkType">
-       <plnk:role name="forward" portType="tns:Payment"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite
deleted file mode 100644
index 1032a37fbd..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/main/resources/payment.composite
+++ /dev/null
@@ -1,40 +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:t="http://tuscany.apache.org/xmlns/sca/1.1"
-           xmlns:pp="http://www.tuscanyscatours.com/Payment" 
-           targetNamespace="http://www.tuscanyscatours.com/Payment" 
-           name="payment">
-    
-    <component name="Payment">
-        <implementation.bpel process="pp:Payment"/>
-        <service name="paymentPartnerLink">
-            <interface.wsdl interface="http://www.tuscanyscatours.com/Payment/#wsdl.interface(Payment)" />
-            <binding.ws uri="http://localhost:8080/Payment" wsdlElement="http://www.tuscanyscatours.com/Payment/#wsdl.service(PaymentService)"/>
-        </service>
-        <reference name="creditCardPaymentPartnerLink">
-            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
-        </reference>
-        <reference name="emailGatewayPartnerLink">
-            <binding.ws uri="http://localhost:8088/EmailGateway"/>
-        </reference>       
-    </component>    
-
-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
deleted file mode 100644
index 59fc9ef68c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/PaymentTestCase.java
+++ /dev/null
@@ -1,83 +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 scatours.payment;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.tuscanyscatours.payment.Payment;
-
-/**
- * 
- */
-public class PaymentTestCase {
-    private static Node paymentNode;
-    private static Node creditCardNode;
-    private static Node emailGatewayNode;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        creditCardNode =
-            NodeFactory.getInstance()
-                .createNode("creditcard.composite",
-                               new Contribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
-
-        creditCardNode.start();
-
-        emailGatewayNode =
-            NodeFactory.getInstance().createNode("emailgateway.composite",
-                                                       new Contribution("emailgateway",
-                                                                           "../emailgateway/target/classes"),
-                                                       new Contribution("emailgateway-test",
-                                                                           "../emailgateway/target/test-classes"));
-
-        emailGatewayNode.start();
-
-        paymentNode =
-            NodeFactory.getInstance()
-                .createNode(
-                               new Contribution("payment-bpel-process",
-                                                   "../payment-bpel-process/target/classes"),
-                               new Contribution("payment-bpel", "./target/classes"),
-                               new Contribution("payment-bpel-test", "./target/test-classes"));
-
-        paymentNode.start();
-    }
-
-    @Test
-    public void testPayment() {
-        Node client = (Node)paymentNode;
-        Payment payment = client.getService(Payment.class, "PaymentClient");
-        System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        paymentNode.stop();
-        creditCardNode.stop();
-        emailGatewayNode.stop();
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
deleted file mode 100644
index 3b8d8ad88a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ /dev/null
@@ -1,37 +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 scatours.payment.client.impl;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.payment.Payment;

-

-@Service(Payment.class)

-public class PaymentClientImpl implements Payment {

-    @Reference

-    protected Payment payment;

-

-    public String makePaymentMember(String customerId, float amount) {

-        // Delegate the external web service

-        return payment.makePaymentMember(customerId, amount);

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 7112bd3820..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:pp="http://www.tuscanyscatours.com/Payment">
-    <deployable composite="pp:paymentClient" />
-    <import.java package="com.tuscanyscatours.payment" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite
deleted file mode 100644
index 5243752a08..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-bpel/src/test/resources/payment-client.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-           xmlns:pp="http://www.tuscanyscatours.com/Payment" 
-           targetNamespace="http://www.tuscanyscatours.com/Payment" 
-           name="paymentClient">
-           
-    <component name="PaymentClient">
-        <implementation.java class="scatours.payment.client.impl.PaymentClientImpl" />
-        <reference name="payment">
-            <binding.ws uri="http://localhost:8080/Payment" />
-        </reference>
-    </component>
-
-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml
deleted file mode 100644
index 3a86952fc1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/build.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-contribution-payment-groovy" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="EmailGateway.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/emailgateway/EmailGateway.class"/>

-            <param name="package" value="com.tuscanyscatours.emailgateway"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="Payment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment"/>

-        </antcall>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
deleted file mode 100644
index 40a16070b2..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/pom.xml
+++ /dev/null
@@ -1,167 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-payment-groovy</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Groovy Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <finalName>${artifactId}</finalName>
-    <plugins>
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>1.0</version>
-            <executions>
-                <execution>
-                    <id>add-source</id>
-                    <phase>generate-sources</phase>
-                    <goals>
-                        <goal>add-source</goal>
-                    </goals>
-                    <configuration>
-                        <sources>
-                            <source>target/jaxws-source</source>
-                        </sources>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>jaxws-maven-plugin</artifactId>
-            <version>1.12</version>
-            <executions>
-                <execution>
-                    <id>payment</id>
-                    <phase>generate-sources</phase>
-                    <goals>
-                        <goal>wsimport</goal>
-                    </goals>
-                    <configuration>
-                        <packageName>com.tuscanyscatours.payment</packageName>
-                        <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                        <wsdlFiles>
-                            <wsdlFile>Payment.wsdl</wsdlFile>
-                        </wsdlFiles>
-                        <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                        <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile> 
-                        <verbose>false</verbose>
-                        <xnocompile>true</xnocompile>
-                    </configuration>
-                </execution> 
-                <execution>
-                    <id>payment.creditcard</id>
-                    <phase>process-sources</phase>
-                    <goals>
-                        <goal>wsimport</goal>
-                    </goals>
-                    <configuration>
-                        <packageName>com.tuscanyscatours.payment.creditcard</packageName>
-                        <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                        <wsdlFiles>
-                            <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                        </wsdlFiles>
-                        <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                        <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                        <verbose>false</verbose>
-                        <xnocompile>true</xnocompile>
-                    </configuration>
-                </execution> 
-                <execution>
-                    <id>emailgateway</id>
-                    <phase>process-sources</phase>
-                    <goals>
-                        <goal>wsimport</goal>
-                    </goals>
-                    <configuration>
-                        <packageName>com.tuscanyscatours.emailgateway</packageName>
-                        <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                        <wsdlFiles>
-                            <wsdlFile>EmailGateway.wsdl</wsdlFile>
-                        </wsdlFiles>
-                        <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                        <staleFile>${project.build.directory}/jaxws-source/stale/emailgateway.stale</staleFile>
-                        <verbose>false</verbose>
-                        <xnocompile>true</xnocompile>
-                    </configuration>
-                </execution> 
-            </executions>
-        </plugin>      
-    </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 1813c77436..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,116 +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="CreditCardPayment" 
-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
-            
-            <xsd:element name="authorize" type="tns:AuthorizeType"/>
-            <xsd:complexType name="AuthorizeType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:element name="authorizeResponse" type="tns:AuthorizeResponseType"/>
-            <xsd:complexType name="AuthorizeResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:complexType name="CreditCardDetailsType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:simpleType name="CreditCardTypeType">
-                <xsd:restriction base="xsd:token">
-                    <xsd:enumeration value="Visa" />
-                    <xsd:enumeration value="MasterCard" />
-                    <xsd:enumeration value="Discover" />
-                    <xsd:enumeration value="Amex" />
-                </xsd:restriction>
-            </xsd:simpleType>
-            <xsd:complexType name="PayerType">
-                <xsd:sequence>
-                    <xsd:element name="Name" type="xsd:string" />
-                    <xsd:element name="Address" type="tns:AddressType" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:complexType name="AddressType">
-                <xsd:sequence>
-                    <xsd:element name="Street" type="xsd:string" />
-                    <xsd:element name="City" type="xsd:string" />
-                    <xsd:element name="State" type="xsd:string" />
-                    <xsd:element name="ZipCode" type="xsd:string" />
-                    <xsd:element name="HomePhone" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="AuthorizeRequest">
-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="AuthorizeResponse">
-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="CreditCardPayment">
-        <wsdl:operation name="authorize">
-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="authorize">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="CreditCardPaymentService">
-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
-            <soap:address location="http://localhost:8080/CreditCardPayment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">
-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>
-    </plnk:partnerLinkType>    
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/EmailGateway.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/EmailGateway.wsdl
deleted file mode 100644
index a097d9b7e4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/EmailGateway.wsdl
+++ /dev/null
@@ -1,89 +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="EmailGateway" 
-                  targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
-                    xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/">
-                    
-            <xsd:element name="sendEmail" type="tns:SendEmailType"/>
-            <xsd:complexType name="SendEmailType">
-                <xsd:sequence>
-                    <xsd:element name="Email" type="tns:EmailType"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>
-            <xsd:complexType name="SendEmailResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:complexType name="EmailType">
-                <xsd:sequence>
-                    <xsd:element name="To" type="xsd:string"/>
-                    <xsd:element name="Title" type="xsd:string"/>
-                    <xsd:element name="Body" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="SendEmailRequest">
-        <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="SendEmailResponse">
-        <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="EmailGateway">
-        <wsdl:operation name="sendEmail">
-            <wsdl:input message="tns:SendEmailRequest"></wsdl:input>
-            <wsdl:output message="tns:SendEmailResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="sendEmail">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="EmailGatewayService">
-        <wsdl:port name="EmailGatewayPort" binding="tns:EmailGatwayBinding">
-            <soap:address location="http://localhost:8082/EmailGateway" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="EmailGatewayLinkType">
-        <plnk:role name="forward" portType="tns:EmailGateway"/>
-    </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 63b79a7f63..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:tours="http://tuscanyscatours.com/">
-    <deployable composite="tours:payment" />
-    <export.java package="com.tuscanyscatours.payment" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/Payment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/Payment.wsdl
deleted file mode 100644
index 2519d7642e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/Payment.wsdl
+++ /dev/null
@@ -1,83 +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="Payment" 
-                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
-
-            <xsd:complexType name="MakePaymentMemberType">
-                <xsd:sequence>
-                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>                    
-            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
-      
-            <xsd:complexType name="MakePaymentMemberResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
-            
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="MakePaymentMemberRequest">
-        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="MakePaymentMemberResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="Payment">
-        <wsdl:operation name="makePaymentMember">
-            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="PaymentBinding" type="tns:Payment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePaymentMember">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PaymentService">
-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8083/Payment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="PaymentLinkType">
-       <plnk:role name="forward" portType="tns:Payment"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite
deleted file mode 100644
index f0b25e41d6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment.composite
+++ /dev/null
@@ -1,38 +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" 
-           targetNamespace="http://tuscanyscatours.com/"
-           xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
-           xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-           name="payment">
-              
-    <component name="Payment">
-        <t:implementation.script script="payment/PaymentImpl.groovy"/>
-        <service name="Payment">
-            <interface.java interface="com.tuscanyscatours.payment.Payment" />
-            <binding.ws uri="http://localhost:8081/Payment"/>
-        </service>        
-        <reference name="emailGateway">
-           <interface.java interface="com.tuscanyscatours.emailgateway.EmailGateway" />
-           <binding.ws uri="http://localhost:8088/EmailGateway"/>
-        </reference> 
-        <property name="transactionFee" type="xsd:float">0.02</property>
-    </component> 
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment/PaymentImpl.groovy b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment/PaymentImpl.groovy
deleted file mode 100644
index 854fbd2f4a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/main/resources/payment/PaymentImpl.groovy
+++ /dev/null
@@ -1,31 +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.    

- */

-

-def makePaymentMember(customerId, amount) {

-   

-    def finalAmount = amount + transactionFee;

-    

-	com.tuscanyscatours.emailgateway.EmailType email = new com.tuscanyscatours.emailgateway.EmailType();

-	email.setTo(customerId);

-	email.setTitle("Payment " + finalAmount +  " Received");

-    

-    emailGateway.sendEmail(email);

-    

-    return "Success";

-}
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
deleted file mode 100644
index 440fbd9721..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/PaymentTestCase.java
+++ /dev/null
@@ -1,82 +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 scatours.payment;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-import com.tuscanyscatours.payment.Payment;

-

-/**

- * 

- */

-public class PaymentTestCase {

-

-    private static Node paymentNode;

-    private static Node creditCardNode;

-    private static Node emailGatewayNode;

-

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-        creditCardNode =

-            NodeFactory.getInstance()

-                .createNode("creditcard.composite",

-                               new Contribution("creditcard", "../creditcard-payment-jaxb/target/classes"));

-

-        creditCardNode.start();

-

-        emailGatewayNode =

-            NodeFactory.getInstance().createNode("emailgateway.composite",

-                                                       new Contribution("emailgateway",

-                                                                           "../emailgateway/target/classes"),

-                                                       new Contribution("emailgateway-test",

-                                                                           "../emailgateway/target/test-classes"));

-

-        emailGatewayNode.start();

-

-        paymentNode =

-            NodeFactory.getInstance().createNode(

-                                                       new Contribution("payment-groovy", "./target/classes"),

-                                                       new Contribution("payment-groovy-test",

-                                                                           "./target/test-classes"));

-

-        paymentNode.start();

-    }

-

-    @Test

-    public void testPayment() {

-        Node client = (Node)paymentNode;

-        Payment payment = client.getService(Payment.class, "PaymentClient");

-        System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));

-    }

-

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

-        paymentNode.stop();

-        creditCardNode.stop();

-        emailGatewayNode.stop();

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
deleted file mode 100644
index 3b8d8ad88a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ /dev/null
@@ -1,37 +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 scatours.payment.client.impl;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.payment.Payment;

-

-@Service(Payment.class)

-public class PaymentClientImpl implements Payment {

-    @Reference

-    protected Payment payment;

-

-    public String makePaymentMember(String customerId, float amount) {

-        // Delegate the external web service

-        return payment.makePaymentMember(customerId, amount);

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 666769fef5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-              xmlns:tours="http://tuscanyscatours.com/" >
-    <deployable composite="tours:paymentClient" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite
deleted file mode 100644
index 93482dfb45..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-groovy/src/test/resources/payment-client.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-           targetNamespace="http://tuscanyscatours.com/"
-           name="paymentClient">
-
-    <component name="PaymentClient">
-        <implementation.java class="scatours.payment.client.impl.PaymentClientImpl" />
-        <reference name="payment">
-            <interface.java interface="com.tuscanyscatours.payment.Payment" />
-            <binding.ws uri="http://localhost:8081/Payment" />
-        </reference>
-    </component>
-                 
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/build.xml
deleted file mode 100644
index 4c943a7370..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-contribution-payment-java-policy" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-	    <antcall target="wsimport">

-		    <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-		    <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-		    <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-		</antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="Payment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment"/>

-        </antcall>

-	</target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml
deleted file mode 100644
index 3adfca89f4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/maven-eclipse.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<project default="copy-resources">
-  <target name="init"/>
-  <target name="copy-resources" depends="init">
-    <copy todir="target/classes/META-INF" filtering="true">
-      <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/>
-    </copy>
-  </target>
-</project>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml
deleted file mode 100644
index b04b40b6a0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/pom.xml
+++ /dev/null
@@ -1,176 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-payment-java-policy</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Java Policy Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-<!-- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
--->
-
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <executions>
-                    <execution>
-                        <id>payment</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>Payment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>payment.creditcard</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment.creditcard</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/Customer.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/Customer.java
deleted file mode 100644
index 3b72f81b33..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/Customer.java
+++ /dev/null
@@ -1,70 +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 com.tuscanyscatours.customer;
-
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-
-/**
- * Customer data
- */
-public class Customer {
-    private String id;
-    private String email;
-    private String name;
-
-    private CreditCardDetailsType creditCard;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public CreditCardDetailsType getCreditCard() {
-        return creditCard;
-    }
-
-    public void setCreditCard(CreditCardDetailsType creditCard) {
-        this.creditCard = creditCard;
-    }
-
-    public String toString() {
-        return "id: " + id + " name: " + name + " e-mail: " + email;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
deleted file mode 100644
index b08f76e0fa..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
+++ /dev/null
@@ -1,57 +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 com.tuscanyscatours.customer;
-
-public class CustomerNotFoundException extends Exception {
-    private static final long serialVersionUID = -129752837478357452L;
-
-    /**
-     * 
-     */
-    public CustomerNotFoundException() {
-
-    }
-
-    /**
-     * @param message
-     */
-    public CustomerNotFoundException(String message) {
-        super(message);
-
-    }
-
-    /**
-     * @param cause
-     */
-    public CustomerNotFoundException(Throwable cause) {
-        super(cause);
-
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public CustomerNotFoundException(String message, Throwable cause) {
-        super(message, cause);
-
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
deleted file mode 100644
index 706167d567..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
+++ /dev/null
@@ -1,39 +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 com.tuscanyscatours.customer;
-
-import java.util.Collection;
-
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-
-/**
- * Customer registry interface
- */
-public interface CustomerRegistry {
-    Customer createCustomer(String name, String email, CreditCardDetailsType creditCard);
-
-    boolean updateCustomer(Customer customer);
-
-    Customer getCustomer(String id) throws CustomerNotFoundException;
-
-    Collection<Customer> getAllCustomers();
-
-    boolean deleteCustomer(String id);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
deleted file mode 100644
index d0b1736e98..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
+++ /dev/null
@@ -1,115 +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 com.tuscanyscatours.customer.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Requires;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.customer.Customer;
-import com.tuscanyscatours.customer.CustomerNotFoundException;
-import com.tuscanyscatours.customer.CustomerRegistry;
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;
-import com.tuscanyscatours.payment.creditcard.ObjectFactory;
-import com.tuscanyscatours.payment.creditcard.PayerType;
-
-/**
- * An in-memory customer registry implementation
- */
-@Service(CustomerRegistry.class)
-@Scope("COMPOSITE")
-@EagerInit
-@Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction.global")
-public class CustomerRegistryImpl implements CustomerRegistry {
-    private volatile static int idGenerator = 0;
-    private Map<String, Customer> customers = new HashMap<String, Customer>();
-
-    @Init
-    public void init() {
-        // Load the customers
-        ObjectFactory factory = new ObjectFactory();
-        CreditCardDetailsType cc = factory.createCreditCardDetailsType();
-        PayerType john = factory.createPayerType();
-        john.setName("John Smith");
-        cc.setCardOwner(john);
-        cc.setCreditCardNumber("1111-2222-3333-4444");
-        cc.setCreditCardType(CreditCardTypeType.VISA);
-        cc.setCVV2("1234");
-        cc.setExpMonth(1);
-        cc.setExpYear(2012);
-        createCustomer("John Smith", "john@xyz.com", cc);
-    }
-
-    @Destroy
-    public void destroy() {
-        // Save the customers
-    }
-
-    public Customer createCustomer(String name, String email, CreditCardDetailsType creditCard) {
-        Customer customer = new Customer();
-        customer.setId("c-" + idGenerator++);
-        customer.setName(name);
-        customer.setEmail(email);
-        customer.setCreditCard(creditCard);
-        customers.put(customer.getId(), customer);
-        return customer;
-    }
-
-    public boolean deleteCustomer(String id) {
-        return customers.remove(id) != null;
-    }
-
-    public Collection<Customer> getAllCustomers() {
-        return customers.values();
-    }
-
-    public Customer getCustomer(String id) throws CustomerNotFoundException {
-        Customer customer = customers.get(id);
-
-        if (customer == null) {
-            throw new CustomerNotFoundException("Customer " + id + " not found");
-        }
-
-        return customer;
-    }
-
-    public boolean updateCustomer(Customer customer) {
-        Customer current = null;
-        try {
-            current = getCustomer(customer.getId());
-        } catch (Exception ex) {
-            return false;
-        }
-
-        current.setEmail(customer.getEmail());
-        current.setName(customer.getName());
-        current.setCreditCard(customer.getCreditCard());
-        return true;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
deleted file mode 100644
index 716ea18ee4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.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 com.tuscanyscatours.emailgateway;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * A gateway to send e-mail
- */
-@Remotable
-public interface EmailGateway {
-    public boolean sendEmail(String sender, String recipient, String subject, String body);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
deleted file mode 100644
index 3556b4855b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
+++ /dev/null
@@ -1,37 +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 com.tuscanyscatours.emailgateway.impl;
-
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.emailgateway.EmailGateway;
-
-@Service(EmailGateway.class)
-public class EmailGatewayImpl implements EmailGateway {
-
-    public boolean sendEmail(String sender, String recipient, String subject, String body) {
-        System.out.println("From: " + sender);
-        System.out.println("To: " + recipient);
-        System.out.println("Subject: " + subject);
-        System.out.println(body);
-        return true;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
deleted file mode 100644
index e25505ce45..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
+++ /dev/null
@@ -1,74 +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 com.tuscanyscatours.payment.impl;
-
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Requires;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.customer.Customer;
-import com.tuscanyscatours.customer.CustomerNotFoundException;
-import com.tuscanyscatours.customer.CustomerRegistry;
-import com.tuscanyscatours.emailgateway.EmailGateway;
-import com.tuscanyscatours.payment.Payment;
-import com.tuscanyscatours.payment.creditcard.AuthorizeFault_Exception;
-import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
-
-/**
- * The payment implementation
- */
-@Service(Payment.class)
-//@RolesAllowed({"Admin", "Billing"})
-//@RunAs("Billing")
-public class PaymentImpl implements Payment {
-
-    @Reference
-    protected CustomerRegistry customerRegistry;
-
-    @Reference
-    //@Authentication - not supported
-    @Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}authentication")
-    protected CreditCardPayment creditCardPayment;
-
-    @Reference
-    protected EmailGateway emailGateway;
-
-    @Property
-    protected float transactionFee = 0.01f;
-
-    public String makePaymentMember(String customerId, float amount) {
-        try {
-            Customer customer = customerRegistry.getCustomer(customerId);
-            String status = creditCardPayment.authorize(customer.getCreditCard(), amount + transactionFee);
-            emailGateway.sendEmail("order@tuscanyscatours.com",
-                                   customer.getEmail(),
-                                   "Status for your payment",
-                                   customer + " >>> Status = " + status);
-            return status;
-        } catch (CustomerNotFoundException ex) {
-            return "Payment failed due to " + ex.getMessage();
-        } catch (AuthorizeFault_Exception e) {
-            return e.getFaultInfo().getErrorCode();
-        } catch (Throwable t) {
-            return "Payment failed due to system error " + t.getMessage();
-        }
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 9a87f1d2ae..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,132 +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="CreditCardPayment"

-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"

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

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">

-

-            <xsd:element name="authorize">

-            <xsd:complexType>

-                <xsd:sequence>

-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>

-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            </xsd:element>

-

-            <xsd:element name="authorizeResponse">

-            <xsd:complexType>

-                <xsd:sequence>

-                    <xsd:element name="Status" type="xsd:string"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            </xsd:element>

-

-            <xsd:complexType name="CreditCardDetailsType">

-                <xsd:sequence>

-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />

-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />

-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />

-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:simpleType name="CreditCardTypeType">

-                <xsd:restriction base="xsd:token">

-                    <xsd:enumeration value="Visa" />

-                    <xsd:enumeration value="MasterCard" />

-                    <xsd:enumeration value="Discover" />

-                    <xsd:enumeration value="Amex" />

-                </xsd:restriction>

-            </xsd:simpleType>

-            <xsd:complexType name="PayerType">

-                <xsd:sequence>

-                    <xsd:element name="Name" type="xsd:string" />

-                    <xsd:element name="Address" type="tns:AddressType" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:complexType name="AddressType">

-                <xsd:sequence>

-                    <xsd:element name="Street" type="xsd:string" />

-                    <xsd:element name="City" type="xsd:string" />

-                    <xsd:element name="State" type="xsd:string" />

-                    <xsd:element name="ZipCode" type="xsd:string" />

-                    <xsd:element name="HomePhone" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:element name="authorizeFault">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="errorCode" type="xsd:string"></xsd:element>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="AuthorizeRequest">

-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeResponse">

-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeFault">

-        <wsdl:part name="parameters" element="tns:authorizeFault"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="CreditCardPayment">

-        <wsdl:operation name="authorize">

-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>

-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>

-            <wsdl:fault name="authorizationFailure" message="tns:AuthorizeFault"></wsdl:fault>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">

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

-        <wsdl:operation name="authorize">

-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="authorizationFailure">

-                <soap:fault name="authorizationFailure" use="literal"/>

-            </wsdl:fault>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="CreditCardPaymentService">

-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">

-            <soap:address location="http://localhost:8080/CreditCardPayment" />

-        </wsdl:port>

-    </wsdl:service>

-

-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">

-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>

-    </plnk:partnerLinkType>

-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index abe5ba8718..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:payment" />
-    <export.java package="com.tuscanyscatours.payment" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/Payment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/Payment.wsdl
deleted file mode 100644
index 2519d7642e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/Payment.wsdl
+++ /dev/null
@@ -1,83 +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="Payment" 
-                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
-
-            <xsd:complexType name="MakePaymentMemberType">
-                <xsd:sequence>
-                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>                    
-            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
-      
-            <xsd:complexType name="MakePaymentMemberResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
-            
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="MakePaymentMemberRequest">
-        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="MakePaymentMemberResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="Payment">
-        <wsdl:operation name="makePaymentMember">
-            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="PaymentBinding" type="tns:Payment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePaymentMember">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PaymentService">
-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8083/Payment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="PaymentLinkType">
-       <plnk:role name="forward" portType="tns:Payment"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml
deleted file mode 100644
index 98f9db7ed3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,48 +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.    
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
-
-    <!-- Policy Intents Defined by the SCA Runtime -->
-    <intent name="authorization" constrains="sca:implementation"/>
-    <intent name="managedTransaction" constrains="sca:implementation"/>
-    <intent name="managedTransaction.global"/>
-    
-    <!-- Policy Sets -->
-    <policySet name="ps1" 
-               provides="sca:authorization" 
-               appliesTo="sca:implementation.java"/>
-    
-    <policySet name="ps2" 
-               provides="sca:managedTransaction.global" 
-               appliesTo="sca:implementation.java"/>
-    
-    <policySet name="BasicAuthenticationPolicySet"
-                   provides="authentication"
-                   appliesTo="sca:binding.ws">
-        <tuscany:basicAuthentication>
-          <tuscany:userName>myname</tuscany:userName>
-          <tuscany:password>mypassword</tuscany:password>
-        </tuscany:basicAuthentication>
-    </policySet>
-	
-</definitions>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite
deleted file mode 100644
index 8050d19771..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/main/resources/payment.composite
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-           targetNamespace="http://tuscanyscatours.com/"
-           name="payment">
-           
-    <component name="Payment">
-        <implementation.java class="com.tuscanyscatours.payment.impl.PaymentImpl" />
-        <service name="Payment">
-           <binding.sca/>
-           <binding.ws uri="http://localhost:8081/Payment"/>
-        </service>
-        <reference name="customerRegistry" target="CustomerRegistry"/>
-        <!-- reference name="creditCardPayment" policySets="BasicAuthenticationPolicySet"-->
-        <!-- reference name="creditCardPayment" requires="authentication"-->
-        <reference name="creditCardPayment">
-            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
-        </reference>
-        <reference name="emailGateway" target="EmailGateway"/>
-        <property name="transactionFee">0.02</property>
-    </component>
-        
-    <component name="CustomerRegistry">
-        <implementation.java class="com.tuscanyscatours.customer.impl.CustomerRegistryImpl" />
-    </component>
-            
-    <component name="EmailGateway">
-        <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl" />
-    </component>    
-    
-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
deleted file mode 100644
index 6ebcc4f2dc..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java-policy/src/test/java/scatours/payment/PaymentTestCase.java
+++ /dev/null
@@ -1,85 +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 scatours.payment;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.tuscanyscatours.payment.Payment;
-
-public class PaymentTestCase {
-    private static Node node1;
-    private static Node node2;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        node1 =
-            NodeFactory.getInstance()
-                .createNode("payment.composite",
-                               new Contribution("payment", "./target/classes"));
-        node2 =
-            NodeFactory.getInstance()
-                .createNode("creditcard.composite",        
-                               new Contribution("creditcard",
-                                                   "../../contributions/creditcard-payment-jaxb/target/classes"));
-        node1.start();
-        node2.start();
-    }
-
-    @Test
-    public void testPayment() {
-        Node client = (Node)node1;
-        Payment payment = client.getService(Payment.class, "Payment");
-
-        System.out.println("\n\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
-        System.out.println("\n\nFailed Payment - Status = \n\n" + payment.makePaymentMember("c-1", 100.00f));
-    }
-
-    @Test
-    @Ignore
-    public void testWaitForInput() {
-        System.out.println("Press a key to end");
-        try {
-            System.in.read();
-        } catch (Exception ex) {
-        }
-        System.out.println("Shutting down");
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        if (node1 != null) {
-            node1.stop();
-            node1 = null;
-        }
-        
-        if (node2 != null) {
-            node2.stop();
-            node2 = null;
-        }        
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/build.xml
deleted file mode 100644
index 4ddd9fbba0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-contribution-payment-java" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-	    <antcall target="wsimport">

-		    <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-		    <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-		    <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-		</antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="Payment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment"/>

-        </antcall>

-	</target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml
deleted file mode 100644
index f8c27ca09b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/pom.xml
+++ /dev/null
@@ -1,167 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-payment-java</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Java Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <executions>
-                    <execution>
-                        <id>payment</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>Payment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>payment.creditcard</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment.creditcard</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/Customer.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/Customer.java
deleted file mode 100644
index c97ba8fb9f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/Customer.java
+++ /dev/null
@@ -1,70 +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 com.tuscanyscatours.customer;

-

-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

-

-/**

- * Customer data

- */

-public class Customer {

-    private String id;

-    private String email;

-    private String name;

-

-    private CreditCardDetailsType creditCard;

-

-    public String getId() {

-        return id;

-    }

-

-    public void setId(String id) {

-        this.id = id;

-    }

-

-    public String getEmail() {

-        return email;

-    }

-

-    public void setEmail(String email) {

-        this.email = email;

-    }

-

-    public String getName() {

-        return name;

-    }

-

-    public void setName(String name) {

-        this.name = name;

-    }

-

-    public CreditCardDetailsType getCreditCard() {

-        return creditCard;

-    }

-

-    public void setCreditCard(CreditCardDetailsType creditCard) {

-        this.creditCard = creditCard;

-    }

-

-    public String toString() {

-        return "id: " + id + " name: " + name + " e-mail: " + email;

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
deleted file mode 100644
index 7f028c301e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
+++ /dev/null
@@ -1,57 +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 com.tuscanyscatours.customer;

-

-public class CustomerNotFoundException extends Exception {

-    private static final long serialVersionUID = -129752837478357452L;

-

-    /**

-     * 

-     */

-    public CustomerNotFoundException() {

-

-    }

-

-    /**

-     * @param message

-     */

-    public CustomerNotFoundException(String message) {

-        super(message);

-

-    }

-

-    /**

-     * @param cause

-     */

-    public CustomerNotFoundException(Throwable cause) {

-        super(cause);

-

-    }

-

-    /**

-     * @param message

-     * @param cause

-     */

-    public CustomerNotFoundException(String message, Throwable cause) {

-        super(message, cause);

-

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
deleted file mode 100644
index 38a2759660..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
+++ /dev/null
@@ -1,39 +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 com.tuscanyscatours.customer;

-

-import java.util.Collection;

-

-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

-

-/**

- * Customer registry interface

- */

-public interface CustomerRegistry {

-    Customer createCustomer(String name, String email, CreditCardDetailsType creditCard);

-

-    boolean updateCustomer(Customer customer);

-

-    Customer getCustomer(String id) throws CustomerNotFoundException;

-

-    Collection<Customer> getAllCustomers();

-

-    boolean deleteCustomer(String id);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
deleted file mode 100644
index 906e392459..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
+++ /dev/null
@@ -1,115 +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 com.tuscanyscatours.customer.impl;

-

-import java.util.Collection;

-import java.util.HashMap;

-import java.util.Map;

-

-import org.oasisopen.sca.annotation.Destroy;

-import org.oasisopen.sca.annotation.EagerInit;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Requires;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.customer.Customer;

-import com.tuscanyscatours.customer.CustomerNotFoundException;

-import com.tuscanyscatours.customer.CustomerRegistry;

-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;

-import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;

-import com.tuscanyscatours.payment.creditcard.ObjectFactory;

-import com.tuscanyscatours.payment.creditcard.PayerType;

-

-/**

- * An in-memory customer registry implementation

- */

-@Service(CustomerRegistry.class)

-@Scope("COMPOSITE")

-@EagerInit

-@Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction.global")

-public class CustomerRegistryImpl implements CustomerRegistry {

-    private volatile static int idGenerator = 0;

-    private Map<String, Customer> customers = new HashMap<String, Customer>();

-

-    @Init

-    public void init() {

-        // Load the customers

-        ObjectFactory factory = new ObjectFactory();

-        CreditCardDetailsType cc = factory.createCreditCardDetailsType();

-        PayerType john = factory.createPayerType();

-        john.setName("John Smith");

-        cc.setCardOwner(john);

-        cc.setCreditCardNumber("1111-2222-3333-4444");

-        cc.setCreditCardType(CreditCardTypeType.VISA);

-        cc.setCVV2("1234");

-        cc.setExpMonth(1);

-        cc.setExpYear(2012);

-        createCustomer("John Smith", "john@xyz.com", cc);

-    }

-

-    @Destroy

-    public void destroy() {

-        // Save the customers

-    }

-

-    public Customer createCustomer(String name, String email, CreditCardDetailsType creditCard) {

-        Customer customer = new Customer();

-        customer.setId("c-" + idGenerator++);

-        customer.setName(name);

-        customer.setEmail(email);

-        customer.setCreditCard(creditCard);

-        customers.put(customer.getId(), customer);

-        return customer;

-    }

-

-    public boolean deleteCustomer(String id) {

-        return customers.remove(id) != null;

-    }

-

-    public Collection<Customer> getAllCustomers() {

-        return customers.values();

-    }

-

-    public Customer getCustomer(String id) throws CustomerNotFoundException {

-        Customer customer = customers.get(id);

-

-        if (customer == null) {

-            throw new CustomerNotFoundException("Customer " + id + " not found");

-        }

-

-        return customer;

-    }

-

-    public boolean updateCustomer(Customer customer) {

-        Customer current = null;

-        try {

-            current = getCustomer(customer.getId());

-        } catch (Exception ex) {

-            return false;

-        }

-

-        current.setEmail(customer.getEmail());

-        current.setName(customer.getName());

-        current.setCreditCard(customer.getCreditCard());

-        return true;

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
deleted file mode 100644
index d4aa8125e7..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.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 com.tuscanyscatours.emailgateway;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * A gateway to send e-mail

- */

-@Remotable

-public interface EmailGateway {

-    public boolean sendEmail(String sender, String recipient, String subject, String body);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
deleted file mode 100644
index 1ae87d00cc..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
+++ /dev/null
@@ -1,37 +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 com.tuscanyscatours.emailgateway.impl;

-

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.emailgateway.EmailGateway;

-

-@Service(EmailGateway.class)

-public class EmailGatewayImpl implements EmailGateway {

-

-    public boolean sendEmail(String sender, String recipient, String subject, String body) {

-        System.out.println("From: " + sender);

-        System.out.println("To: " + recipient);

-        System.out.println("Subject: " + subject);

-        System.out.println(body);

-        return true;

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
deleted file mode 100644
index f384a9ac2a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-

-package com.tuscanyscatours.payment.impl;

-

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.customer.Customer;

-import com.tuscanyscatours.customer.CustomerNotFoundException;

-import com.tuscanyscatours.customer.CustomerRegistry;

-import com.tuscanyscatours.emailgateway.EmailGateway;

-import com.tuscanyscatours.payment.Payment;

-import com.tuscanyscatours.payment.creditcard.AuthorizeFault_Exception;

-import com.tuscanyscatours.payment.creditcard.CreditCardPayment;

-

-/**

- * The payment implementation

- */

-@Service(Payment.class)

-public class PaymentImpl implements Payment {

-

-    @Reference

-    protected CustomerRegistry customerRegistry;

-

-    @Reference

-    protected CreditCardPayment creditCardPayment;

-

-    @Reference

-    protected EmailGateway emailGateway;

-

-    @Property

-    protected float transactionFee = 0.01f;

-

-    public String makePaymentMember(String customerId, float amount) {

-        try {

-            Customer customer = customerRegistry.getCustomer(customerId);

-            String status = creditCardPayment.authorize(customer.getCreditCard(), amount + transactionFee);

-            emailGateway.sendEmail("order@tuscanyscatours.com",

-                                   customer.getEmail(),

-                                   "Status for your payment",

-                                   customer + " >>> Status = " + status);

-            return status;

-        } catch (CustomerNotFoundException ex) {

-            return "Payment failed due to " + ex.getMessage();

-        } catch (AuthorizeFault_Exception e) {

-            return e.getFaultInfo().getErrorCode();

-        } catch (Throwable t) {

-            return "Payment failed due to system error " + t.getMessage();

-        }

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index d17497d1f6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,132 +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="CreditCardPayment"

-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/"

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

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"

-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"

-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">

-

-            <xsd:element name="authorize">

-            <xsd:complexType>

-                <xsd:sequence>

-                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>

-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            </xsd:element>

-

-            <xsd:element name="authorizeResponse">

-            <xsd:complexType>

-                <xsd:sequence>

-                    <xsd:element name="Status" type="xsd:string"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            </xsd:element>

-

-            <xsd:complexType name="CreditCardDetailsType">

-                <xsd:sequence>

-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />

-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />

-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />

-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />

-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:simpleType name="CreditCardTypeType">

-                <xsd:restriction base="xsd:token">

-                    <xsd:enumeration value="Visa" />

-                    <xsd:enumeration value="MasterCard" />

-                    <xsd:enumeration value="Discover" />

-                    <xsd:enumeration value="Amex" />

-                </xsd:restriction>

-            </xsd:simpleType>

-            <xsd:complexType name="PayerType">

-                <xsd:sequence>

-                    <xsd:element name="Name" type="xsd:string" />

-                    <xsd:element name="Address" type="tns:AddressType" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:complexType name="AddressType">

-                <xsd:sequence>

-                    <xsd:element name="Street" type="xsd:string" />

-                    <xsd:element name="City" type="xsd:string" />

-                    <xsd:element name="State" type="xsd:string" />

-                    <xsd:element name="ZipCode" type="xsd:string" />

-                    <xsd:element name="HomePhone" type="xsd:string" />

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:element name="authorizeFault">

-                <xsd:complexType>

-                    <xsd:sequence>

-                        <xsd:element name="errorCode" type="xsd:string"></xsd:element>

-                    </xsd:sequence>

-                </xsd:complexType>

-            </xsd:element>

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="AuthorizeRequest">

-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeResponse">

-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="AuthorizeFault">

-        <wsdl:part name="parameters" element="tns:authorizeFault"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="CreditCardPayment">

-        <wsdl:operation name="authorize">

-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>

-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>

-            <wsdl:fault name="authorizationFailure" message="tns:AuthorizeFault"></wsdl:fault>
-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">

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

-        <wsdl:operation name="authorize">

-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-            <wsdl:fault name="authorizationFailure">

-                <soap:fault name="authorizationFailure" use="literal"/>

-            </wsdl:fault>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="CreditCardPaymentService">

-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">

-            <soap:address location="http://localhost:8080/CreditCardPayment" />

-        </wsdl:port>

-    </wsdl:service>

-

-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">

-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>

-    </plnk:partnerLinkType>

-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 52b8928c7e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:scatours="http://tuscanyscatours.com/">

-    <deployable composite="scatours:payment" />

-    <export.java package="com.tuscanyscatours.payment" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl
deleted file mode 100644
index 3885764899..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl
+++ /dev/null
@@ -1,83 +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="Payment" 

-                  targetNamespace="http://www.tuscanyscatours.com/Payment/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 

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

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

-                    targetNamespace="http://www.tuscanyscatours.com/Payment/"

-                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">

-

-            <xsd:complexType name="MakePaymentMemberType">

-                <xsd:sequence>

-                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>

-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>                    

-            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>

-      

-            <xsd:complexType name="MakePaymentMemberResponseType">

-                <xsd:sequence>

-                    <xsd:element name="Status" type="xsd:string"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>

-            

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="MakePaymentMemberRequest">

-        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="MakePaymentMemberResponse">

-        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="Payment">

-        <wsdl:operation name="makePaymentMember">

-            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>

-            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="PaymentBinding" type="tns:Payment">

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

-        <wsdl:operation name="makePaymentMember">

-            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="PaymentService">

-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">

-            <soap:address location="http://localhost:8083/Payment" />

-        </wsdl:port>

-    </wsdl:service>

-    

-   <plnk:partnerLinkType name="PaymentLinkType">

-       <plnk:role name="forward" portType="tns:Payment"/>

-   </plnk:partnerLinkType>

-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml
deleted file mode 100644
index a5f3379087..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,34 +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.    

--->

-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

- 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"

- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-

-    <!-- Policy Intents Defined by the SCA Runtime -->

-    <intent name="authorization" constrains="sca:implementation"/>

-    <intent name="managedTransaction" constrains="sca:implementation"/>

-    <intent name="managedTransaction.global"/>

-    

-    <!-- Policy intents -->

-    <policySet name="ps1" provides="sca:authorization" appliesTo="sca:implementation.java"/>

-    

-    <policySet name="ps2" provides="sca:managedTransaction.global" appliesTo="sca:implementation.java"/>

-	

-</definitions>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite
deleted file mode 100644
index b90c94b845..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/main/resources/payment.composite
+++ /dev/null
@@ -1,46 +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" 

-           targetNamespace="http://tuscanyscatours.com/"

-           name="payment">

-           

-    <component name="Payment">

-        <implementation.java class="com.tuscanyscatours.payment.impl.PaymentImpl" />

-        <service name="Payment">

-            <binding.ws uri="http://localhost:8081/Payment" />

-            <binding.sca />

-        </service>

-        <reference name="customerRegistry" target="CustomerRegistry" />

-        <reference name="creditCardPayment">

-            <binding.ws uri="http://localhost:8082/CreditCardPayment" />

-        </reference>

-        <reference name="emailGateway" target="EmailGateway" />

-        <property name="transactionFee">0.02</property>

-    </component>

-        

-    <component name="CustomerRegistry">

-        <implementation.java class="com.tuscanyscatours.customer.impl.CustomerRegistryImpl" />

-    </component>

-            

-    <component name="EmailGateway">

-        <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl" />

-    </component>    

-    

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java
deleted file mode 100644
index b5345d6be8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-java/src/test/java/scatours/payment/PaymentTestCase.java
+++ /dev/null
@@ -1,75 +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 scatours.payment;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Ignore;

-import org.junit.Test;

-

-import com.tuscanyscatours.payment.Payment;

-

-public class PaymentTestCase {

-    private static Node node;

-

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-        node =

-            NodeFactory.getInstance()

-                .createNode(

-                               new Contribution("payment", "./target/classes"),

-                               new Contribution("creditcard",

-                                                   "../../contributions/creditcard-payment-jaxb/target/classes"));

-        node.start();

-    }

-

-    @Test

-    public void testPayment() {

-        Node client = (Node)node;

-        Payment payment = client.getService(Payment.class, "Payment");

-

-        System.out.println("\n\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));

-        System.out.println("\n\nFailed Payment - Status = \n\n" + payment.makePaymentMember("c-1", 100.00f));

-    }

-

-    @Test

-    @Ignore

-    public void testWaitForInput() {

-        System.out.println("Press a key to end");

-        try {

-            System.in.read();

-        } catch (Exception ex) {

-        }

-        System.out.println("Shutting down");

-    }

-

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

-        if (node != null) {

-            node.stop();

-            node = null;

-        }

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/build.xml
deleted file mode 100644
index db0e41b22f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/build.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-contribution-payment-spring-policy" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="EmailGateway.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/emailgateway/EmailGateway.class"/>

-            <param name="package" value="com.tuscanyscatours.emailgateway"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="Payment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment"/>

-        </antcall>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml
deleted file mode 100644
index a7eafd0235..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/pom.xml
+++ /dev/null
@@ -1,189 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-payment-spring-policy</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Spring Policy Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!--
-            https://issues.apache.org/jira/browse/TUSCANY-3069
-        -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-sca</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <executions>
-                    <execution>
-                        <id>payment</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>Payment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>payment.creditcard</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment.creditcard</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>scatours.emailgateway</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.emailgateway</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>EmailGateway.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/emailgateway.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/Customer.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/Customer.java
deleted file mode 100644
index 3b72f81b33..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/Customer.java
+++ /dev/null
@@ -1,70 +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 com.tuscanyscatours.customer;
-
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-
-/**
- * Customer data
- */
-public class Customer {
-    private String id;
-    private String email;
-    private String name;
-
-    private CreditCardDetailsType creditCard;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public CreditCardDetailsType getCreditCard() {
-        return creditCard;
-    }
-
-    public void setCreditCard(CreditCardDetailsType creditCard) {
-        this.creditCard = creditCard;
-    }
-
-    public String toString() {
-        return "id: " + id + " name: " + name + " e-mail: " + email;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
deleted file mode 100644
index b08f76e0fa..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
+++ /dev/null
@@ -1,57 +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 com.tuscanyscatours.customer;
-
-public class CustomerNotFoundException extends Exception {
-    private static final long serialVersionUID = -129752837478357452L;
-
-    /**
-     * 
-     */
-    public CustomerNotFoundException() {
-
-    }
-
-    /**
-     * @param message
-     */
-    public CustomerNotFoundException(String message) {
-        super(message);
-
-    }
-
-    /**
-     * @param cause
-     */
-    public CustomerNotFoundException(Throwable cause) {
-        super(cause);
-
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public CustomerNotFoundException(String message, Throwable cause) {
-        super(message, cause);
-
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
deleted file mode 100644
index 706167d567..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
+++ /dev/null
@@ -1,39 +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 com.tuscanyscatours.customer;
-
-import java.util.Collection;
-
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-
-/**
- * Customer registry interface
- */
-public interface CustomerRegistry {
-    Customer createCustomer(String name, String email, CreditCardDetailsType creditCard);
-
-    boolean updateCustomer(Customer customer);
-
-    Customer getCustomer(String id) throws CustomerNotFoundException;
-
-    Collection<Customer> getAllCustomers();
-
-    boolean deleteCustomer(String id);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
deleted file mode 100644
index 147526dfd3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
+++ /dev/null
@@ -1,113 +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 com.tuscanyscatours.customer.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.customer.Customer;
-import com.tuscanyscatours.customer.CustomerNotFoundException;
-import com.tuscanyscatours.customer.CustomerRegistry;
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;
-import com.tuscanyscatours.payment.creditcard.ObjectFactory;
-import com.tuscanyscatours.payment.creditcard.PayerType;
-
-/**
- * An in-memory customer registry implementation
- */
-@Service(CustomerRegistry.class)
-@Scope("COMPOSITE")
-@EagerInit
-public class CustomerRegistryImpl implements CustomerRegistry {
-    private volatile static int idGenerator = 0;
-    private Map<String, Customer> customers = new HashMap<String, Customer>();
-
-    @Init
-    public void init() {
-        // Load the customers
-        ObjectFactory factory = new ObjectFactory();
-        CreditCardDetailsType cc = factory.createCreditCardDetailsType();
-        PayerType john = factory.createPayerType();
-        john.setName("John Smith");
-        cc.setCardOwner(john);
-        cc.setCreditCardNumber("1111-2222-3333-4444");
-        cc.setCreditCardType(CreditCardTypeType.VISA);
-        cc.setCVV2("1234");
-        cc.setExpMonth(1);
-        cc.setExpYear(2012);
-        createCustomer("John Smith", "john@xyz.com", cc);
-    }
-
-    @Destroy
-    public void destroy() {
-        // Save the customers
-    }
-
-    public Customer createCustomer(String name, String email, CreditCardDetailsType creditCard) {
-        Customer customer = new Customer();
-        customer.setId("c-" + idGenerator++);
-        customer.setName(name);
-        customer.setEmail(email);
-        customer.setCreditCard(creditCard);
-        customers.put(customer.getId(), customer);
-        return customer;
-    }
-
-    public boolean deleteCustomer(String id) {
-        return customers.remove(id) != null;
-    }
-
-    public Collection<Customer> getAllCustomers() {
-        return customers.values();
-    }
-
-    public Customer getCustomer(String id) throws CustomerNotFoundException {
-        Customer customer = customers.get(id);
-
-        if (customer == null) {
-            throw new CustomerNotFoundException("Customer " + id + " not found");
-        }
-
-        return customer;
-    }
-
-    public boolean updateCustomer(Customer customer) {
-        Customer current = null;
-        try {
-            current = getCustomer(customer.getId());
-        } catch (Exception ex) {
-            return false;
-        }
-
-        current.setEmail(customer.getEmail());
-        current.setName(customer.getName());
-        current.setCreditCard(customer.getCreditCard());
-        return true;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
deleted file mode 100644
index 5eb825cb85..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
+++ /dev/null
@@ -1,32 +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 com.tuscanyscatours.emailgateway.impl;
-
-import com.tuscanyscatours.emailgateway.EmailGateway;
-import com.tuscanyscatours.emailgateway.EmailType;
-
-public class EmailGatewayImpl implements EmailGateway {
-
-    public String sendEmail(EmailType email) {
-        System.out.println("Sending mail to " + email.getTo());
-        return "SENT";
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
deleted file mode 100644
index a35f761dc7..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
+++ /dev/null
@@ -1,77 +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 com.tuscanyscatours.payment.impl;
-
-import com.tuscanyscatours.customer.Customer;
-import com.tuscanyscatours.customer.CustomerNotFoundException;
-import com.tuscanyscatours.customer.CustomerRegistry;
-import com.tuscanyscatours.emailgateway.EmailGateway;
-import com.tuscanyscatours.emailgateway.EmailType;
-import com.tuscanyscatours.payment.Payment;
-import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
-
-public class PaymentImpl implements Payment {
-
-    private CreditCardPayment creditCardPayment;
-    private CustomerRegistry customerRegistry;
-    private EmailGateway emailGateway;
-    private float transactionFee;
-
-    public void setCreditCardPayment(CreditCardPayment creditCardPayment) {
-        this.creditCardPayment = creditCardPayment;
-    }
-
-    public void setCustomerRegistry(CustomerRegistry customerRegistry) {
-        this.customerRegistry = customerRegistry;
-    }
-
-    public void setEmailGateway(EmailGateway emailGateway) {
-        this.emailGateway = emailGateway;
-    }
-
-    public void setTransactionFee(Float transactionFee) {
-        this.transactionFee = transactionFee;
-    }
-
-    public String makePaymentMember(String customerId, float amount) {
-        try {
-            Customer customer = customerRegistry.getCustomer(customerId);
-
-            amount += transactionFee;
-
-            String status = creditCardPayment.authorize(customer.getCreditCard(), amount);
-
-            com.tuscanyscatours.emailgateway.ObjectFactory emailFactory =
-                new com.tuscanyscatours.emailgateway.ObjectFactory();
-            EmailType email = emailFactory.createEmailType();
-            email.setTitle("Payment Received");
-            email.setTo(customerId);
-
-            emailGateway.sendEmail(email);
-
-            return status;
-        } catch (CustomerNotFoundException ex) {
-            return "Payment failed due to " + ex.getMessage();
-        } catch (Throwable t) {
-            return "Payment failed due to system error " + t.getMessage();
-        }
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 8224cd126f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,118 +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="CreditCardPayment" 
-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
-                       
-            <xsd:element name="authorize">
-	            <xsd:complexType>
-	                <xsd:sequence>
-	                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
-	                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-	                </xsd:sequence>
-	            </xsd:complexType>   
-            </xsd:element>         
-            
-            <xsd:element name="authorizeResponse">
-	            <xsd:complexType>
-	                <xsd:sequence>
-	                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-	                </xsd:sequence>
-	            </xsd:complexType>
-            </xsd:element>
-
-            <xsd:complexType name="CreditCardDetailsType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:simpleType name="CreditCardTypeType">
-                <xsd:restriction base="xsd:token">
-                    <xsd:enumeration value="Visa" />
-                    <xsd:enumeration value="MasterCard" />
-                    <xsd:enumeration value="Discover" />
-                    <xsd:enumeration value="Amex" />
-                </xsd:restriction>
-            </xsd:simpleType>
-            <xsd:complexType name="PayerType">
-                <xsd:sequence>
-                    <xsd:element name="Name" type="xsd:string" />
-                    <xsd:element name="Address" type="tns:AddressType" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:complexType name="AddressType">
-                <xsd:sequence>
-                    <xsd:element name="Street" type="xsd:string" />
-                    <xsd:element name="City" type="xsd:string" />
-                    <xsd:element name="State" type="xsd:string" />
-                    <xsd:element name="ZipCode" type="xsd:string" />
-                    <xsd:element name="HomePhone" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="AuthorizeRequest">
-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="AuthorizeResponse">
-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="CreditCardPayment">
-        <wsdl:operation name="authorize">
-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="authorize">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="CreditCardPaymentService">
-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
-            <soap:address location="http://localhost:8080/CreditCardPayment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">
-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>
-    </plnk:partnerLinkType>    
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/EmailGateway.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/EmailGateway.wsdl
deleted file mode 100644
index 9e9a6ea685..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/EmailGateway.wsdl
+++ /dev/null
@@ -1,89 +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="EmailGateway" 
-                  targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"
-                    xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/">
-                    
-            <xsd:element name="sendEmail" type="tns:SendEmailType"/>
-            <xsd:complexType name="SendEmailType">
-                <xsd:sequence>
-                    <xsd:element name="Email" type="tns:EmailType"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>
-            <xsd:complexType name="SendEmailResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-
-            <xsd:complexType name="EmailType">
-                <xsd:sequence>
-                    <xsd:element name="To" type="xsd:string"/>
-                    <xsd:element name="Title" type="xsd:string"/>
-                    <xsd:element name="Body" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="SendEmailRequest">
-        <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="SendEmailResponse">
-        <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="EmailGateway">
-        <wsdl:operation name="sendEmail">
-            <wsdl:input message="tns:SendEmailRequest"></wsdl:input>
-            <wsdl:output message="tns:SendEmailResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="sendEmail">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="EmailGatewayService">
-        <wsdl:port name="EmailGatewayPort" binding="tns:EmailGatwayBinding">
-            <soap:address location="http://localhost:8088/EmailGateway" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="EmailGatewayLinkType">
-        <plnk:role name="forward" portType="tns:EmailGateway"/>
-    </plnk:partnerLinkType>
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 41677f6601..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:payment" />
-    <export.java package="com.tuscanyscatours.payment"/>
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/Payment-context.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/Payment-context.xml
deleted file mode 100644
index bcb965924b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/Payment-context.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
-                           http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <bean id="Payment" class="com.tuscanyscatours.payment.impl.PaymentImpl">
-        <property name="creditCardPayment" ref="creditCardPaymentReference"/>
-        <property name="emailGateway" ref="emailGateway"/>
-        <property name="customerRegistry" ref="customerRegistry"/>
-        <property name="transactionFee" value="0.5f"/>
-    </bean>
-  
-</beans>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/Payment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/Payment.wsdl
deleted file mode 100644
index e2c4062f2e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/Payment.wsdl
+++ /dev/null
@@ -1,83 +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="Payment" 
-                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
-
-            <xsd:complexType name="MakePaymentMemberType">
-                <xsd:sequence>
-                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>                    
-            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
-      
-            <xsd:complexType name="MakePaymentMemberResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
-            
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="MakePaymentMemberRequest">
-        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="MakePaymentMemberResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="Payment">
-        <wsdl:operation name="makePaymentMember">
-            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="PaymentBinding" type="tns:Payment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePaymentMember">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PaymentService">
-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8080/Payment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="PaymentLinkType">
-       <plnk:role name="forward" portType="tns:Payment"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml
deleted file mode 100644
index 07092deba3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/definitions.xml
+++ /dev/null
@@ -1,35 +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.    
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- 			targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- 			xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
-    
-    <!-- Policy Sets -->   
-    <policySet name="BasicAuthenticationPolicySet"
-                   provides="authentication"
-                   appliesTo="sca:binding.ws">
-        <tuscany:basicAuthentication>
-          <tuscany:userName>myname</tuscany:userName>
-          <tuscany:password>mypassword</tuscany:password>
-        </tuscany:basicAuthentication>
-    </policySet>
-	
-</definitions>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
deleted file mode 100644
index 5ee7ef73b0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/main/resources/payment.composite
+++ /dev/null
@@ -1,45 +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"
-           targetNamespace="http://tuscanyscatours.com/"
-           name="payment">
-
-     <component name="Payment">
-        <implementation.spring location="Payment-context.xml"/>
-        <service name="Payment">
-            <binding.ws uri="http://localhost:8081/Payment"/>
-        </service>
-        <reference name="creditCardPaymentReference" >
-            <binding.ws uri="http://localhost:8082/CreditCardPayment" requires="authentication"/>
-        </reference>
-        <reference name="emailGateway" target="EmailGateway"/>
-         <reference name="customerRegistry" target="CustomerRegistry"/>
-        <property name="transactionFee">1.23</property>
-    </component>
-        
-    <component name="CustomerRegistry">
-        <implementation.java class="com.tuscanyscatours.customer.impl.CustomerRegistryImpl" />
-    </component>
-            
-    <component name="EmailGateway">
-        <implementation.java class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl" />
-    </component>    
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java
deleted file mode 100644
index 1c03ef1572..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/PaymentTestCase.java
+++ /dev/null
@@ -1,70 +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 scatours.payment;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.tuscanyscatours.payment.Payment;
-
-/**
- * 
- */
-public class PaymentTestCase {
-    private static Node paymentNode;
-    private static Node creditCardNode;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        creditCardNode =
-            NodeFactory.getInstance()
-                .createNode("creditcard.composite",
-                               new Contribution("creditcard", "../creditcard-payment-jaxb-policy/target/classes"));
-
-        creditCardNode.start();
-
-        paymentNode =
-            NodeFactory.getInstance()
-                .createNode(
-                               new Contribution("payment-spring-policy", "./target/classes"),
-                               new Contribution("payment-spring-policy-test", "./target/test-classes"));
-
-        paymentNode.start();
-    }
-
-    @Test
-    public void testPayment() {
-        Node client = (Node)paymentNode;
-        Payment payment = client.getService(Payment.class, "PaymentClient");
-        System.out.println("Result = " + payment.makePaymentMember("c-0", 100.00f));
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        paymentNode.stop();
-        creditCardNode.stop();
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
deleted file mode 100644
index 3fee35a1db..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ /dev/null
@@ -1,37 +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 scatours.payment.client.impl;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.payment.Payment;
-
-@Service(Payment.class)
-public class PaymentClientImpl implements Payment {
-    @Reference
-    protected Payment payment;
-
-    public String makePaymentMember(String customerId, float amount) {
-        // Delegate the external web service
-        return payment.makePaymentMember(customerId, amount);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 969a5286cc..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:paymentClient" />
-    <import.java package="com.tuscanyscatours.payment"/>
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite
deleted file mode 100644
index b442a46101..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-policy/src/test/resources/payment-client.composite
+++ /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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-           targetNamespace="http://tuscanyscatours.com/" 
-           name="paymentClient">
-           
-    <component name="PaymentClient">
-        <implementation.java class="scatours.payment.client.impl.PaymentClientImpl" />
-        <reference name="payment">
-            <binding.ws uri="http://localhost:8081/Payment" />
-        </reference>
-    </component>   
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/build.xml
deleted file mode 100644
index 6ad2ea55ad..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/build.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-contribution-payment-spring-scatag" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="EmailGateway.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/emailgateway/EmailGateway.class"/>

-            <param name="package" value="com.tuscanyscatours.emailgateway"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="Payment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment"/>

-        </antcall>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml
deleted file mode 100644
index 74aea4b05b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/pom.xml
+++ /dev/null
@@ -1,189 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-payment-spring-scatag</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Spring SCA Tag Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!--
-            https://issues.apache.org/jira/browse/TUSCANY-3069
-        -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-sca</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <executions>
-                    <execution>
-                        <id>payment</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>Payment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>payment.creditcard</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment.creditcard</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>scatours.emailgateway</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.emailgateway</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>EmailGateway.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/emailgateway.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
deleted file mode 100644
index 5eb825cb85..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
+++ /dev/null
@@ -1,32 +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 com.tuscanyscatours.emailgateway.impl;
-
-import com.tuscanyscatours.emailgateway.EmailGateway;
-import com.tuscanyscatours.emailgateway.EmailType;
-
-public class EmailGatewayImpl implements EmailGateway {
-
-    public String sendEmail(EmailType email) {
-        System.out.println("Sending mail to " + email.getTo());
-        return "SENT";
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
deleted file mode 100644
index 42d995aa88..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
+++ /dev/null
@@ -1,76 +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 com.tuscanyscatours.payment.impl;
-
-import com.tuscanyscatours.emailgateway.EmailGateway;
-import com.tuscanyscatours.emailgateway.EmailType;
-import com.tuscanyscatours.payment.Payment;
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
-import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;
-import com.tuscanyscatours.payment.creditcard.ObjectFactory;
-import com.tuscanyscatours.payment.creditcard.PayerType;
-
-//@Service(Payment.class)
-public class PaymentImpl implements Payment {
-
-    protected CreditCardPayment creditCardPayment;
-    protected EmailGateway emailGateway;
-    protected float transactionFee = 0;
-
-    //@Reference
-    public void setCreditCardPayment(CreditCardPayment creditCardPayment) {
-        this.creditCardPayment = creditCardPayment;
-    }
-
-    public void setEmailGateway(EmailGateway emailGateway) {
-        this.emailGateway = emailGateway;
-    }
-
-    //@Property
-    public void setTransactionFee(Float transactionFee) {
-        this.transactionFee = transactionFee;
-    }
-
-    public String makePaymentMember(String customerId, float amount) {
-
-        ObjectFactory objectFactory = new ObjectFactory();
-        CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();
-        ccDetails.setCreditCardType(CreditCardTypeType.fromValue("Visa"));
-        PayerType ccOwner = objectFactory.createPayerType();
-        ccOwner.setName(customerId);
-        ccDetails.setCardOwner(ccOwner);
-
-        amount += transactionFee;
-
-        String status = creditCardPayment.authorize(ccDetails, amount);
-
-        com.tuscanyscatours.emailgateway.ObjectFactory emailFactory =
-            new com.tuscanyscatours.emailgateway.ObjectFactory();
-        EmailType email = emailFactory.createEmailType();
-        email.setTitle("Payment Received");
-        email.setTo(customerId);
-
-        emailGateway.sendEmail(email);
-
-        return status;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 8224cd126f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,118 +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="CreditCardPayment" 
-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
-                       
-            <xsd:element name="authorize">
-	            <xsd:complexType>
-	                <xsd:sequence>
-	                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
-	                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-	                </xsd:sequence>
-	            </xsd:complexType>   
-            </xsd:element>         
-            
-            <xsd:element name="authorizeResponse">
-	            <xsd:complexType>
-	                <xsd:sequence>
-	                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-	                </xsd:sequence>
-	            </xsd:complexType>
-            </xsd:element>
-
-            <xsd:complexType name="CreditCardDetailsType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:simpleType name="CreditCardTypeType">
-                <xsd:restriction base="xsd:token">
-                    <xsd:enumeration value="Visa" />
-                    <xsd:enumeration value="MasterCard" />
-                    <xsd:enumeration value="Discover" />
-                    <xsd:enumeration value="Amex" />
-                </xsd:restriction>
-            </xsd:simpleType>
-            <xsd:complexType name="PayerType">
-                <xsd:sequence>
-                    <xsd:element name="Name" type="xsd:string" />
-                    <xsd:element name="Address" type="tns:AddressType" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:complexType name="AddressType">
-                <xsd:sequence>
-                    <xsd:element name="Street" type="xsd:string" />
-                    <xsd:element name="City" type="xsd:string" />
-                    <xsd:element name="State" type="xsd:string" />
-                    <xsd:element name="ZipCode" type="xsd:string" />
-                    <xsd:element name="HomePhone" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="AuthorizeRequest">
-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="AuthorizeResponse">
-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="CreditCardPayment">
-        <wsdl:operation name="authorize">
-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="authorize">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="CreditCardPaymentService">
-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
-            <soap:address location="http://localhost:8080/CreditCardPayment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">
-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>
-    </plnk:partnerLinkType>    
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/EmailGateway.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/EmailGateway.wsdl
deleted file mode 100644
index 44867f794c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/EmailGateway.wsdl
+++ /dev/null
@@ -1,89 +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="EmailGateway" 

-                  targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 

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

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

-                    targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"

-                    xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/">

-                    

-            <xsd:element name="sendEmail" type="tns:SendEmailType"/>

-            <xsd:complexType name="SendEmailType">

-                <xsd:sequence>

-                    <xsd:element name="Email" type="tns:EmailType"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>

-            <xsd:complexType name="SendEmailResponseType">

-                <xsd:sequence>

-                    <xsd:element name="Status" type="xsd:string"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="EmailType">

-                <xsd:sequence>

-                    <xsd:element name="To" type="xsd:string"/>

-                    <xsd:element name="Title" type="xsd:string"/>

-                    <xsd:element name="Body" type="xsd:string"/>

-                </xsd:sequence>

-            </xsd:complexType>

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="SendEmailRequest">

-        <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="SendEmailResponse">

-        <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="EmailGateway">

-        <wsdl:operation name="sendEmail">

-            <wsdl:input message="tns:SendEmailRequest"></wsdl:input>

-            <wsdl:output message="tns:SendEmailResponse"></wsdl:output>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">

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

-        <wsdl:operation name="sendEmail">

-            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="EmailGatewayService">

-        <wsdl:port name="EmailGatewayPort" binding="tns:EmailGatwayBinding">

-            <soap:address location="http://localhost:8088/EmailGateway" />

-        </wsdl:port>

-    </wsdl:service>

-    

-    <plnk:partnerLinkType name="EmailGatewayLinkType">

-        <plnk:role name="forward" portType="tns:EmailGateway"/>

-    </plnk:partnerLinkType>

-</wsdl:definitions>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 976e2fc0b6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:scatours="http://tuscanyscatours.com/">

-    <deployable composite="scatours:payment" />

-    <export.java package="com.tuscanyscatours.payment"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
deleted file mode 100644
index d2f757c8ca..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment-context.xml
+++ /dev/null
@@ -1,44 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-                           http://www.springframework.org/schema/sca http://docs.oasis-open.org/ns/opencsa/sca/200912/spring-sca.xsd">
-
-    <sca:service name="Payment"
-                 type="com.tuscanyscatours.payment.Payment" 
-                 target="Payment"/>
-
-    <bean id="Payment" class="com.tuscanyscatours.payment.impl.PaymentImpl">
-        <property name="creditCardPayment" ref="creditCardPayment"/>
-        <property name="emailGateway" ref="EmailGateway"/>
-        <property name="transactionFee" ref="transactionFee"/>
-    </bean>
-
-    <bean id="EmailGateway" class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl">
-    </bean>
-    
-    <sca:reference name="creditCardPayment" 
-                   type="com.tuscanyscatours.payment.creditcard.CreditCardPayment"/>  
-                   
-    <sca:property name="transactionFee"
-                  type="java.lang.Float"/>    
-</beans>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment.wsdl
deleted file mode 100644
index e2c4062f2e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/Payment.wsdl
+++ /dev/null
@@ -1,83 +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="Payment" 
-                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
-
-            <xsd:complexType name="MakePaymentMemberType">
-                <xsd:sequence>
-                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>                    
-            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
-      
-            <xsd:complexType name="MakePaymentMemberResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
-            
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="MakePaymentMemberRequest">
-        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="MakePaymentMemberResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="Payment">
-        <wsdl:operation name="makePaymentMember">
-            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="PaymentBinding" type="tns:Payment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePaymentMember">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PaymentService">
-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8080/Payment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="PaymentLinkType">
-       <plnk:role name="forward" portType="tns:Payment"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
deleted file mode 100644
index 7b923e397e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/main/resources/payment.composite
+++ /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.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://tuscanyscatours.com/"
-           name="payment">
-
-    <component name="Payment">
-        <implementation.spring location="Payment-context.xml"/>
-        <service name="Payment">
-            <binding.ws uri="http://localhost:8081/Payment"/>
-        </service>
-        <reference name="creditCardPayment">
-            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
-        </reference>
-        <property name="transactionFee">1.23</property>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
deleted file mode 100644
index f2a4ecbcb6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/PaymentTestCase.java
+++ /dev/null
@@ -1,71 +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 scatours.payment;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.tuscanyscatours.payment.Payment;
-
-/**
- * 
- */
-public class PaymentTestCase {
-    private static Node paymentNode;
-    private static Node creditCardNode;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        creditCardNode =
-            NodeFactory.getInstance()
-                .createNode("creditcard.composite",
-                               new Contribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
-
-        creditCardNode.start();
-
-        paymentNode =
-            NodeFactory.getInstance().createNode(
-                                                       new Contribution("payment-spring-annotation",
-                                                                           "./target/classes"),
-                                                       new Contribution("payment-spring-annotation-test",
-                                                                           "./target/test-classes"));
-
-        paymentNode.start();
-    }
-
-    @Test
-    public void testPayment() {
-        Node client = (Node)paymentNode;
-        Payment payment = client.getService(Payment.class, "PaymentClient");
-        System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        paymentNode.stop();
-        creditCardNode.stop();
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
deleted file mode 100644
index 3fee35a1db..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ /dev/null
@@ -1,37 +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 scatours.payment.client.impl;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.payment.Payment;
-
-@Service(Payment.class)
-public class PaymentClientImpl implements Payment {
-    @Reference
-    protected Payment payment;
-
-    public String makePaymentMember(String customerId, float amount) {
-        // Delegate the external web service
-        return payment.makePaymentMember(customerId, amount);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d4b14f7c88..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:scatours="http://tuscanyscatours.com/">

-    <deployable composite="scatours:paymentClient" />

-    <import.java package="com.tuscanyscatours.payment"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
deleted file mode 100644
index b442a46101..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring-scatag/src/test/resources/payment-client.composite
+++ /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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-           targetNamespace="http://tuscanyscatours.com/" 
-           name="paymentClient">
-           
-    <component name="PaymentClient">
-        <implementation.java class="scatours.payment.client.impl.PaymentClientImpl" />
-        <reference name="payment">
-            <binding.ws uri="http://localhost:8081/Payment" />
-        </reference>
-    </component>   
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/build.xml
deleted file mode 100644
index 93c9dfc660..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/build.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-contribution-payment-spring" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="CreditCardPayment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/creditcard/CreditCardPayment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment.creditcard"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="EmailGateway.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/emailgateway/EmailGateway.class"/>

-            <param name="package" value="com.tuscanyscatours.emailgateway"/>

-        </antcall>

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="Payment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment"/>

-        </antcall>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml
deleted file mode 100644
index 9d4b80510e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/pom.xml
+++ /dev/null
@@ -1,189 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-payment-spring</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Spring Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <!--
-            https://issues.apache.org/jira/browse/TUSCANY-3069
-        -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-sca</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <executions>
-                    <execution>
-                        <id>payment</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>Payment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/payment.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>payment.creditcard</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment.creditcard</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>CreditCardPayment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/creditcard.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>scatours.emailgateway</id>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.emailgateway</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>EmailGateway.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <staleFile>${project.build.directory}/jaxws-source/stale/emailgateway.stale</staleFile>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/Customer.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/Customer.java
deleted file mode 100644
index 3b72f81b33..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/Customer.java
+++ /dev/null
@@ -1,70 +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 com.tuscanyscatours.customer;
-
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-
-/**
- * Customer data
- */
-public class Customer {
-    private String id;
-    private String email;
-    private String name;
-
-    private CreditCardDetailsType creditCard;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public CreditCardDetailsType getCreditCard() {
-        return creditCard;
-    }
-
-    public void setCreditCard(CreditCardDetailsType creditCard) {
-        this.creditCard = creditCard;
-    }
-
-    public String toString() {
-        return "id: " + id + " name: " + name + " e-mail: " + email;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
deleted file mode 100644
index b08f76e0fa..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
+++ /dev/null
@@ -1,57 +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 com.tuscanyscatours.customer;
-
-public class CustomerNotFoundException extends Exception {
-    private static final long serialVersionUID = -129752837478357452L;
-
-    /**
-     * 
-     */
-    public CustomerNotFoundException() {
-
-    }
-
-    /**
-     * @param message
-     */
-    public CustomerNotFoundException(String message) {
-        super(message);
-
-    }
-
-    /**
-     * @param cause
-     */
-    public CustomerNotFoundException(Throwable cause) {
-        super(cause);
-
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public CustomerNotFoundException(String message, Throwable cause) {
-        super(message, cause);
-
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
deleted file mode 100644
index 706167d567..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
+++ /dev/null
@@ -1,39 +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 com.tuscanyscatours.customer;
-
-import java.util.Collection;
-
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-
-/**
- * Customer registry interface
- */
-public interface CustomerRegistry {
-    Customer createCustomer(String name, String email, CreditCardDetailsType creditCard);
-
-    boolean updateCustomer(Customer customer);
-
-    Customer getCustomer(String id) throws CustomerNotFoundException;
-
-    Collection<Customer> getAllCustomers();
-
-    boolean deleteCustomer(String id);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
deleted file mode 100644
index d0b1736e98..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
+++ /dev/null
@@ -1,115 +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 com.tuscanyscatours.customer.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Requires;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.customer.Customer;
-import com.tuscanyscatours.customer.CustomerNotFoundException;
-import com.tuscanyscatours.customer.CustomerRegistry;
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
-import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;
-import com.tuscanyscatours.payment.creditcard.ObjectFactory;
-import com.tuscanyscatours.payment.creditcard.PayerType;
-
-/**
- * An in-memory customer registry implementation
- */
-@Service(CustomerRegistry.class)
-@Scope("COMPOSITE")
-@EagerInit
-@Requires("{http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction.global")
-public class CustomerRegistryImpl implements CustomerRegistry {
-    private volatile static int idGenerator = 0;
-    private Map<String, Customer> customers = new HashMap<String, Customer>();
-
-    @Init
-    public void init() {
-        // Load the customers
-        ObjectFactory factory = new ObjectFactory();
-        CreditCardDetailsType cc = factory.createCreditCardDetailsType();
-        PayerType john = factory.createPayerType();
-        john.setName("John Smith");
-        cc.setCardOwner(john);
-        cc.setCreditCardNumber("1111-2222-3333-4444");
-        cc.setCreditCardType(CreditCardTypeType.VISA);
-        cc.setCVV2("1234");
-        cc.setExpMonth(1);
-        cc.setExpYear(2012);
-        createCustomer("John Smith", "john@xyz.com", cc);
-    }
-
-    @Destroy
-    public void destroy() {
-        // Save the customers
-    }
-
-    public Customer createCustomer(String name, String email, CreditCardDetailsType creditCard) {
-        Customer customer = new Customer();
-        customer.setId("c-" + idGenerator++);
-        customer.setName(name);
-        customer.setEmail(email);
-        customer.setCreditCard(creditCard);
-        customers.put(customer.getId(), customer);
-        return customer;
-    }
-
-    public boolean deleteCustomer(String id) {
-        return customers.remove(id) != null;
-    }
-
-    public Collection<Customer> getAllCustomers() {
-        return customers.values();
-    }
-
-    public Customer getCustomer(String id) throws CustomerNotFoundException {
-        Customer customer = customers.get(id);
-
-        if (customer == null) {
-            throw new CustomerNotFoundException("Customer " + id + " not found");
-        }
-
-        return customer;
-    }
-
-    public boolean updateCustomer(Customer customer) {
-        Customer current = null;
-        try {
-            current = getCustomer(customer.getId());
-        } catch (Exception ex) {
-            return false;
-        }
-
-        current.setEmail(customer.getEmail());
-        current.setName(customer.getName());
-        current.setCreditCard(customer.getCreditCard());
-        return true;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
deleted file mode 100644
index 5eb825cb85..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/emailgateway/impl/EmailGatewayImpl.java
+++ /dev/null
@@ -1,32 +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 com.tuscanyscatours.emailgateway.impl;
-
-import com.tuscanyscatours.emailgateway.EmailGateway;
-import com.tuscanyscatours.emailgateway.EmailType;
-
-public class EmailGatewayImpl implements EmailGateway {
-
-    public String sendEmail(EmailType email) {
-        System.out.println("Sending mail to " + email.getTo());
-        return "SENT";
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
deleted file mode 100644
index a35f761dc7..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
+++ /dev/null
@@ -1,77 +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 com.tuscanyscatours.payment.impl;
-
-import com.tuscanyscatours.customer.Customer;
-import com.tuscanyscatours.customer.CustomerNotFoundException;
-import com.tuscanyscatours.customer.CustomerRegistry;
-import com.tuscanyscatours.emailgateway.EmailGateway;
-import com.tuscanyscatours.emailgateway.EmailType;
-import com.tuscanyscatours.payment.Payment;
-import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
-
-public class PaymentImpl implements Payment {
-
-    private CreditCardPayment creditCardPayment;
-    private CustomerRegistry customerRegistry;
-    private EmailGateway emailGateway;
-    private float transactionFee;
-
-    public void setCreditCardPayment(CreditCardPayment creditCardPayment) {
-        this.creditCardPayment = creditCardPayment;
-    }
-
-    public void setCustomerRegistry(CustomerRegistry customerRegistry) {
-        this.customerRegistry = customerRegistry;
-    }
-
-    public void setEmailGateway(EmailGateway emailGateway) {
-        this.emailGateway = emailGateway;
-    }
-
-    public void setTransactionFee(Float transactionFee) {
-        this.transactionFee = transactionFee;
-    }
-
-    public String makePaymentMember(String customerId, float amount) {
-        try {
-            Customer customer = customerRegistry.getCustomer(customerId);
-
-            amount += transactionFee;
-
-            String status = creditCardPayment.authorize(customer.getCreditCard(), amount);
-
-            com.tuscanyscatours.emailgateway.ObjectFactory emailFactory =
-                new com.tuscanyscatours.emailgateway.ObjectFactory();
-            EmailType email = emailFactory.createEmailType();
-            email.setTitle("Payment Received");
-            email.setTo(customerId);
-
-            emailGateway.sendEmail(email);
-
-            return status;
-        } catch (CustomerNotFoundException ex) {
-            return "Payment failed due to " + ex.getMessage();
-        } catch (Throwable t) {
-            return "Payment failed due to system error " + t.getMessage();
-        }
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/CreditCardPayment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/CreditCardPayment.wsdl
deleted file mode 100644
index 8224cd126f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/CreditCardPayment.wsdl
+++ /dev/null
@@ -1,118 +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="CreditCardPayment" 
-                  targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/CreditCardPayment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/CreditCardPayment/">
-                       
-            <xsd:element name="authorize">
-	            <xsd:complexType>
-	                <xsd:sequence>
-	                    <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element>
-	                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-	                </xsd:sequence>
-	            </xsd:complexType>   
-            </xsd:element>         
-            
-            <xsd:element name="authorizeResponse">
-	            <xsd:complexType>
-	                <xsd:sequence>
-	                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-	                </xsd:sequence>
-	            </xsd:complexType>
-            </xsd:element>
-
-            <xsd:complexType name="CreditCardDetailsType">
-                <xsd:sequence>
-                    <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" />
-                    <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" />
-                    <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" />
-                    <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" />
-                    <xsd:element name="CVV2" type="xsd:string" minOccurs="0" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:simpleType name="CreditCardTypeType">
-                <xsd:restriction base="xsd:token">
-                    <xsd:enumeration value="Visa" />
-                    <xsd:enumeration value="MasterCard" />
-                    <xsd:enumeration value="Discover" />
-                    <xsd:enumeration value="Amex" />
-                </xsd:restriction>
-            </xsd:simpleType>
-            <xsd:complexType name="PayerType">
-                <xsd:sequence>
-                    <xsd:element name="Name" type="xsd:string" />
-                    <xsd:element name="Address" type="tns:AddressType" />
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:complexType name="AddressType">
-                <xsd:sequence>
-                    <xsd:element name="Street" type="xsd:string" />
-                    <xsd:element name="City" type="xsd:string" />
-                    <xsd:element name="State" type="xsd:string" />
-                    <xsd:element name="ZipCode" type="xsd:string" />
-                    <xsd:element name="HomePhone" type="xsd:string" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="AuthorizeRequest">
-        <wsdl:part name="parameters" element="tns:authorize"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="AuthorizeResponse">
-        <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="CreditCardPayment">
-        <wsdl:operation name="authorize">
-            <wsdl:input message="tns:AuthorizeRequest"></wsdl:input>
-            <wsdl:output message="tns:AuthorizeResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="authorize">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/CreditCardPayment/authorize" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="CreditCardPaymentService">
-        <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding">
-            <soap:address location="http://localhost:8080/CreditCardPayment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-    <plnk:partnerLinkType name="CreditCardPaymentLinkType">
-        <plnk:role name="forward" portType="tns:CreditCardPayment"/>
-    </plnk:partnerLinkType>    
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/EmailGateway.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/EmailGateway.wsdl
deleted file mode 100644
index 44867f794c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/EmailGateway.wsdl
+++ /dev/null
@@ -1,89 +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="EmailGateway" 

-                  targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/" 

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

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

-                    targetNamespace="http://www.tuscanyscatours.com/EmailGateway/"

-                    xmlns:tns="http://www.tuscanyscatours.com/EmailGateway/">

-                    

-            <xsd:element name="sendEmail" type="tns:SendEmailType"/>

-            <xsd:complexType name="SendEmailType">

-                <xsd:sequence>

-                    <xsd:element name="Email" type="tns:EmailType"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:element name="sendEmailResponse" type="tns:SendEmailResponseType"/>

-            <xsd:complexType name="SendEmailResponseType">

-                <xsd:sequence>

-                    <xsd:element name="Status" type="xsd:string"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-

-            <xsd:complexType name="EmailType">

-                <xsd:sequence>

-                    <xsd:element name="To" type="xsd:string"/>

-                    <xsd:element name="Title" type="xsd:string"/>

-                    <xsd:element name="Body" type="xsd:string"/>

-                </xsd:sequence>

-            </xsd:complexType>

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="SendEmailRequest">

-        <wsdl:part name="parameters" element="tns:sendEmail"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="SendEmailResponse">

-        <wsdl:part name="parameters" element="tns:sendEmailResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="EmailGateway">

-        <wsdl:operation name="sendEmail">

-            <wsdl:input message="tns:SendEmailRequest"></wsdl:input>

-            <wsdl:output message="tns:SendEmailResponse"></wsdl:output>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="EmailGatwayBinding" type="tns:EmailGateway">

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

-        <wsdl:operation name="sendEmail">

-            <soap:operation soapAction="http://www.tuscanyscatours.com/EmailGateway/sendEmail" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="EmailGatewayService">

-        <wsdl:port name="EmailGatewayPort" binding="tns:EmailGatwayBinding">

-            <soap:address location="http://localhost:8088/EmailGateway" />

-        </wsdl:port>

-    </wsdl:service>

-    

-    <plnk:partnerLinkType name="EmailGatewayLinkType">

-        <plnk:role name="forward" portType="tns:EmailGateway"/>

-    </plnk:partnerLinkType>

-</wsdl:definitions>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 976e2fc0b6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:scatours="http://tuscanyscatours.com/">

-    <deployable composite="scatours:payment" />

-    <export.java package="com.tuscanyscatours.payment"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/Payment-context.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/Payment-context.xml
deleted file mode 100644
index f27280bf2f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/Payment-context.xml
+++ /dev/null
@@ -1,39 +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.    
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:sca="http://www.springframework.org/schema/sca"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
-                           http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <bean id="Payment" class="com.tuscanyscatours.payment.impl.PaymentImpl">
-        <property name="creditCardPayment" ref="creditCardPaymentReference"/>
-        <property name="emailGateway" ref="EmailGateway"/>
-        <property name="customerRegistry" ref="CustomerRegistry"/>
-        <property name="transactionFee" value="0.5f"/>
-    </bean>
-
-    <bean id="CustomerRegistry" class="com.tuscanyscatours.customer.impl.CustomerRegistryImpl">
-    </bean>
-    
-    <bean id="EmailGateway" class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl">
-    </bean>    
-  
-</beans>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/Payment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/Payment.wsdl
deleted file mode 100644
index e2c4062f2e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/Payment.wsdl
+++ /dev/null
@@ -1,83 +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="Payment" 
-                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
-
-            <xsd:complexType name="MakePaymentMemberType">
-                <xsd:sequence>
-                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>                    
-            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
-      
-            <xsd:complexType name="MakePaymentMemberResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
-            
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="MakePaymentMemberRequest">
-        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="MakePaymentMemberResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="Payment">
-        <wsdl:operation name="makePaymentMember">
-            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="PaymentBinding" type="tns:Payment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePaymentMember">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PaymentService">
-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8080/Payment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="PaymentLinkType">
-       <plnk:role name="forward" portType="tns:Payment"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite
deleted file mode 100644
index 48ef93ba2e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/main/resources/payment.composite
+++ /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.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://tuscanyscatours.com/"
-           name="payment">
-
-     <component name="Payment">
-        <implementation.spring location="Payment-context.xml"/>
-        <service name="Payment">
-            <binding.ws uri="http://localhost:8081/Payment"/>
-        </service>
-        <reference name="creditCardPaymentReference">
-            <binding.ws uri="http://localhost:8082/CreditCardPayment"/>
-        </reference>
-        <property name="transactionFee">1.23</property>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java
deleted file mode 100644
index 09420600fb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java
+++ /dev/null
@@ -1,70 +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 scatours.payment;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.tuscanyscatours.payment.Payment;
-
-/**
- * 
- */
-public class PaymentTestCase {
-    private static Node paymentNode;
-    private static Node creditCardNode;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        creditCardNode =
-            NodeFactory.getInstance()
-                .createNode("creditcard.composite",
-                               new Contribution("creditcard", "../creditcard-payment-jaxb/target/classes"));
-
-        creditCardNode.start();
-
-        paymentNode =
-            NodeFactory.getInstance().createNode(
-                                                       new Contribution("payment-spring", "./target/classes"),
-                                                       new Contribution("payment-spring-test",
-                                                                           "./target/test-classes"));
-
-        paymentNode.start();
-    }
-
-    @Test
-    public void testPayment() {
-        Node client = (Node)paymentNode;
-        Payment payment = client.getService(Payment.class, "PaymentClient");
-        System.out.println("Result = " + payment.makePaymentMember("c-0", 100.00f));
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        paymentNode.stop();
-        creditCardNode.stop();
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
deleted file mode 100644
index 3fee35a1db..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/java/scatours/payment/client/impl/PaymentClientImpl.java
+++ /dev/null
@@ -1,37 +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 scatours.payment.client.impl;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.payment.Payment;
-
-@Service(Payment.class)
-public class PaymentClientImpl implements Payment {
-    @Reference
-    protected Payment payment;
-
-    public String makePaymentMember(String customerId, float amount) {
-        // Delegate the external web service
-        return payment.makePaymentMember(customerId, amount);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d4b14f7c88..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:scatours="http://tuscanyscatours.com/">

-    <deployable composite="scatours:paymentClient" />

-    <import.java package="com.tuscanyscatours.payment"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/payment-client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/payment-client.composite
deleted file mode 100644
index b442a46101..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/payment-spring/src/test/resources/payment-client.composite
+++ /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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-           targetNamespace="http://tuscanyscatours.com/" 
-           name="paymentClient">
-           
-    <component name="PaymentClient">
-        <implementation.java class="scatours.payment.client.impl.PaymentClientImpl" />
-        <reference name="payment">
-            <binding.ws uri="http://localhost:8081/Payment" />
-        </reference>
-    </component>   
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/build.xml
deleted file mode 100644
index a621364d9d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/build.xml
+++ /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.
--->
-
-<project name="scatours-contribution-policy-client" default="compile">
-    <import file="../../antdefs.xml"/>
-
-    <target name="wsdljava">
-        <antcall target="wsimport">
-            <param name="wsdlfile" value="Payment.wsdl"/>
-            <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>
-            <param name="package" value="com.tuscanyscatours.payment"/>
-        </antcall>
-    </target>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml
deleted file mode 100644
index 3adfca89f4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/maven-eclipse.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<project default="copy-resources">
-  <target name="init"/>
-  <target name="copy-resources" depends="init">
-    <copy todir="target/classes/META-INF" filtering="true">
-      <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/>
-    </copy>
-  </target>
-</project>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
deleted file mode 100644
index 303122f92d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/pom.xml
+++ /dev/null
@@ -1,100 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-contribution-policy-client</artifactId>
-    <name>Apache Tuscany SCA Tours Policy Client Contribution</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>add-source</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/jaxws-source</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxws-maven-plugin</artifactId>
-                <version>1.12</version>
-                <executions>
-                    <execution>
-                        <id>payment</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>wsimport</goal>
-                        </goals>
-                        <configuration>
-                            <packageName>com.tuscanyscatours.payment</packageName>
-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>
-                            <wsdlFiles>
-                                <wsdlFile>Payment.wsdl</wsdlFile>
-                            </wsdlFiles>
-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>
-                            <verbose>false</verbose>
-                            <xnocompile>true</xnocompile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>       
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.java
deleted file mode 100644
index 2f69f4d6a0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/java/scatours/client/TestClient.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 scatours.client;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.payment.Payment;
-
-@Service(Runnable.class)
-public class TestClient {
-    @Reference
-    protected Payment payment;
-
-    public TestClient() {
-    }
-
-    public void run() {
-        System.out.println("TestClient - Successful Payment - Status = " + payment.makePaymentMember("c-0", 100.00f));
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 583bda3361..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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:client="http://client.scatours/">
-    <deployable composite="client:Client" />
-    <import.java package="payment" />
-</contribution>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/Payment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/Payment.wsdl
deleted file mode 100644
index 2519d7642e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/Payment.wsdl
+++ /dev/null
@@ -1,83 +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="Payment" 
-                  targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 
-                  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>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    targetNamespace="http://www.tuscanyscatours.com/Payment/"
-                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">
-
-            <xsd:complexType name="MakePaymentMemberType">
-                <xsd:sequence>
-                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>
-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>                    
-            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>
-      
-            <xsd:complexType name="MakePaymentMemberResponseType">
-                <xsd:sequence>
-                    <xsd:element name="Status" type="xsd:string"></xsd:element>
-                </xsd:sequence>
-            </xsd:complexType>
-            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>
-            
-        </xsd:schema>
-    </wsdl:types>
-    <wsdl:message name="MakePaymentMemberRequest">
-        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>
-    </wsdl:message>
-    <wsdl:message name="MakePaymentMemberResponse">
-        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>
-    </wsdl:message>
-    <wsdl:portType name="Payment">
-        <wsdl:operation name="makePaymentMember">
-            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>
-            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="PaymentBinding" type="tns:Payment">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-        <wsdl:operation name="makePaymentMember">
-            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />
-            <wsdl:input>
-                <soap:body use="literal" />
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal" />
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="PaymentService">
-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">
-            <soap:address location="http://localhost:8083/Payment" />
-        </wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="PaymentLinkType">
-       <plnk:role name="forward" portType="tns:Payment"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
deleted file mode 100644
index 6971c8d423..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/policy-client/src/main/resources/client.composite
+++ /dev/null
@@ -1,28 +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"
-    targetNamespace="http://client.scatours/"
-    name="Client">
-
-    <component name="TestClient">
-        <implementation.java class="scatours.client.TestClient" />
-        <reference name="payment" target="Payment/Payment" />
-     </component>
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/pom.xml
deleted file mode 100644
index a08a3f06e0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/pom.xml
+++ /dev/null
@@ -1,99 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contributions</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Tours Contributions</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>blog-feed</module>

-                <module>buildingblocks</module>

-                <module>buildingblocks-client</module>

-                <module>calendar</module>

-                <module>car</module>

-                <module>common</module>

-                <module>creditcard-payment-jaxb</module>

-                <module>creditcard-payment-jaxb-policy</module>

-                <module>creditcard-payment-sdo</module>

-                <module>creditcard-payment-webapp</module>

-                <module>currency</module>

-                <module>currency-corba</module>

-                <module>currency-jms</module>

-                <module>currency-jsp</module>

-                <module>currency-rmi</module>

-                <module>currency-servlet</module>

-                <module>currency-ws</module>

-                <module>databinding-client</module>

-                <module>emailgateway</module>

-                <module>feed-logger</module>

-                <module>flight</module>

-                <module>fullapp-ui</module>

-                <module>fullapp-coordination</module>

-                <module>fullapp-currency</module>

-                <module>fullapp-packagedtrip</module>

-                <module>fullapp-bespoketrip</module>

-                <module>fullapp-shoppingcart</module>

-                <module>help-pages</module>

-                <module>hotel</module>

-                <module>interaction-client</module>

-                <module>interaction-service-remote</module>

-                <module>introducing-client</module>

-                <module>introducing-tours</module>

-                <module>introducing-trips</module>

-                <module>notification</module>

-                <module>notification-ws</module>

-                <module>notification-corba</module>

-                <module>notification-ejb</module>

-                <module>notification-jms</module>

-                <module>notification-rmi</module>

-                <module>shoppingcart</module>   

-                <module>travelcatalog</module>         

-                <module>tripbooking</module>

-                <module>trip</module>

-                <module>scatours</module>

-                <module>payment-java</module>

-                <module>payment-java-policy</module>

-                <module>payment-spring</module>

-                <module>payment-spring-policy</module>

-                <module>payment-spring-scatag</module>

-                <module>payment-bpel-process</module>

-                <module>payment-bpel</module>

-                <module>payment-groovy</module>

-                <module>policy-client</module>

-            </modules>

-        </profile>

-

-    </profiles>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/build.xml
deleted file mode 100644
index bdb8f8ecc4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/build.xml
+++ /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.

--->

-

-<project name="scatours-contribution-scatours" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../common/target/scatours-contribution-common.jar"/>

-        <pathelement path="../shoppingcart/target/scatours-contribution-shoppingcart.jar"/>

-        <pathelement path="../travelcatalog/target/scatours-contribution-travelcatalog.jar"/>

-        <pathelement path="../tripbooking/target/scatours-contribution-tripbooking.jar"/>

-    </path>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml
deleted file mode 100644
index 85388dde97..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/pom.xml
+++ /dev/null
@@ -1,80 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-scatours</artifactId>

-    <name>Apache Tuscany SCA Tours SCATours Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-data-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-common</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-travelcatalog</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-tripbooking</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-shoppingcart</artifactId>

-            <version>${pom.version}</version>

-        </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/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java
deleted file mode 100644
index c3514d6910..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursBooking.java
+++ /dev/null
@@ -1,31 +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 com.tuscanyscatours;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-import com.tuscanyscatours.common.TripItem;

-

-/**

- * The SCA Tours trip booking service interface

- */

-@Remotable

-public interface SCAToursBooking {

-    String bookTrip(String cartId, TripItem tripId);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java
deleted file mode 100644
index 720c739aeb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursCart.java
+++ /dev/null
@@ -1,35 +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 com.tuscanyscatours;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-import com.tuscanyscatours.common.TripItem;

-

-/**

- * The ShoppingCart service interface

- */

-@Remotable

-public interface SCAToursCart {

-    String newCart();

-

-    TripItem[] getTrips(String cartId);

-

-    void checkout(String cartId);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java
deleted file mode 100644
index 9551ab7e2c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/SCAToursSearch.java
+++ /dev/null
@@ -1,32 +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 com.tuscanyscatours;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-import com.tuscanyscatours.common.TripItem;

-import com.tuscanyscatours.common.TripLeg;

-

-/**

- * The Search service interface

- */

-@Remotable

-public interface SCAToursSearch {

-    TripItem[] search(TripLeg tripLeg);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
deleted file mode 100644
index 9e664a874b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/java/com/tuscanyscatours/impl/SCAToursImpl.java
+++ /dev/null
@@ -1,84 +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 com.tuscanyscatours.impl;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.SCAToursBooking;

-import com.tuscanyscatours.SCAToursCart;

-import com.tuscanyscatours.SCAToursSearch;

-import com.tuscanyscatours.common.TripItem;

-import com.tuscanyscatours.common.TripLeg;

-import com.tuscanyscatours.shoppingcart.CartCheckout;

-import com.tuscanyscatours.shoppingcart.CartInitialize;

-import com.tuscanyscatours.travelcatalog.TravelCatalogSearch;

-import com.tuscanyscatours.tripbooking.TripBooking;

-

-/**

- * An implementation of the SCA tours component. it's just a pass through and allows

- * the outward facing bindings to be changed without changing the individual contributions

- */

-@Scope("COMPOSITE")

-@Service({SCAToursSearch.class, SCAToursBooking.class, SCAToursCart.class})

-public class SCAToursImpl implements SCAToursSearch, SCAToursBooking, SCAToursCart {

-

-    @Reference

-    protected TravelCatalogSearch travelCatalogSearch;

-

-    @Reference

-    protected TripBooking tripBooking;

-

-    @Reference

-    protected CartInitialize cartInitialize;

-

-    @Reference

-    protected CartCheckout cartCheckout;

-

-    // SCAToursSearch methods

-

-    public TripItem[] search(TripLeg tripLeg) {

-        return travelCatalogSearch.search(tripLeg);

-    }

-

-    // SCAToursBooking methods

-

-    public String bookTrip(String cartId, TripItem trip) {

-        TripItem bookedTrip = tripBooking.bookTrip(cartId, trip);

-        return bookedTrip.getBookingCode();

-    }

-

-    // SCAToursCart methods

-

-    public String newCart() {

-        String cartId = cartInitialize.newCart();

-        return cartId;

-    }

-

-    public TripItem[] getTrips(String cartId) {

-        return cartInitialize.getTrips(cartId);

-    }

-

-    public void checkout(String cartId) {

-        // need to get the user id from the context here but

-        // just make one up for the time being

-        cartCheckout.checkout(cartId, "c-0");

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index e16cf2c94f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/scatours/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +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">

-    <import.java package="com.tuscanyscatours.common" />

-    <import.java package="com.tuscanyscatours.travelcatalog" />

-    <import.java package="com.tuscanyscatours.tripbooking" />

-    <import.java package="com.tuscanyscatours.shoppingcart" />

-    <export.java package="com.tuscanyscatours" />

-    <export.java package="com.tuscanyscatours.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/build.xml
deleted file mode 100644
index 1976d2b5ed..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/build.xml
+++ /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.

--->

-

-<project name="scatours-contribution-shoppingcart" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../common/target/scatours-contribution-common.jar"/>

-    </path>

-

-    <target name="wsdljava">

-        <antcall target="wsimport">

-            <param name="wsdlfile" value="Payment.wsdl"/>

-            <param name="javaclass" value="com/tuscanyscatours/payment/Payment.class"/>

-            <param name="package" value="com.tuscanyscatours.payment"/>

-        </antcall>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml
deleted file mode 100644
index 4f91b07022..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/pom.xml
+++ /dev/null
@@ -1,131 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-shoppingcart</artifactId>

-    <name>Apache Tuscany SCA Tours Shopping Cart Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-data-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-common</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.xml.ws</groupId>

-            <artifactId>jaxws-api</artifactId>

-            <version>2.1</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>javax.xml.soap</groupId>

-                    <artifactId>saaj-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-    </dependencies>

-

-    <pluginRepositories>

-        <pluginRepository>

-            <id>java.net2</id>

-            <name>java.net Maven 2.x Repository</name>

-            <url>http://download.java.net/maven/2</url>

-            <snapshots>

-                <enabled>false</enabled>

-            </snapshots>

-        </pluginRepository>

-    </pluginRepositories>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>build-helper-maven-plugin</artifactId>

-                <version>1.0</version>

-                <executions>

-                    <execution>

-                        <id>add-source</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>add-source</goal>

-                        </goals>

-                        <configuration>

-                            <sources>

-                                <source>target/jaxws-source</source>

-                            </sources>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>jaxws-maven-plugin</artifactId>

-                <version>1.12</version>

-                <executions>

-                    <execution>

-                        <id>payment</id>

-                        <phase>generate-sources</phase>

-                        <goals>

-                            <goal>wsimport</goal>

-                        </goals>

-                        <configuration>

-                            <packageName>com.tuscanyscatours.payment</packageName>

-                            <wsdlDirectory>${basedir}/src/main/resources</wsdlDirectory>

-                            <wsdlFiles>

-                                <wsdlFile>Payment.wsdl</wsdlFile>

-                            </wsdlFiles>

-                            <sourceDestDir>${project.build.directory}/jaxws-source</sourceDestDir>

-                            <verbose>false</verbose>

-                            <xnocompile>true</xnocompile>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
deleted file mode 100644
index ff453d6a78..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartCheckout.java
+++ /dev/null
@@ -1,26 +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 com.tuscanyscatours.shoppingcart;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CartCheckout {
-    void checkout(String cartId, String name);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.java
deleted file mode 100644
index 0966c6b2b3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartInitialize.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 com.tuscanyscatours.shoppingcart;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-import com.tuscanyscatours.common.TripItem;
-
-@Remotable
-public interface CartInitialize {
-    String newCart();
-
-    TripItem[] getTrips(String cartId);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java
deleted file mode 100644
index 836f06ed7f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartStore.java
+++ /dev/null
@@ -1,37 +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 com.tuscanyscatours.shoppingcart;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-import com.tuscanyscatours.common.TripItem;
-
-/**
- * The CartStore service interface
- */
-@Remotable
-public interface CartStore {
-    void addTrip(TripItem trip);
-
-    void removeTrip(TripItem trip);
-
-    TripItem[] getTrips();
-
-    void reset();
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.java
deleted file mode 100644
index a9729fb98b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/CartUpdates.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 com.tuscanyscatours.shoppingcart;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-import com.tuscanyscatours.common.TripItem;
-
-@Remotable
-public interface CartUpdates {
-    void addTrip(String cartId, TripItem trip);
-
-    void removeTrip(String cartId, TripItem trip);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java
deleted file mode 100644
index ff83a7586a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/CartStoreImpl.java
+++ /dev/null
@@ -1,68 +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 com.tuscanyscatours.shoppingcart.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import com.tuscanyscatours.common.TripItem;
-import com.tuscanyscatours.shoppingcart.CartStore;
-
-/**
- * An implementation of the CartStore service
- */
-@Scope("CONVERSATION")
-@Service({CartStore.class})
-public class CartStoreImpl implements CartStore {
-
-    protected String cartId;
-
-    private List<TripItem> trips = new ArrayList<TripItem>();
-
-    @Init
-    public void initCart() {
-        System.out.println("CartStore init for id: " + cartId);
-    }
-
-    @Destroy
-    public void destroyCart() {
-        System.out.println("CartStore destroy for id: " + cartId);
-    }
-
-    public void addTrip(TripItem trip) {
-        trips.add(trip);
-    }
-
-    public void removeTrip(TripItem trip) {
-        trips.remove(trip);
-    }
-
-    public TripItem[] getTrips() {
-        return trips.toArray(new TripItem[trips.size()]);
-    }
-
-    public void reset() {
-        trips.clear();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
deleted file mode 100644
index daaf187dbb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/java/com/tuscanyscatours/shoppingcart/impl/ShoppingCartImpl.java
+++ /dev/null
@@ -1,104 +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 com.tuscanyscatours.shoppingcart.impl;

-

-import java.util.HashMap;

-import java.util.Map;

-import java.util.UUID;

-

-import org.oasisopen.sca.ComponentContext;

-import org.oasisopen.sca.ServiceReference;

-import org.oasisopen.sca.annotation.Context;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.common.TripItem;

-import com.tuscanyscatours.payment.Payment;

-import com.tuscanyscatours.shoppingcart.CartCheckout;

-import com.tuscanyscatours.shoppingcart.CartInitialize;

-import com.tuscanyscatours.shoppingcart.CartStore;

-import com.tuscanyscatours.shoppingcart.CartUpdates;

-

-/**

- * An implementation of the ShoppingCart service

- */

-@Service({CartInitialize.class, CartUpdates.class, CartCheckout.class})

-public class ShoppingCartImpl implements CartInitialize, CartUpdates, CartCheckout {

-

-    @Reference

-    protected Payment payment;

-

-    @Reference

-    protected CartStore cartStore;

-

-    @Context

-    protected ComponentContext componentContext;

-

-    private static Map<String, CartStore> cartStores = new HashMap<String, CartStore>();

-

-    public String newCart() {

-        String cartId = UUID.randomUUID().toString();

-        ServiceReference<CartStore> cartStore = componentContext.getServiceReference(CartStore.class, "cartStore");

-        // cartStore.setConversationID(cartId);

-        cartStores.put(cartId, cartStore.getService());

-

-        return cartId;

-    }

-

-    public void addTrip(String cartId, TripItem trip) {

-        cartStores.get(cartId).addTrip(trip);

-    }

-

-    public void removeTrip(String cartId, TripItem trip) {

-        cartStores.get(cartId).addTrip(trip);

-    }

-

-    public TripItem[] getTrips(String cartId) {

-        return cartStores.get(cartId).getTrips();

-    }

-

-    public void checkout(String cartId, String customerName) {

-        // get users credentials. Hard coded for now but should

-        // come from the security context

-        String customerId = customerName;

-

-        // get the total for all the trips

-        float amount = (float)0.0;

-

-        TripItem[] trips = getTrips(cartId);

-

-        for (TripItem trip : trips) {

-            if (trip.getType().equals(TripItem.TRIP)) {

-                amount += trip.getPrice();

-            } else {

-                for (TripItem tripItem : trip.getTripItems()) {

-                    amount += tripItem.getPrice();

-                }

-            }

-        }

-

-        // Take the payment from the customer

-        payment.makePaymentMember(customerId, amount);

-

-        // reset the cart store

-        cartStores.get(cartId).reset();

-        cartStores.remove(cartId);

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 55165fd9c4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/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">

-    <import.java package="com.tuscanyscatours.common" />

-    <export.java package="com.tuscanyscatours.payment" />

-    <export.java package="com.tuscanyscatours.shoppingcart" />

-    <export.java package="com.tuscanyscatours.shoppingcart.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/resources/Payment.wsdl b/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/resources/Payment.wsdl
deleted file mode 100644
index 3885764899..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/shoppingcart/src/main/resources/Payment.wsdl
+++ /dev/null
@@ -1,83 +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="Payment" 

-                  targetNamespace="http://www.tuscanyscatours.com/Payment/"

-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 

-                  xmlns:tns="http://www.tuscanyscatours.com/Payment/" 

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

-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 

-                    targetNamespace="http://www.tuscanyscatours.com/Payment/"

-                    xmlns:tns="http://www.tuscanyscatours.com/Payment/">

-

-            <xsd:complexType name="MakePaymentMemberType">

-                <xsd:sequence>

-                    <xsd:element name="CustomerId" type="xsd:string"></xsd:element>

-                    <xsd:element name="Amount" type="xsd:float"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>                    

-            <xsd:element name="makePaymentMember" type="tns:MakePaymentMemberType"/>

-      

-            <xsd:complexType name="MakePaymentMemberResponseType">

-                <xsd:sequence>

-                    <xsd:element name="Status" type="xsd:string"></xsd:element>

-                </xsd:sequence>

-            </xsd:complexType>

-            <xsd:element name="makePaymentMemberResponse" type="tns:MakePaymentMemberResponseType"/>

-            

-        </xsd:schema>

-    </wsdl:types>

-    <wsdl:message name="MakePaymentMemberRequest">

-        <wsdl:part name="parameters" element="tns:makePaymentMember"></wsdl:part>

-    </wsdl:message>

-    <wsdl:message name="MakePaymentMemberResponse">

-        <wsdl:part name="parameters" element="tns:makePaymentMemberResponse"></wsdl:part>

-    </wsdl:message>

-    <wsdl:portType name="Payment">

-        <wsdl:operation name="makePaymentMember">

-            <wsdl:input message="tns:MakePaymentMemberRequest"></wsdl:input>

-            <wsdl:output message="tns:MakePaymentMemberResponse"></wsdl:output>

-        </wsdl:operation>

-    </wsdl:portType>

-    <wsdl:binding name="PaymentBinding" type="tns:Payment">

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

-        <wsdl:operation name="makePaymentMember">

-            <soap:operation soapAction="http://www.tuscanyscatours.com/Payment/makePayment" />

-            <wsdl:input>

-                <soap:body use="literal" />

-            </wsdl:input>

-            <wsdl:output>

-                <soap:body use="literal" />

-            </wsdl:output>

-        </wsdl:operation>

-    </wsdl:binding>

-    <wsdl:service name="PaymentService">

-        <wsdl:port name="PaymentPort" binding="tns:PaymentBinding">

-            <soap:address location="http://localhost:8083/Payment" />

-        </wsdl:port>

-    </wsdl:service>

-    

-   <plnk:partnerLinkType name="PaymentLinkType">

-       <plnk:role name="forward" portType="tns:Payment"/>

-   </plnk:partnerLinkType>

-</wsdl:definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/build.xml
deleted file mode 100644
index 45373a4910..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/build.xml
+++ /dev/null
@@ -1,26 +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="scatours-contribution-travelcatalog" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../common/target/scatours-contribution-common.jar"/>

-        <pathelement path="../currency/target/scatours-contribution-currency.jar"/>

-    </path>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml
deleted file mode 100644
index c1591336c8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/pom.xml
+++ /dev/null
@@ -1,68 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-travelcatalog</artifactId>

-    <name>Apache Tuscany SCA Tours Travel Catalog Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-data-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-common</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-currency</artifactId>

-            <version>${pom.version}</version>

-        </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/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
deleted file mode 100644
index 53997a23c2..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/TravelCatalogSearch.java
+++ /dev/null
@@ -1,32 +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 com.tuscanyscatours.travelcatalog;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-import com.tuscanyscatours.common.TripItem;

-import com.tuscanyscatours.common.TripLeg;

-

-/**

- * The TravelCatalogSearch service interface

- */

-@Remotable

-public interface TravelCatalogSearch {

-    TripItem[] search(TripLeg tripLeg);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
deleted file mode 100644
index c77b7a03c4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/java/com/tuscanyscatours/travelcatalog/impl/TravelCatalogImpl.java
+++ /dev/null
@@ -1,127 +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 com.tuscanyscatours.travelcatalog.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-import java.util.UUID;

-import java.util.concurrent.CountDownLatch;

-

-import org.oasisopen.sca.ComponentContext;

-import org.oasisopen.sca.RequestContext;

-import org.oasisopen.sca.ServiceReference;

-import org.oasisopen.sca.annotation.Context;

-import org.oasisopen.sca.annotation.Property;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.common.Search;

-import com.tuscanyscatours.common.SearchCallback;

-import com.tuscanyscatours.common.TripItem;

-import com.tuscanyscatours.common.TripLeg;

-import com.tuscanyscatours.currencyconverter.CurrencyConverter;

-import com.tuscanyscatours.travelcatalog.TravelCatalogSearch;

-

-/**

- * An implementation of the travel catalog service

- */

-@Scope("COMPOSITE")

-@Service({TravelCatalogSearch.class})

-public class TravelCatalogImpl implements TravelCatalogSearch, SearchCallback {

-

-    @Reference

-    protected Search hotelSearch;

-

-    @Reference

-    protected Search flightSearch;

-

-    @Reference

-    protected Search carSearch;

-

-    @Reference

-    protected Search tripSearch;

-

-    @Property

-    public String quoteCurrencyCode = "USD";

-

-    @Reference

-    protected CurrencyConverter currencyConverter;

-

-    @Context

-    protected ComponentContext componentContext;

-

-    private List<TripItem> searchResults = new ArrayList<TripItem>();

-

-    CountDownLatch resultsReceivedCountdown;

-

-    // TravelSearch methods

-

-    public TripItem[] search(TripLeg tripLeg) {

-

-        resultsReceivedCountdown = new CountDownLatch(4);

-        searchResults.clear();

-

-        ServiceReference<Search> dynamicHotelSearch = componentContext.getServiceReference(Search.class, "hotelSearch");

-

-        // dynamicHotelSearch.setCallbackID("HotelSearchCallbackID-" + tripLeg.getId());

-        dynamicHotelSearch.getService().searchAsynch(tripLeg);

-

-        flightSearch.searchAsynch(tripLeg);

-        carSearch.searchAsynch(tripLeg);

-        tripSearch.searchAsynch(tripLeg);

-

-        System.out.println("going into wait");

-

-        try {

-            resultsReceivedCountdown.await();

-        } catch (InterruptedException ex) {

-        }

-

-        for (TripItem tripItem : searchResults) {

-            tripItem.setId(UUID.randomUUID().toString());

-            tripItem.setTripId(tripLeg.getId());

-            tripItem

-                .setPrice(currencyConverter.convert(tripItem.getCurrency(), quoteCurrencyCode, tripItem.getPrice()));

-            tripItem.setCurrency(quoteCurrencyCode);

-        }

-

-        return searchResults.toArray(new TripItem[searchResults.size()]);

-    }

-

-    // SearchCallback methods

-

-    public synchronized void searchResults(TripItem[] items) {

-        RequestContext requestContext = componentContext.getRequestContext();

-        // Object callbackID = requestContext.getServiceReference().getCallbackID();

-        // System.out.println("Asynch response - " + callbackID);

-

-        if (items != null) {

-            for (int i = 0; i < items.length; i++) {

-                searchResults.add(items[i]);

-            }

-        }

-

-        resultsReceivedCountdown.countDown();

-    }

-

-    public void setPercentComplete(String searchComponent, int percentComplete) {

-        // Not used at the moment

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 7b104eab59..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/travelcatalog/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">

-    <import.java package="com.tuscanyscatours.common" />

-    <import.java package="com.tuscanyscatours.currencyconverter" />

-    <export.java package="com.tuscanyscatours.travelcatalog" />

-    <export.java package="com.tuscanyscatours.travelcatalog.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/build.xml
deleted file mode 100644
index 6e48af3cf8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/build.xml
+++ /dev/null
@@ -1,26 +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="scatours-contribution-trip" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../common/target/scatours-contribution-common.jar"/>

-    </path>

-    <path id="test-path" refid="compile-path"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/pom.xml
deleted file mode 100644
index 91e6dd8856..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/pom.xml
+++ /dev/null
@@ -1,83 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-trip</artifactId>

-    <name>Apache Tuscany SCA Tours Prepackaged Trip Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-data-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-policy-logging</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-common</artifactId>

-            <version>${pom.version}</version>

-        </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/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java
deleted file mode 100644
index a0aec4b777..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripImpl.java
+++ /dev/null
@@ -1,94 +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 com.tuscanyscatours.trip.impl;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Init;

-import org.oasisopen.sca.annotation.Scope;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.common.Book;

-import com.tuscanyscatours.common.Search;

-import com.tuscanyscatours.common.SearchCallback;

-import com.tuscanyscatours.common.TripItem;

-import com.tuscanyscatours.common.TripLeg;

-

-/**

- * An implementation of the Trip service

- */

-@Scope("STATELESS")

-@Service({Search.class, Book.class})

-public class TripImpl implements Search, Book {

-

-    private List<TripInfo> trips = new ArrayList<TripInfo>();

-

-    @Callback

-    protected SearchCallback searchCallback;

-

-    @Init

-    public void init() {

-        trips.add(new TripInfo("FS1DEC06", "Florence and Siena pre-packaged tour", "LGW", "FLR", "06/12/09",

-                               "13/12/09", "27", 450, "EUR", "http://localhost:8085/tbd"));

-        trips.add(new TripInfo("FS1DEC13", "Florence and Siena pre-packaged tour 2", "LGW", "FLR", "13/12/09",

-                               "20/12/09", "27", 550, "EUR", "http://localhost:8085/tbd"));

-    }

-

-    public TripItem[] searchSynch(TripLeg tripLeg) {

-        List<TripItem> items = new ArrayList<TripItem>();

-

-        // find the pre-package trip

-        for (TripInfo trip : trips) {

-            if ((trip.getFromLocation().equals(tripLeg.getFromLocation())) && (trip.getToLocation().equals(tripLeg

-                .getToLocation()))

-                && (trip.getFromDate().equals(tripLeg.getFromDate()))) {

-                TripItem item =

-                    new TripItem("", "", TripItem.TRIP, trip.getName(), trip.getDescription(),

-                                 trip.getFromLocation() + " - " + trip.getToLocation(), trip.getFromDate(), trip

-                                     .getToDate(), trip.getPricePerPerson(), trip.getCurrency(), trip.getLink());

-                items.add(item);

-            }

-        }

-

-        return items.toArray(new TripItem[items.size()]);

-    }

-

-    public void searchAsynch(TripLeg tripLeg) {

-        System.out.println("Starting trip search");

-

-        try {

-            Thread.sleep(2000);

-        } catch (Exception ex) {

-            // do nothing

-        }

-

-        // return available hotels

-        searchCallback.searchResults(searchSynch(tripLeg));

-    }

-

-    public int getPercentComplete() {

-        return 100;

-    }

-

-    public String book(TripItem tripItem) {

-        return "trip1";

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java
deleted file mode 100644
index d8809e1325..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/java/com/tuscanyscatours/trip/impl/TripInfo.java
+++ /dev/null
@@ -1,140 +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 com.tuscanyscatours.trip.impl;

-

-public class TripInfo {

-

-    private String name;

-    private String description;

-    private String fromLocation;

-    private String toLocation;

-    private String fromDate;

-    private String toDate;

-    private String spaces;

-    private double pricePerPerson;

-    private String currency;

-    private String link;

-

-    public TripInfo() {

-    }

-

-    public TripInfo(String name,

-                    String description,

-                    String fromLocation,

-                    String toLocation,

-                    String fromDate,

-                    String toDate,

-                    String spaces,

-                    double pricePerPerson,

-                    String currency,

-                    String link) {

-

-        this.name = name;

-        this.description = description;

-        this.fromLocation = fromLocation;

-        this.toLocation = toLocation;

-        this.fromDate = fromDate;

-        this.toDate = toDate;

-        this.spaces = spaces;

-        this.pricePerPerson = pricePerPerson;

-        this.currency = currency;

-        this.link = link;

-    }

-

-    public String getName() {

-        return name;

-    }

-

-    public void setName(String name) {

-        this.name = name;

-    }

-

-    public String getDescription() {

-        return description;

-    }

-

-    public void setDescription(String description) {

-        this.description = description;

-    }

-

-    public String getFromLocation() {

-        return fromLocation;

-    }

-

-    public void setFromLocation(String fromLocation) {

-        this.fromLocation = fromLocation;

-    }

-

-    public String getToLocation() {

-        return toLocation;

-    }

-

-    public void setToLocation(String toLocation) {

-        this.toLocation = toLocation;

-    }

-

-    public String getFromDate() {

-        return fromDate;

-    }

-

-    public void setFromDate(String fromDate) {

-        this.fromDate = fromDate;

-    }

-

-    public String getToDate() {

-        return toDate;

-    }

-

-    public void setToDate(String toDate) {

-        this.toDate = toDate;

-    }

-

-    public String getSpaces() {

-        return spaces;

-    }

-

-    public void setSpaces(String spaces) {

-        this.spaces = spaces;

-    }

-

-    public double getPricePerPerson() {

-        return pricePerPerson;

-    }

-

-    public void setPricePerPerson(double pricePerPerson) {

-        this.pricePerPerson = pricePerPerson;

-    }

-

-    public String getCurrency() {

-        return currency;

-    }

-

-    public void setCurrency(String currency) {

-        this.currency = currency;

-    }

-

-    public String getLink() {

-        return link;

-    }

-

-    public void setLink(String link) {

-        this.link = link;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 278d66acd1..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">

-   <import.java package="com.tuscanyscatours.common"/>

-   <export.java package="com.tuscanyscatours.trip.impl"/>

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
deleted file mode 100644
index 29e2058023..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/java/scatours/trip/TripTestCase.java
+++ /dev/null
@@ -1,68 +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 scatours.trip;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.tuscanyscatours.common.Book;
-import com.tuscanyscatours.common.TripItem;
-
-/**
- * 
- */
-public class TripTestCase {
-    private static Node tripNode;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        try {
-            tripNode =
-                NodeFactory.getInstance().createNode("trip.composite",
-                                                           new Contribution("trip", "./target/classes"),
-                                                           new Contribution("trip-test", "./target/test-classes"));
-
-            tripNode.start();
-        } catch (Exception ex) {
-            ex.printStackTrace();
-        }
-    }
-
-    @Test
-    public void testPayment() {
-        Node client = (Node)tripNode;
-        Book booking = client.getService(Book.class, "Trip/Book");
-        TripItem tripItem =
-            new TripItem("1234", "5678", TripItem.TRIP, "FS1DEC06", "Florence and Siena pre-packaged tour", "FLR",
-                         "06/12/09", "13/12/09", 450, "EUR", "http://localhost:8085/tbd");
-        System.out.println("Result = " + booking.book(tripItem) + "\n");
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        tripNode.stop();
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml
deleted file mode 100644
index 1d5579495c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/definitions.xml
+++ /dev/null
@@ -1,32 +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.    
--->
-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-             targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-             xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-             xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1">
-
-    <!-- PolicySets -->
-    <policySet name="JDKLoggingPolicy" provides="tuscany:logging" appliesTo="sca:implementation.java"
-        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912">
-        <tuscany:jdkLogger name="myLogger">
-            <logLevel>FINER</logLevel>
-        </tuscany:jdkLogger>
-    </policySet>
-</definitions>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite b/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite
deleted file mode 100644
index a0dd505036..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/trip/src/test/resources/trip.composite
+++ /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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           targetNamespace="http://scatours"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           name="packagedtrip">
-
-    <component name="Trip">
-        <implementation.java class="com.tuscanyscatours.trip.impl.TripImpl" requires="tuscany:logging"/>
-        <service name="Search"/>
-        <service name="Book"/>        
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/build.xml
deleted file mode 100644
index e8e7eb7f10..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/build.xml
+++ /dev/null
@@ -1,26 +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="scatours-contribution-tripbooking" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../common/target/scatours-contribution-common.jar"/>

-        <pathelement path="../shoppingcart/target/scatours-contribution-shoppingcart.jar"/>

-    </path>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml
deleted file mode 100644
index f45f92c464..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/pom.xml
+++ /dev/null
@@ -1,74 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-contribution-tripbooking</artifactId>

-    <name>Apache Tuscany SCA Tours Trip Booking Contribution</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-sca-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-data-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-common</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-currency</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-shoppingcart</artifactId>

-            <version>${pom.version}</version>

-        </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/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java
deleted file mode 100644
index c5eaa95f19..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/TripBooking.java
+++ /dev/null
@@ -1,32 +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 com.tuscanyscatours.tripbooking;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-import com.tuscanyscatours.common.TripItem;

-

-/**

- * The TripBooking service interface

- */

-@Remotable

-public interface TripBooking {

-

-    TripItem bookTrip(String cartId, TripItem trip);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
deleted file mode 100644
index e5846bae5d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/java/com/tuscanyscatours/tripbooking/impl/TripBookingImpl.java
+++ /dev/null
@@ -1,91 +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 com.tuscanyscatours.tripbooking.impl;

-

-import org.oasisopen.sca.ComponentContext;

-import org.oasisopen.sca.ServiceReference;

-import org.oasisopen.sca.annotation.Context;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-import com.tuscanyscatours.common.Book;

-import com.tuscanyscatours.common.TripItem;

-import com.tuscanyscatours.shoppingcart.CartUpdates;

-import com.tuscanyscatours.tripbooking.TripBooking;

-

-/**

- * An implementation of the TripBooking service

- */

-@Service({TripBooking.class})

-public class TripBookingImpl implements TripBooking {

-

-    @Reference

-    protected Book hotelBook;

-

-    @Reference

-    protected Book flightBook;

-

-    @Reference

-    protected Book carBook;

-

-    @Reference

-    protected Book tripBook;

-

-    @Reference

-    protected CartUpdates cartUpdates;

-

-    @Context

-    protected ComponentContext componentContext;

-

-    public TripItem bookTrip(String cartId, TripItem trip) {

-

-        String bookingCode = "";

-

-        // book any nested items

-        TripItem[] nestedItems = trip.getTripItems();

-        if (nestedItems != null) {

-            for (int i = 0; i < nestedItems.length; i++) {

-                TripItem tripItem = nestedItems[i];

-                if (tripItem.getType().equals(TripItem.CAR)) {

-                    tripItem.setBookingCode(carBook.book(tripItem));

-                } else if (tripItem.getType().equals(TripItem.FLIGHT)) {

-                    tripItem.setBookingCode(flightBook.book(tripItem));

-                } else if (tripItem.getType().equals(TripItem.HOTEL)) {

-                    tripItem.setBookingCode(hotelBook.book(tripItem));

-                } else {

-                    tripItem.setBookingCode(tripItem.getType() + " is invalid");

-                }

-            }

-        }

-

-        // book the top level item if it's a packaged trip

-        if (trip.getType().equals(TripItem.TRIP)) {

-            bookingCode = tripBook.book(trip);

-            trip.setBookingCode(bookingCode);

-        }

-

-        // add trip to the shopping cart

-        ServiceReference<CartUpdates> cart = componentContext.getServiceReference(CartUpdates.class, "cartUpdates");

-        // cart.setConversationID(cartId);

-        cart.getService().addTrip(cartId, trip);

-

-        return trip;

-    }

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index f2f5877e12..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/contributions/tripbooking/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +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">

-    <import.java package="com.tuscanyscatours.common" />

-    <import.java package="com.tuscanyscatours.currencyconverter" />

-    <import.java package="com.tuscanyscatours.shoppingcart" />

-    <export.java package="com.tuscanyscatours.tripbooking" />

-    <export.java package="com.tuscanyscatours.tripbooking.impl" />

-</contribution>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
deleted file mode 100644
index 3aedf801c6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/bundle/pom.xml
+++ /dev/null
@@ -1,643 +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>scatours</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>1.0-SNAPSHOT</version>

-

-    <artifactId>scatours-distribution-bundle</artifactId>

-    <name>Apache Tuscany SCA Tours Distribution Bundle</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-client-currency-converter-corba</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-client-currency-converter-jms</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-client-currency-converter-rmi</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-client-currency-converter-ws-jaxws</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-blog-feed</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-buildingblocks</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-buildingblocks-client</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-calendar</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-car</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-common</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-creditcard-payment-jaxb-policy</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-creditcard-payment-sdo</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-<!--

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-creditcard-payment-webapp</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

--->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-currency</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-currency-corba</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-currency-jms</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-<!--

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-currency-jsp</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

--->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-currency-rmi</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-<!--

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-currency-servlet</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

--->

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-currency-ws</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-databinding-client</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-emailgateway</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-feed-logger</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-flight</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-currency</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-coordination</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-packagedtrip</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-shoppingcart</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-ui</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-help-pages</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-hotel</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-interaction-client</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-interaction-service-remote</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-client</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-tours</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-trips</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-notification</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-notification-corba</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-notification-ejb</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-notification-jms</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-notification-rmi</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-notification-ws</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-payment-bpel</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-payment-bpel-process</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-payment-groovy</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-payment-java</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-payment-java-policy</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-payment-spring</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-payment-spring-policy</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-payment-spring-scatag</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-policy-client</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-scatours</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-shoppingcart</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-travelcatalog</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-trip</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-tripbooking</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-blog-feed</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-buildingblocks</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-currency-converter</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-currency-converter-corba</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-currency-converter-jms</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-currency-converter-rmi</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-currency-converter-ws</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-databinding</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-feed-logger</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-fullapp</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-fullapp-domain</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-fullapp-nodes</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-help-pages</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-interaction</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-introducing</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-introducing-client</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-introducing-domain</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-introducing-tours</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-introducing-trips</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-jumpstart</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-notification-corba</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-notification-ejb</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-notification-jms</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-notification-rmi</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-notification-ws</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-payment-bpel</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-payment-groovy</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-payment-java</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-payment-java-policy</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-payment-spring</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-payment-spring-scatag</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-launcher-policy</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-service-creditcard-payment-jaxws</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-service-smsgateway-corba</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-service-smsgateway-ejb</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-service-smsgateway-jaxws</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-service-smsgateway-jms</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-service-smsgateway-rmi</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-domainconfig-fullapp</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-domainconfig-introducing</artifactId>

-            <version>${pom.version}</version>

-        </dependency>

-        <dependency>

-           <groupId>org.apache.geronimo.specs</groupId>

-           <artifactId>geronimo-jms_1.1_spec</artifactId>

-           <version>1.1</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <plugins>

-            <plugin>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <phase>install</phase>

-                        <configuration>

-                            <tasks>

-                                <delete dir="../target/apache-tuscany-scatours-${version}/tuscany-scatours-${version}/domainconfig/META-INF"

-                                        includeemptydirs="true"/>

-                            </tasks>

-                        </configuration>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-

-

-    <profiles>

-        <profile>

-            <!-- The default profile produces a subset distribution which excludes

-               libraries that are present in the Tuscany SCA binary distro. -->

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <build>

-                <plugins>

-                    <plugin>

-                        <groupId>org.apache.maven.plugins</groupId>

-                        <artifactId>maven-assembly-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-package</id>

-                                <phase>package</phase>

-                                <goals>

-                                    <goal>single</goal>

-                                </goals>

-                                <configuration>

-                                    <outputDirectory>../target</outputDirectory>

-                                    <descriptors>

-                                        <descriptor>../src/main/assembly/bin.xml</descriptor>

-                                        <descriptor>../src/main/assembly/src.xml</descriptor>

-                                    </descriptors>

-                                    <tarLongFileMode>gnu</tarLongFileMode>

-                                    <archiveBaseDirectory>..</archiveBaseDirectory>

-                                    <outputDirectory>../target</outputDirectory>

-                                    <finalName>apache-tuscany-scatours-${version}</finalName>

-                                    <appendAssemblyId>true</appendAssemblyId>

-                                    <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>

-

-        <profile>

-            <!-- Use mvn -Pselfcontained to produce a self-contained distribution

-               with all library dependencies included. -->

-            <id>selfcontained</id>

-            <build>

-                <plugins>

-                    <plugin>

-                        <groupId>org.apache.maven.plugins</groupId>

-                        <artifactId>maven-assembly-plugin</artifactId>

-                        <executions>

-                            <execution>

-                                <id>distribution-package</id>

-                                <phase>package</phase>

-                                <goals>

-                                    <goal>single</goal>

-                                </goals>

-                                <configuration>

-                                    <outputDirectory>../target</outputDirectory>

-                                    <descriptors>

-                                        <descriptor>../src/main/assembly/bin-selfcontained.xml</descriptor>

-                                        <descriptor>../src/main/assembly/src.xml</descriptor>

-                                    </descriptors>

-                                    <tarLongFileMode>gnu</tarLongFileMode>

-                                    <archiveBaseDirectory>..</archiveBaseDirectory>

-                                    <outputDirectory>../target</outputDirectory>

-                                    <finalName>apache-tuscany-scatours-${version}</finalName>

-                                    <appendAssemblyId>true</appendAssemblyId>

-                                    <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>

-                                </configuration>

-                            </execution>

-                        </executions>

-                    </plugin>

-                </plugins>

-            </build>

-        </profile>

-    </profiles>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml
deleted file mode 100644
index 08c654a1a4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/jaxws/pom.xml
+++ /dev/null
@@ -1,72 +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>scatours</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>1.0-SNAPSHOT</version>

-

-    <!-- This module brings in the JAX-WS runtime dependencies that are needed when running on JDK 5. -->

-    <artifactId>scatours-distribution-jaxws</artifactId>

-    <name>Apache Tuscany SCA Tours Distribution JAX-WS Dependencies for JDK 5</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-jaxws-runtime</artifactId>

-            <version>1.0-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>distribution-package</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <configuration>

-                            <outputDirectory>../target</outputDirectory>

-                            <descriptors>

-                                <descriptor>../src/main/assembly/bin-jaxws.xml</descriptor>

-                            </descriptors>

-                            <tarLongFileMode>gnu</tarLongFileMode>

-                            <archiveBaseDirectory>..</archiveBaseDirectory>

-                            <outputDirectory>../target</outputDirectory>

-                            <finalName>apache-tuscany-scatours-${version}</finalName>

-                            <appendAssemblyId>true</appendAssemblyId>

-                            <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/ode/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/ode/pom.xml
deleted file mode 100644
index 4641976fba..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/ode/pom.xml
+++ /dev/null
@@ -1,73 +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>scatours</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>1.0-SNAPSHOT</version>

-

-    <!-- This module brings in the database needed by the ODE runtime. -->

-    <artifactId>scatours-distribution-ode</artifactId>

-    <name>Apache Tuscany SCA Tours Distribution ODE Database</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.ode</groupId>

-            <artifactId>ode-dao-jpa-ojpa-derby</artifactId>

-            <type>zip</type>

-            <version>1.1.1</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>distribution-package</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <configuration>

-                            <outputDirectory>../target</outputDirectory>

-                            <descriptors>

-                                <descriptor>../src/main/assembly/bin-ode.xml</descriptor>

-                            </descriptors>

-                            <tarLongFileMode>gnu</tarLongFileMode>

-                            <archiveBaseDirectory>..</archiveBaseDirectory>

-                            <outputDirectory>../target</outputDirectory>

-                            <finalName>apache-tuscany-scatours-${version}</finalName>

-                            <appendAssemblyId>true</appendAssemblyId>

-                            <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml
deleted file mode 100644
index e42098a5b0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/openejb/pom.xml
+++ /dev/null
@@ -1,71 +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>scatours</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>1.0-SNAPSHOT</version>

-

-    <artifactId>scatours-distribution-openejb</artifactId>

-    <name>Apache Tuscany SCA Tours Distribution OpenEJB Dependencies</name>

-    <packaging>pom</packaging>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-openejb-runtime</artifactId>

-            <version>1.0-SNAPSHOT</version>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-assembly-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <id>distribution-package</id>

-                        <phase>package</phase>

-                        <goals>

-                            <goal>single</goal>

-                        </goals>

-                        <configuration>

-                            <outputDirectory>../target</outputDirectory>

-                            <descriptors>

-                                <descriptor>../src/main/assembly/bin-openejb.xml</descriptor>

-                            </descriptors>

-                            <tarLongFileMode>gnu</tarLongFileMode>

-                            <archiveBaseDirectory>..</archiveBaseDirectory>

-                            <outputDirectory>../target</outputDirectory>

-                            <finalName>apache-tuscany-scatours-${version}</finalName>

-                            <appendAssemblyId>true</appendAssemblyId>

-                            <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>

-                        </configuration>

-                    </execution>

-                </executions>

-            </plugin>

-        </plugins>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/pom.xml
deleted file mode 100644
index 916398106e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/pom.xml
+++ /dev/null
@@ -1,40 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-
-    <artifactId>scatours-distribution</artifactId>
-    <name>Apache Tuscany SCA Tours Distribution</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>bundle</module>
-        <module>jaxws</module>
-        <module>ode</module>
-        <module>openejb</module>
-    </modules>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml
deleted file mode 100644
index b900b1bcb5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-jaxws.xml
+++ /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.

--->

-<assembly>

-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->

-    <id></id>

-    <includeBaseDirectory>true</includeBaseDirectory>

-    <baseDirectory>tuscany-scatours-${version}</baseDirectory>

-    <formats>

-        <format>dir</format>

-<!--

-        <format>tar.gz</format>

-        <format>zip</format>

--->

-    </formats>

-

-    <componentDescriptors>

-        <componentDescriptor>../src/main/components/bin-jaxws.xml</componentDescriptor>

-    </componentDescriptors>

-</assembly>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml
deleted file mode 100644
index 1965c7f16e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml
+++ /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.

--->

-<assembly>

-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->

-    <id></id>

-    <includeBaseDirectory>true</includeBaseDirectory>

-    <baseDirectory>tuscany-scatours-${version}</baseDirectory>

-    <formats>

-        <format>dir</format>

-<!--

-        <format>tar.gz</format>

-        <format>zip</format>

--->

-    </formats>

-

-    <componentDescriptors>

-        <componentDescriptor>../src/main/components/bin-ode.xml</componentDescriptor>

-    </componentDescriptors>

-</assembly>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-openejb.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-openejb.xml
deleted file mode 100644
index 8364ac11e5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-openejb.xml
+++ /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.

--->

-<assembly>

-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->

-    <id></id>

-    <includeBaseDirectory>true</includeBaseDirectory>

-    <baseDirectory>tuscany-scatours-${version}</baseDirectory>

-    <formats>

-        <format>dir</format>

-<!--

-        <format>tar.gz</format>

-        <format>zip</format>

--->

-    </formats>

-

-    <componentDescriptors>

-        <componentDescriptor>../src/main/components/bin-openejb.xml</componentDescriptor>

-    </componentDescriptors>

-</assembly>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-selfcontained.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-selfcontained.xml
deleted file mode 100644
index cf2638fcfb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-selfcontained.xml
+++ /dev/null
@@ -1,38 +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.

--->

-<assembly>

-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->

-    <id></id>

-    <includeBaseDirectory>true</includeBaseDirectory>

-    <baseDirectory>tuscany-scatours-${version}</baseDirectory>

-    <formats>

-        <format>dir</format>

-<!--

-        <format>tar.gz</format>

-        <format>zip</format>

--->

-    </formats>

-

-    <componentDescriptors>

-        <componentDescriptor>../src/main/components/bin-common.xml</componentDescriptor>

-        <componentDescriptor>../src/main/components/bin-modules.xml</componentDescriptor>

-        <componentDescriptor>../src/main/components/bin-selfcontained.xml</componentDescriptor>

-    </componentDescriptors>

-</assembly>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml
deleted file mode 100644
index 4ce68281d5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,38 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id></id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-scatours-${version}</baseDirectory>
-    <formats>
-        <format>dir</format>
-<!--
-        <format>tar.gz</format>
-        <format>zip</format>
--->
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../src/main/components/bin-modules.xml</componentDescriptor>
-        <componentDescriptor>../src/main/components/bin-default.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/src.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/src.xml
deleted file mode 100644
index 25c6c823de..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/assembly/src.xml
+++ /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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-scatours-${version}-src</baseDirectory>
-    <formats>
-        <format>dir</format>
-<!--
-        <format>tar.gz</format>
-        <format>zip</format>
--->
-
-    </formats>
-
-    <fileSets>
-        <fileSet>
-            <directory>..</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-                <exclude>**/maven-eclipse.xml</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-</assembly>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-common.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-common.xml
deleted file mode 100644
index 5c2b013e3a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-common.xml
+++ /dev/null
@@ -1,43 +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.
--->
-<component>
-    <fileSets>
-
-        <!-- Add the text files to the top-level directroy -->
-        <fileSet>
-            <directory>..</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/bin</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>INSTALL</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-</component>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml
deleted file mode 100644
index ed61a17af3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-default.xml
+++ /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.

--->

-<component>

-

-    <files>

-        <file>

-            <source>../src/main/resources/build-defs.xml</source>

-            <outputDirectory>util</outputDirectory>

-        </file>

-    </files>

-

-</component>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml
deleted file mode 100644
index f139569c23..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-jaxws.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    *

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    *

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

--->

-<component>

-

-    <dependencySets>

-        <!-- Add scatours-util-jaxws-runtime.jar to the util directory -->

-        <dependencySet>

-            <useProjectArtifact>false</useProjectArtifact>

-            <outputDirectory>util</outputDirectory>

-            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>

-            <unpack>false</unpack>

-            <includes>

-                <include>org.apache.tuscany.sca:scatours-util-jaxws-runtime</include>

-            </includes>

-            <scope>runtime</scope>

-        </dependencySet>

-

-        <!-- Add the JAX-WS runtime dependencies to the jaxws directory -->

-        <dependencySet>

-            <useProjectArtifact>false</useProjectArtifact>

-            <outputDirectory>jaxws</outputDirectory>

-            <unpack>false</unpack>

-            <excludes>

-                <exclude>org.apache.tuscany.sca:scatours-util-jaxws-runtime</exclude>

-            </excludes>

-            <scope>runtime</scope>

-        </dependencySet>

-    </dependencySets>

-

-</component>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
deleted file mode 100644
index 41115063a7..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
+++ /dev/null
@@ -1,119 +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.
--->
-<component>
-
-    <files>
-        <file>
-            <source>../src/main/resources/build-clients.xml</source>
-            <outputDirectory>clients</outputDirectory>
-            <destName>build.xml</destName>
-        </file>
-        <file>
-            <source>../src/main/resources/build-launchers.xml</source>
-            <outputDirectory>launchers</outputDirectory>
-            <destName>build.xml</destName>
-        </file>
-        <file>
-            <source>../src/main/resources/build-services.xml</source>
-            <outputDirectory>services</outputDirectory>
-            <destName>build.xml</destName>
-        </file>
-    </files>
-
-    <dependencySets>
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>util</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:scatours-util-*</include>
-            </includes>
-            <scope>runtime</scope>
-        </dependencySet>
-
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>contributions</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:scatours-contribution-*</include>
-            </includes>
-            <excludes>
-                <exclude>org.apache.tuscany.sca:scatours-contribution-payment-bpel-process</exclude>
-            </excludes>
-           <scope>runtime</scope>
-        </dependencySet>
-
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>contributions/scatours-contribution-payment-bpel-process</outputDirectory>
-            <unpack>true</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:scatours-contribution-payment-bpel-process</include>
-            </includes>
-            <scope>runtime</scope>
-        </dependencySet>
-
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>launchers</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:scatours-launcher-*</include>
-            </includes>
-            <scope>runtime</scope>
-        </dependencySet>
-
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>services</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:scatours-service-*</include>
-            </includes>
-            <scope>runtime</scope>
-        </dependencySet>
-
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>clients</outputDirectory>
-            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:scatours-client-*</include>
-            </includes>
-            <scope>runtime</scope>
-        </dependencySet>
-
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <outputDirectory>domainconfig</outputDirectory>
-            <unpack>true</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:scatours-domainconfig-*</include>
-            </includes>
-            <scope>runtime</scope>
-        </dependencySet>
-    </dependencySets>
-
-</component>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml
deleted file mode 100644
index 884a8fdb84..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml
+++ /dev/null
@@ -1,36 +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.

--->

-<component>

-

-    <dependencySets>

-        <!-- Add the ODE database to the ode directory -->

-        <dependencySet>

-            <useProjectArtifact>false</useProjectArtifact>

-            <outputDirectory>ode</outputDirectory>

-            <unpack>true</unpack>

-            <!--

-            <includes>

-                <include>org.apache.ode:ode-dao-jpa-ojpa-derby-*</include>

-            </includes>

-            -->

-            <scope>runtime</scope>

-        </dependencySet>

-    </dependencySets>

-

-</component>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-openejb.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-openejb.xml
deleted file mode 100644
index 596ee0b55a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-openejb.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    *

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    *

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

--->

-<component>

-

-    <dependencySets>

-        <!-- Add scatours-util-openejb-runtime.jar to the util directory -->

-        <dependencySet>

-            <useProjectArtifact>false</useProjectArtifact>

-            <outputDirectory>util</outputDirectory>

-            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>

-            <unpack>false</unpack>

-            <includes>

-                <include>org.apache.tuscany.sca:scatours-util-openejb-runtime</include>

-            </includes>

-            <scope>runtime</scope>

-        </dependencySet>

-

-        <!-- Add the OpenEJB runtime dependencies to the openejb directory -->

-        <dependencySet>

-            <useProjectArtifact>false</useProjectArtifact>

-            <outputDirectory>openejb</outputDirectory>

-            <unpack>false</unpack>

-            <excludes>

-                <exclude>org.apache.tuscany.sca:scatours-util-openejb-runtime</exclude>

-            </excludes>

-            <scope>runtime</scope>

-        </dependencySet>

-    </dependencySets>

-

-</component>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml
deleted file mode 100644
index 90db09cfbe..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-selfcontained.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    *

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    *

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.

--->

-<component>

-

-    <files>

-        <file>

-            <source>../src/main/resources/build-defs-selfcontained.xml</source>

-            <outputDirectory>util</outputDirectory>

-            <destName>build-defs.xml</destName>

-        </file>

-    </files>

-

-    <dependencySets>

-        <!-- Add all the Tuscany dependencies to the lib directory -->

-        <dependencySet>

-            <useProjectArtifact>false</useProjectArtifact>

-            <outputDirectory>lib</outputDirectory>

-            <unpack>false</unpack>

-            <excludes>

-                <exclude>org.apache.tuscany.sca:scatours*</exclude>

-            </excludes>

-            <scope>runtime</scope>

-        </dependencySet>

-    </dependencySets>

-

-</component>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/release/bin/INSTALL b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/release/bin/INSTALL
deleted file mode 100644
index 7514a7c73c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/release/bin/INSTALL
+++ /dev/null
@@ -1,24 +0,0 @@
-Installing the Apache Tuscany SCA 2.0-M3 June 2009 Release binary distribution

-===============================================================================

-

-Unzip Tuscany binary distribution archive and you get the following:

-

-tuscany-sca-2.0-M3     

-   CHANGES       - A note of the major changes in this release   

-   INSTALL       - this help file

-   LICENSE       - the Apache License and any dependecy licenses

-   NOTICE        - attribution notices associated with the licenses

-   README        - readme for the release

-   RELEASE_NOTES - description of this release 

-

-   /bin          - Tuscany launcher (for use when running tuscany from the command line)

-

-   /features     - OSGi runtime configuration, Tuscany manifest and PDE target

-

-   /modules      - all of the individual Tuscany jars and their dependencies

-

-   /samples      - all the Tuscany samples, see the README in that directory

-

-

-

-

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/release/bin/LICENSE b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/release/bin/LICENSE
deleted file mode 100644
index a1c5f8d2e6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/release/bin/LICENSE
+++ /dev/null
@@ -1,1672 +0,0 @@
-

-                                 Apache License

-                           Version 2.0, January 2004

-                        http://www.apache.org/licenses/

-

-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-

-   1. Definitions.

-

-      "License" shall mean the terms and conditions for use, reproduction,

-      and distribution as defined by Sections 1 through 9 of this document.

-

-      "Licensor" shall mean the copyright owner or entity authorized by

-      the copyright owner that is granting the License.

-

-      "Legal Entity" shall mean the union of the acting entity and all

-      other entities that control, are controlled by, or are under common

-      control with that entity. For the purposes of this definition,

-      "control" means (i) the power, direct or indirect, to cause the

-      direction or management of such entity, whether by contract or

-      otherwise, or (ii) ownership of fifty percent (50%) or more of the

-      outstanding shares, or (iii) beneficial ownership of such entity.

-

-      "You" (or "Your") shall mean an individual or Legal Entity

-      exercising permissions granted by this License.

-

-      "Source" form shall mean the preferred form for making modifications,

-      including but not limited to software source code, documentation

-      source, and configuration files.

-

-      "Object" form shall mean any form resulting from mechanical

-      transformation or translation of a Source form, including but

-      not limited to compiled object code, generated documentation,

-      and conversions to other media types.

-

-      "Work" shall mean the work of authorship, whether in Source or

-      Object form, made available under the License, as indicated by a

-      copyright notice that is included in or attached to the work

-      (an example is provided in the Appendix below).

-

-      "Derivative Works" shall mean any work, whether in Source or Object

-      form, that is based on (or derived from) the Work and for which the

-      editorial revisions, annotations, elaborations, or other modifications

-      represent, as a whole, an original work of authorship. For the purposes

-      of this License, Derivative Works shall not include works that remain

-      separable from, or merely link (or bind by name) to the interfaces of,

-      the Work and Derivative Works thereof.

-

-      "Contribution" shall mean any work of authorship, including

-      the original version of the Work and any modifications or additions

-      to that Work or Derivative Works thereof, that is intentionally

-      submitted to Licensor for inclusion in the Work by the copyright owner

-      or by an individual or Legal Entity authorized to submit on behalf of

-      the copyright owner. For the purposes of this definition, "submitted"

-      means any form of electronic, verbal, or written communication sent

-      to the Licensor or its representatives, including but not limited to

-      communication on electronic mailing lists, source code control systems,

-      and issue tracking systems that are managed by, or on behalf of, the

-      Licensor for the purpose of discussing and improving the Work, but

-      excluding communication that is conspicuously marked or otherwise

-      designated in writing by the copyright owner as "Not a Contribution."

-

-      "Contributor" shall mean Licensor and any individual or Legal Entity

-      on behalf of whom a Contribution has been received by Licensor and

-      subsequently incorporated within the Work.

-

-   2. Grant of Copyright License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      copyright license to reproduce, prepare Derivative Works of,

-      publicly display, publicly perform, sublicense, and distribute the

-      Work and such Derivative Works in Source or Object form.

-

-   3. Grant of Patent License. Subject to the terms and conditions of

-      this License, each Contributor hereby grants to You a perpetual,

-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable

-      (except as stated in this section) patent license to make, have made,

-      use, offer to sell, sell, import, and otherwise transfer the Work,

-      where such license applies only to those patent claims licensable

-      by such Contributor that are necessarily infringed by their

-      Contribution(s) alone or by combination of their Contribution(s)

-      with the Work to which such Contribution(s) was submitted. If You

-      institute patent litigation against any entity (including a

-      cross-claim or counterclaim in a lawsuit) alleging that the Work

-      or a Contribution incorporated within the Work constitutes direct

-      or contributory patent infringement, then any patent licenses

-      granted to You under this License for that Work shall terminate

-      as of the date such litigation is filed.

-

-   4. Redistribution. You may reproduce and distribute copies of the

-      Work or Derivative Works thereof in any medium, with or without

-      modifications, and in Source or Object form, provided that You

-      meet the following conditions:

-

-      (a) You must give any other recipients of the Work or

-          Derivative Works a copy of this License; and

-

-      (b) You must cause any modified files to carry prominent notices

-          stating that You changed the files; and

-

-      (c) You must retain, in the Source form of any Derivative Works

-          that You distribute, all copyright, patent, trademark, and

-          attribution notices from the Source form of the Work,

-          excluding those notices that do not pertain to any part of

-          the Derivative Works; and

-

-      (d) If the Work includes a "NOTICE" text file as part of its

-          distribution, then any Derivative Works that You distribute must

-          include a readable copy of the attribution notices contained

-          within such NOTICE file, excluding those notices that do not

-          pertain to any part of the Derivative Works, in at least one

-          of the following places: within a NOTICE text file distributed

-          as part of the Derivative Works; within the Source form or

-          documentation, if provided along with the Derivative Works; or,

-          within a display generated by the Derivative Works, if and

-          wherever such third-party notices normally appear. The contents

-          of the NOTICE file are for informational purposes only and

-          do not modify the License. You may add Your own attribution

-          notices within Derivative Works that You distribute, alongside

-          or as an addendum to the NOTICE text from the Work, provided

-          that such additional attribution notices cannot be construed

-          as modifying the License.

-

-      You may add Your own copyright statement to Your modifications and

-      may provide additional or different license terms and conditions

-      for use, reproduction, or distribution of Your modifications, or

-      for any such Derivative Works as a whole, provided Your use,

-      reproduction, and distribution of the Work otherwise complies with

-      the conditions stated in this License.

-

-   5. Submission of Contributions. Unless You explicitly state otherwise,

-      any Contribution intentionally submitted for inclusion in the Work

-      by You to the Licensor shall be under the terms and conditions of

-      this License, without any additional terms or conditions.

-      Notwithstanding the above, nothing herein shall supersede or modify

-      the terms of any separate license agreement you may have executed

-      with Licensor regarding such Contributions.

-

-   6. Trademarks. This License does not grant permission to use the trade

-      names, trademarks, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed 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.

-

-

-===============================================================================

-

-APACHE TUSCANY SUBCOMPONENTS: 

-

-The Apache Tuscany binary distribution includes a number of subcomponents

-with separate copyright notices and license terms. Your use of the

-code for the these subcomponents is subject to the terms and

-conditions of the following licenses.                             

-

-===============================================================================

-

-The following components come under Apache Software License 2.0

-
- abdera-client-0.4.0-incubating.jar
- abdera-core-0.4.0-incubating.jar
- abdera-extensions-html-0.4.0-incubating.jar
- abdera-extensions-json-0.4.0-incubating.jar
- abdera-extensions-main-0.4.0-incubating.jar
- abdera-i18n-0.4.0-incubating.jar
- abdera-parser-0.4.0-incubating.jar
- abdera-server-0.4.0-incubating.jar

- addressing-1.3.mar

- aopalliance-1.0.jar

- annogen-0.1.0.jar

- axiom-api-1.2.7.jar

- axiom-dom-1.2.7.jar

- axiom-impl-1.2.7.jar

- axis2-codegen-1.4.1.jar

- axis2-kernel-1.4.1.jar

- axis2-java2wsdl-1.4.1.jar

- axis2-mtompolicy-1.4.1.jar

- axis-ant-1.4.jar

- cglib-2.2.jar

- commons-beanutils-1.7.0.jar

- commons-cli-1.2.jar

- commons-collections-3.2.jar

- commons-codec-1.3.jar

- commons-digester-1.8.jar

- commons-discovery-0.4.jar

- commons-fileupload-1.2.jar

- commons-httpclient-3.1.jar

- commons-io-1.4.jar

- commons-lang-2.3.jar

- commons-logging-1.1.1.jar

- commons-pool-1.3.jar

- derby-10.4.1.3.jar

- geronimo-activation_1.1_spec-1.0.1.jar

- geronimo-connector-2.0.1.jar

- geronimo-ejb_2.1_spec-1.1.jar

- geronimo-el_1.0_spec-1.0.1.jar

- geronimo-javamail_1.4_spec-1.2.jar

- geronimo-jms_1.1_spec-1.1.jar

- geronimo-jpa_3.0_spec-1.0.jar

- geronimo-jsp_2.1_spec-1.0.1.jar

- geronimo-jta_1.1_spec-1.1.jar

- geronimo-j2ee-connector_1.5_spec-1.1.1.jar

- geronimo-kernel-2.0.1.jar

- geronimo-stax-api_1.0_spec-1.0.1.jar

- geronimo-transaction-2.0.1.jar

- httpclient-4.0.jar

- httpcore-4.0.1.jar

- httpcore-nio-4.0.1.jar

- jabsorb-1.3.1.jar

- jackson-core-asl-1.2.1.jar

- jackson-mapper-asl-1.2.1.jar

- jettison-1.1.jar

- jetty-6.1.19.jar

- jetty-util-6.1.19.jar

- juli-6.0.18.jar

- log4j-1.2.15.jar

- mex-1.41-impl.jar

- myfaces-api-1.2.2.jar

- myfaces-impl-1.2.2.jar

- neethi-2.0.4.jar

- ode-agents-1.3.2.jar

- ode-bpel-api-1.3.2.jar

- ode-bpel-compiler-1.3.2.jar

- ode-bpel-dao-1.3.2.jar

- ode-bpel-epr-1.3.2.jar

- ode-bpel-obj-1.3.2.jar

- ode-bpel-runtime-1.3.2.jar

- ode-bpel-schemas-1.3.2.jar

- ode-bpel-store-1.3.2.jar

- ode-dao-hibernate-1.3.2.jar

- ode-dao-jpa-1.3.2.jar

- ode-jacob-1.3.2.jar

- ode-jacob-ap-1.3.2.jar

- ode-scheduler-simple-1.3.2.jar

- ode-utils-1.3.2.jar

- openjpa-1.2.1.jar

- rampart-core-1.4.jar

- rampart-policy-1.4.jar

- rampart-trust-1.4.jar

- regexp-1.3.jar

- spring-beans-2.5.5.jar

- spring-context-2.5.5.jar

- spring-core-2.5.5.jar

- stripes-1.5.jar

- tranql-connector-1.1.jar

- tribes-6.0.18.jar

- woden-api-1.0M8.jar

- woden-impl-dom-1.0M8.jar

- wss4j-1.5.4.jar

- wstx-asl-3.2.4.jar

- xalan-2.7.0.jar

- xercesImpl-2.8.1.jar

- xmlbeans-2.3.0.jar

- xmlsec-1.4.2.jar

- XmlSchema-1.4.2.jar

-

-===============================================================================

-The serp-1.13.1.jar is distributed under the BSD license with the following copyright:

-

- Copyright (c) 2002, A. Abram White

- All rights reserved.

-

-BSD license:

-

- Redistribution and use in source and binary forms, with or without 

- modification, are permitted provided that the following conditions are met:

- 

-  - Redistributions of source code must retain the above copyright notice, this 

-    list of conditions and the following disclaimer.

- 

-  - Redistributions in binary form must reproduce the above copyright notice, 

-    this list of conditions and the following disclaimer in the documentation 

-    and/or other materials provided with the distribution.

- 

-  - Neither the name of the Sun Microsystems, Inc. nor the names of 

-    contributors may be used to endorse or promote products derived from this 

-    software without specific prior written permission.

- 

- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 

- CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 

- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 

- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 

- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 

- COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 

- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 

- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 

- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF 

- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 

- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 

- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 

- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 

- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 

- DAMAGE. 

-

-================================================================================

-

-dom4j-1.6.1.jar

-

-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.

-

-Redistribution and use of this software and associated documentation

-("Software"), with or without modification, are permitted provided

-that the following conditions are met:

-

-1. Redistributions of source code must retain copyright

-   statements and notices.  Redistributions must also contain a

-   copy of this document.

- 

-2. Redistributions in binary form must reproduce the

-   above copyright notice, this list of conditions and the

-   following disclaimer in the documentation and/or other

-   materials provided with the distribution.

- 

-3. The name "DOM4J" must not be used to endorse or promote

-   products derived from this Software without prior written

-   permission of MetaStuff, Ltd.  For written permission,

-   please contact dom4j-info@metastuff.com.

- 

-4. Products derived from this Software may not be called "DOM4J"

-   nor may "DOM4J" appear in their names without prior written

-   permission of MetaStuff, Ltd. DOM4J is a registered

-   trademark of MetaStuff, Ltd.

- 

-5. Due credit should be given to the DOM4J Project - 

-   http://www.dom4j.org

- 

-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS

-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT

-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL

-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,

-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR

-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

-OF THE POSSIBILITY OF SUCH DAMAGE.

-

-===============================================================================

-The Equinox OSGi Runtime jars;

-   osgi-3.5.0-v20090520.jar

-   common-3.5.0-v20090520-1800.jar

-   services-3.2.0-v20090520-1800.jar

-

-Eclipse Public License - v 1.0

-

-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF

-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

-

-1. DEFINITIONS

-

-"Contribution" means:

-

-a) in the case of the initial Contributor, the initial code and

-documentation distributed under this Agreement, and

-b) in the case of each subsequent Contributor:

-

-i) changes to the Program, and

-

-ii) additions to the Program;

-

-where such changes and/or additions to the Program originate from and

-are distributed by that particular Contributor. A Contribution

-'originates' from a Contributor if it was added to the Program by such

-Contributor itself or anyone acting on such Contributor's behalf.

-Contributions do not include additions to the Program which: (i) are

-separate modules of software distributed in conjunction with the

-Program under their own license agreement, and (ii) are not derivative

-works of the Program.

-

-"Contributor" means any person or entity that distributes the Program.

-

-"Licensed Patents " mean patent claims licensable by a Contributor

-which are necessarily infringed by the use or sale of its Contribution

-alone or when combined with the Program.

-

-"Program" means the Contributions distributed in accordance with this 

-Agreement.

-

-"Recipient" means anyone who receives the Program under this

-Agreement, including all Contributors.

-

-2. GRANT OF RIGHTS

-

-a) Subject to the terms of this Agreement, each Contributor hereby

-grants Recipient a non-exclusive, worldwide, royalty-free copyright

-license to reproduce, prepare derivative works of, publicly display,

-publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and

-object code form.

-

-b) Subject to the terms of this Agreement, each Contributor hereby

-grants Recipient a non-exclusive, worldwide, royalty-free patent

-license under Licensed Patents to make, use, sell, offer to sell,

-import and otherwise transfer the Contribution of such Contributor, if

-any, in source code and object code form. This patent license shall

-apply to the combination of the Contribution and the Program if, at

-the time the Contribution is added by the Contributor, such addition

-of the Contribution causes such combination to be covered by the

-Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.

-

-c) Recipient understands that although each Contributor grants the

-licenses to its Contributions set forth herein, no assurances are

-provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow

-Recipient to distribute the Program, it is Recipient's responsibility

-to acquire that license before distributing the Program.

-

-d) Each Contributor represents that to its knowledge it has sufficient

-copyright rights in its Contribution, if any, to grant the copyright

-license set forth in this Agreement.

-

-3. REQUIREMENTS

-

-A Contributor may choose to distribute the Program in object code form

-under its own license agreement, provided that:

-

-a) it complies with the terms and conditions of this Agreement; and

-

-b) its license agreement:

-

-i) effectively disclaims on behalf of all Contributors all warranties

-and conditions, express and implied, including warranties or

-conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;

-

-ii) effectively excludes on behalf of all Contributors all liability

-for damages, including direct, indirect, special, incidental and

-consequential damages, such as lost profits;

-

-iii) states that any provisions which differ from this Agreement are

-offered by that Contributor alone and not by any other party; and

-

-iv) states that source code for the Program is available from such

-Contributor, and informs licensees how to obtain it in a reasonable

-manner on or through a medium customarily used for software exchange.

-

-When the Program is made available in source code form:

-

-a) it must be made available under this Agreement; and

-

-b) a copy of this Agreement must be included with each copy of the 

-Program.

-

-Contributors may not remove or alter any copyright notices contained

-within the Program.

-

-Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.

-

-4. COMMERCIAL DISTRIBUTION

-

-Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a

-commercial product offering should do so in a manner which does not

-create potential liability for other Contributors. Therefore, if a

-Contributor includes the Program in a commercial product offering,

-such Contributor ("Commercial Contributor") hereby agrees to defend

-and indemnify every other Contributor ("Indemnified Contributor")

-against any losses, damages and costs (collectively "Losses") arising

-from claims, lawsuits and other legal actions brought by a third party

-against the Indemnified Contributor to the extent caused by the acts

-or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement.

-In order to qualify, an Indemnified Contributor must: a) promptly

-notify the Commercial Contributor in writing of such claim, and b)

-allow the Commercial Contributor to control, and cooperate with the

-Commercial Contributor in, the defense and any related settlement

-negotiations. The Indemnified Contributor may participate in any such

-claim at its own expense.

-

-For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.

-

-5. NO WARRANTY

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY

-WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY

-OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable

-laws, damage to or loss of data, programs or equipment, and

-unavailability or interruption of operations.

-

-6. DISCLAIMER OF LIABILITY

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR

-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

-

-7. GENERAL

-

-If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further

-action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.

-

-If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that

-the Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of

-the date such litigation is filed.

-

-All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of

-time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use

-and distribution of the Program as soon as reasonably practicable.

-However, Recipient's obligations under this Agreement and any licenses

-granted by Recipient relating to the Program shall continue and

-survive.

-

-Everyone is permitted to copy and distribute copies of this Agreement,

-but in order to avoid inconsistency the Agreement is copyrighted and

-may only be modified in the following manner. The Agreement Steward

-reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement

-Steward has the right to modify this Agreement. The Eclipse Foundation

-is the initial Agreement Steward. The Eclipse Foundation may assign

-the responsibility to serve as the Agreement Steward to a suitable

-separate entity. Each new version of the Agreement will be given a

-distinguishing version number. The Program (including Contributions)

-may always be distributed subject to the version of the Agreement

-under which it was received. In addition, after a new version of the

-Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives

-no rights or licenses to the intellectual property of any Contributor

-under this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.

-

-This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No

-party to this Agreement will bring a legal action under this Agreement

-more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.

-

-===============================================================================

-

-The howl-1.0.1-1.jar is distributed under the BSD license:

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions

-are met:

-

-  * Redistributions of source code must retain the above copyright

-    notice, this list of conditions and the following disclaimer.

-    

-  * Redistributions in binary form must reproduce the above copyright

-    notice, this list of conditions and the following disclaimer in the

-    documentation and/or other materials provided with the distribution.

-    

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-================================================================================

-

-The jars; 

-activation-1.1.jar, 

-jaxb-api-2.1.jar, 

-jaxb-impl-2.1.12.jar, 

-jaxws-api-2.1.jar, 

-jsr181-api-1.0-MR1.jar, 

-jsr250-api-1.0.jar, 

-jstl-1.1.2.jar,

-mail-1.4.jar, 

-servlet-api-2.5.jar, 

-

-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0

-

-

-      1. Definitions.

-

-            1.1. "Contributor" means each individual or entity that

-            creates or contributes to the creation of Modifications.

-

-            1.2. "Contributor Version" means the combination of the

-            Original Software, prior Modifications used by a

-            Contributor (if any), and the Modifications made by that

-            particular Contributor.

-

-            1.3. "Covered Software" means (a) the Original Software, or

-            (b) Modifications, or (c) the combination of files

-            containing Original Software with files containing

-            Modifications, in each case including portions thereof.

-

-            1.4. "Executable" means the Covered Software in any form

-            other than Source Code. 

-

-            1.5. "Initial Developer" means the individual or entity

-            that first makes Original Software available under this

-            License. 

-            

-            1.6. "Larger Work" means a work which combines Covered

-            Software or portions thereof with code not governed by the

-            terms of this License.

-

-            1.7. "License" means this document.

-

-            1.8. "Licensable" means having the right to grant, to the

-            maximum extent possible, whether at the time of the initial

-            grant or subsequently acquired, any and all of the rights

-            conveyed herein.

-            

-            1.9. "Modifications" means the Source Code and Executable

-            form of any of the following: 

-

-                  A. Any file that results from an addition to,

-                  deletion from or modification of the contents of a

-                  file containing Original Software or previous

-                  Modifications; 

-

-                  B. Any new file that contains any part of the

-                  Original Software or previous Modification; or 

-

-                  C. Any new file that is contributed or otherwise made

-                  available under the terms of this License.

-

-            1.10. "Original Software" means the Source Code and

-            Executable form of computer software code that is

-            originally released under this License. 

-

-            1.11. "Patent Claims" means any patent claim(s), now owned

-            or hereafter acquired, including without limitation,

-            method, process, and apparatus claims, in any patent

-            Licensable by grantor. 

-

-            1.12. "Source Code" means (a) the common form of computer

-            software code in which modifications are made and (b)

-            associated documentation included in or with such code.

-

-            1.13. "You" (or "Your") means an individual or a legal

-            entity exercising rights under, and complying with all of

-            the terms of, this License. For legal entities, "You"

-            includes any entity which controls, is controlled by, or is

-            under common control with You. For purposes of this

-            definition, "control" means (a) the power, direct or

-            indirect, to cause the direction or management of such

-            entity, whether by contract or otherwise, or (b) ownership

-            of more than fifty percent (50%) of the outstanding shares

-            or beneficial ownership of such entity.

-

-      2. License Grants. 

-

-            2.1. The Initial Developer Grant.

-

-            Conditioned upon Your compliance with Section 3.1 below and

-            subject to third party intellectual property claims, the

-            Initial Developer hereby grants You a world-wide,

-            royalty-free, non-exclusive license: 

-

-                  (a) under intellectual property rights (other than

-                  patent or trademark) Licensable by Initial Developer,

-                  to use, reproduce, modify, display, perform,

-                  sublicense and distribute the Original Software (or

-                  portions thereof), with or without Modifications,

-                  and/or as part of a Larger Work; and 

-

-                  (b) under Patent Claims infringed by the making,

-                  using or selling of Original Software, to make, have

-                  made, use, practice, sell, and offer for sale, and/or

-                  otherwise dispose of the Original Software (or

-                  portions thereof). 

-

-                  (c) The licenses granted in Sections 2.1(a) and (b)

-                  are effective on the date Initial Developer first

-                  distributes or otherwise makes the Original Software

-                  available to a third party under the terms of this

-                  License. 

-

-                  (d) Notwithstanding Section 2.1(b) above, no patent

-                  license is granted: (1) for code that You delete from

-                  the Original Software, or (2) for infringements

-                  caused by: (i) the modification of the Original

-                  Software, or (ii) the combination of the Original

-                  Software with other software or devices. 

-

-            2.2. Contributor Grant.

-

-            Conditioned upon Your compliance with Section 3.1 below and

-            subject to third party intellectual property claims, each

-            Contributor hereby grants You a world-wide, royalty-free,

-            non-exclusive license:

-

-                  (a) under intellectual property rights (other than

-                  patent or trademark) Licensable by Contributor to

-                  use, reproduce, modify, display, perform, sublicense

-                  and distribute the Modifications created by such

-                  Contributor (or portions thereof), either on an

-                  unmodified basis, with other Modifications, as

-                  Covered Software and/or as part of a Larger Work; and

-                  

-

-                  (b) under Patent Claims infringed by the making,

-                  using, or selling of Modifications made by that

-                  Contributor either alone and/or in combination with

-                  its Contributor Version (or portions of such

-                  combination), to make, use, sell, offer for sale,

-                  have made, and/or otherwise dispose of: (1)

-                  Modifications made by that Contributor (or portions

-                  thereof); and (2) the combination of Modifications

-                  made by that Contributor with its Contributor Version

-                  (or portions of such combination). 

-

-                  (c) The licenses granted in Sections 2.2(a) and

-                  2.2(b) are effective on the date Contributor first

-                  distributes or otherwise makes the Modifications

-                  available to a third party. 

-

-                  (d) Notwithstanding Section 2.2(b) above, no patent

-                  license is granted: (1) for any code that Contributor

-                  has deleted from the Contributor Version; (2) for

-                  infringements caused by: (i) third party

-                  modifications of Contributor Version, or (ii) the

-                  combination of Modifications made by that Contributor

-                  with other software (except as part of the

-                  Contributor Version) or other devices; or (3) under

-                  Patent Claims infringed by Covered Software in the

-                  absence of Modifications made by that Contributor. 

-

-      3. Distribution Obligations.

-

-            3.1. Availability of Source Code.

-

-            Any Covered Software that You distribute or otherwise make

-            available in Executable form must also be made available in

-            Source Code form and that Source Code form must be

-            distributed only under the terms of this License. You must

-            include a copy of this License with every copy of the

-            Source Code form of the Covered Software You distribute or

-            otherwise make available. You must inform recipients of any

-            such Covered Software in Executable form as to how they can

-            obtain such Covered Software in Source Code form in a

-            reasonable manner on or through a medium customarily used

-            for software exchange.

-

-            3.2. Modifications.

-

-            The Modifications that You create or to which You

-            contribute are governed by the terms of this License. You

-            represent that You believe Your Modifications are Your

-            original creation(s) and/or You have sufficient rights to

-            grant the rights conveyed by this License.

-

-            3.3. Required Notices.

-

-            You must include a notice in each of Your Modifications

-            that identifies You as the Contributor of the Modification.

-            You may not remove or alter any copyright, patent or

-            trademark notices contained within the Covered Software, or

-            any notices of licensing or any descriptive text giving

-            attribution to any Contributor or the Initial Developer.

-

-            3.4. Application of Additional Terms.

-

-            You may not offer or impose any terms on any Covered

-            Software in Source Code form that alters or restricts the

-            applicable version of this License or the recipients'

-            rights hereunder. You may choose to offer, and to charge a

-            fee for, warranty, support, indemnity or liability

-            obligations to one or more recipients of Covered Software.

-            However, you may do so only on Your own behalf, and not on

-            behalf of the Initial Developer or any Contributor. You

-            must make it absolutely clear that any such warranty,

-            support, indemnity or liability obligation is offered by

-            You alone, and You hereby agree to indemnify the Initial

-            Developer and every Contributor for any liability incurred

-            by the Initial Developer or such Contributor as a result of

-            warranty, support, indemnity or liability terms You offer.

-          

-

-            3.5. Distribution of Executable Versions.

-

-            You may distribute the Executable form of the Covered

-            Software under the terms of this License or under the terms

-            of a license of Your choice, which may contain terms

-            different from this License, provided that You are in

-            compliance with the terms of this License and that the

-            license for the Executable form does not attempt to limit

-            or alter the recipient's rights in the Source Code form

-            from the rights set forth in this License. If You

-            distribute the Covered Software in Executable form under a

-            different license, You must make it absolutely clear that

-            any terms which differ from this License are offered by You

-            alone, not by the Initial Developer or Contributor. You

-            hereby agree to indemnify the Initial Developer and every

-            Contributor for any liability incurred by the Initial

-            Developer or such Contributor as a result of any such terms

-            You offer.

-

-            3.6. Larger Works.

-

-            You may create a Larger Work by combining Covered Software

-            with other code not governed by the terms of this License

-            and distribute the Larger Work as a single product. In such

-            a case, You must make sure the requirements of this License

-            are fulfilled for the Covered Software. 

-            

-      4. Versions of the License. 

-

-            4.1. New Versions.

-

-            Sun Microsystems, Inc. is the initial license steward and

-            may publish revised and/or new versions of this License

-            from time to time. Each version will be given a

-            distinguishing version number. Except as provided in

-            Section 4.3, no one other than the license steward has the

-            right to modify this License. 

-

-            4.2. Effect of New Versions.

-

-            You may always continue to use, distribute or otherwise

-            make the Covered Software available under the terms of the

-            version of the License under which You originally received

-            the Covered Software. If the Initial Developer includes a

-            notice in the Original Software prohibiting it from being

-            distributed or otherwise made available under any

-            subsequent version of the License, You must distribute and

-            make the Covered Software available under the terms of the

-            version of the License under which You originally received

-            the Covered Software. Otherwise, You may also choose to

-            use, distribute or otherwise make the Covered Software

-            available under the terms of any subsequent version of the

-            License published by the license steward. 

-

-            4.3. Modified Versions.

-

-            When You are an Initial Developer and You want to create a

-            new license for Your Original Software, You may create and

-            use a modified version of this License if You: (a) rename

-            the license and remove any references to the name of the

-            license steward (except to note that the license differs

-            from this License); and (b) otherwise make it clear that

-            the license contains terms which differ from this License.

-            

-

-      5. DISCLAIMER OF WARRANTY.

-

-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"

-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,

-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED

-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR

-      PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND

-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY

-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE

-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF

-      ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF

-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF

-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS

-      DISCLAIMER. 

-

-      6. TERMINATION. 

-

-            6.1. This License and the rights granted hereunder will

-            terminate automatically if You fail to comply with terms

-            herein and fail to cure such breach within 30 days of

-            becoming aware of the breach. Provisions which, by their

-            nature, must remain in effect beyond the termination of

-            this License shall survive.

-

-            6.2. If You assert a patent infringement claim (excluding

-            declaratory judgment actions) against Initial Developer or

-            a Contributor (the Initial Developer or Contributor against

-            whom You assert such claim is referred to as "Participant")

-            alleging that the Participant Software (meaning the

-            Contributor Version where the Participant is a Contributor

-            or the Original Software where the Participant is the

-            Initial Developer) directly or indirectly infringes any

-            patent, then any and all rights granted directly or

-            indirectly to You by such Participant, the Initial

-            Developer (if the Initial Developer is not the Participant)

-            and all Contributors under Sections 2.1 and/or 2.2 of this

-            License shall, upon 60 days notice from Participant

-            terminate prospectively and automatically at the expiration

-            of such 60 day notice period, unless if within such 60 day

-            period You withdraw Your claim with respect to the

-            Participant Software against such Participant either

-            unilaterally or pursuant to a written agreement with

-            Participant.

-

-            6.3. In the event of termination under Sections 6.1 or 6.2

-            above, all end user licenses that have been validly granted

-            by You or any distributor hereunder prior to termination

-            (excluding licenses granted to You by any distributor)

-            shall survive termination.

-

-      7. LIMITATION OF LIABILITY.

-

-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT

-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE

-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF

-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE

-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR

-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT

-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK

-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER

-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN

-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF

-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL

-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT

-      APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO

-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR

-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT

-      APPLY TO YOU.

-

-      8. U.S. GOVERNMENT END USERS.

-

-      The Covered Software is a "commercial item," as that term is

-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial

-      computer software" (as that term is defined at 48 C.F.R. 

-      252.227-7014(a)(1)) and "commercial computer software

-      documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.

-      1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1

-      through 227.7202-4 (June 1995), all U.S. Government End Users

-      acquire Covered Software with only those rights set forth herein.

-      This U.S. Government Rights clause is in lieu of, and supersedes,

-      any other FAR, DFAR, or other clause or provision that addresses

-      Government rights in computer software under this License.

-

-      9. MISCELLANEOUS.

-

-      This License represents the complete agreement concerning subject

-      matter hereof. If any provision of this License is held to be

-      unenforceable, such provision shall be reformed only to the

-      extent necessary to make it enforceable. This License shall be

-      governed by the law of the jurisdiction specified in a notice

-      contained within the Original Software (except to the extent

-      applicable law, if any, provides otherwise), excluding such

-      jurisdiction's conflict-of-law provisions. Any litigation

-      relating to this License shall be subject to the jurisdiction of

-      the courts located in the jurisdiction and venue specified in a

-      notice contained within the Original Software, with the losing

-      party responsible for costs, including, without limitation, court

-      costs and reasonable attorneys' fees and expenses. The

-      application of the United Nations Convention on Contracts for the

-      International Sale of Goods is expressly excluded. Any law or

-      regulation which provides that the language of a contract shall

-      be construed against the drafter shall not apply to this License.

-      You agree that You alone are responsible for compliance with the

-      United States export administration regulations (and the export

-      control laws and regulation of any other countries) when You use,

-      distribute or otherwise make available any Covered Software.

-

-      10. RESPONSIBILITY FOR CLAIMS.

-

-      As between Initial Developer and the Contributors, each party is

-      responsible for claims and damages arising, directly or

-      indirectly, out of its utilization of rights under this License

-      and You agree to work with Initial Developer and Contributors to

-      distribute such responsibility on an equitable basis. Nothing

-      herein is intended or shall be deemed to constitute any admission

-      of liability.

-

-===============================================================================

-

-WSDL4j (wsdl4j-1.6.2.jar):

-

-Common Public License - v 1.0

-

-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

-

-1. DEFINITIONS

-

-"Contribution" means:

-

-      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and

-      b) in the case of each subsequent Contributor:

-

-      i) changes to the Program, and

-

-      ii) additions to the Program;

-

-      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 

-

-"Contributor" means any person or entity that distributes the Program.

-

-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.

-

-"Program" means the Contributions distributed in accordance with this Agreement.

-

-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.

-

-2. GRANT OF RIGHTS

-

-      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.

-

-      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 

-

-      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.

-

-      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 

-

-3. REQUIREMENTS

-

-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:

-

-      a) it complies with the terms and conditions of this Agreement; and

-

-      b) its license agreement:

-

-      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 

-

-      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 

-

-      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and

-

-      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 

-

-When the Program is made available in source code form:

-

-      a) it must be made available under this Agreement; and 

-

-      b) a copy of this Agreement must be included with each copy of the Program. 

-

-Contributors may not remove or alter any copyright notices contained within the Program.

-

-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.

-

-4. COMMERCIAL DISTRIBUTION

-

-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.

-

-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.

-

-5. NO WARRANTY

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.

-

-6. DISCLAIMER OF LIABILITY

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

-

-7. GENERAL

-

-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.

-

-If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.

-

-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.

-

-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.

-

-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 

-

-===============================================================================

-

-backport-util-concurrent-3.1.jar :

-

-The software comprising backport-util-concurrent is based in large

-part on the code from JSR166, and the package dl.util.concurrent.

-The software has been released to the public domain, as explained at:

-http://creativecommons.org/licenses/publicdomain, excepting portions

-of the class

-edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList,

-which were adapted from class java.util.ArrayList, written by Sun

-Microsystems, Inc, which are used with kind permission, and subject

-to the following:

-

-Copyright 2002-2004 Sun Microsystems, Inc. All rights reserved. Use is

-subject to the following license terms.

-

-  "Sun hereby grants you a non-exclusive, worldwide, non-transferrable

-  license to use and distribute the Java Software technologies as part

-  of a larger work in source and binary forms, with or without

-  modification, provided that the following conditions are met:

-

-   -Neither the name of or trademarks of Sun may be used to endorse or

-    promote products derived from the Java Software technology without

-    specific prior written permission.

-

-   -Redistributions of source or binary code must be accompanied by the

-    following notice and disclaimers:

-

-    Portions copyright Sun Microsystems, Inc. Used with kind permission.

-

-    This software is provided AS IS, without a warranty of any kind.  ALL

-    EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND

-    WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF

-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PUPOSE OR

-    NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN

-    MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE

-    FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF

-    USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS

-    DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR

-    ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR

-    DATA, OR FOR DIRECT, INDIRECT,CONSQUENTIAL, INCIDENTAL

-    OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF

-    THE THEORY OR LIABILITY, ARISING OUT OF THE USE OF OR

-    INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.

-    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

-

-    You acknowledge that Software is not designed, licensed or intended for

-    use in the design, construction, operation or maintenance of any nuclear

-    facility."

-

-===============================================================================

-

-jdom-1.0.jar :

-

-$Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $

-

- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.

- All rights reserved.

- 

- Redistribution and use in source and binary forms, with or without

- modification, are permitted provided that the following conditions

- are met:

- 

- 1. Redistributions of source code must retain the above copyright

-    notice, this list of conditions, and the following disclaimer.

- 

- 2. Redistributions in binary form must reproduce the above copyright

-    notice, this list of conditions, and the disclaimer that follows 

-    these conditions in the documentation and/or other materials 

-    provided with the distribution.

-

- 3. The name "JDOM" must not be used to endorse or promote products

-    derived from this software without prior written permission.  For

-    written permission, please contact <request_AT_jdom_DOT_org>.

- 

- 4. Products derived from this software may not be called "JDOM", nor

-    may "JDOM" appear in their name, without prior written permission

-    from the JDOM Project Management <request_AT_jdom_DOT_org>.

- 

- In addition, we request (but do not require) that you include in the 

- end-user documentation provided with the redistribution and/or in the 

- software itself an acknowledgement equivalent to the following:

-     "This product includes software developed by the

-      JDOM Project (http://www.jdom.org/)."

- Alternatively, the acknowledgment may be graphical using the logos 

- available at http://www.jdom.org/images/logos.

-

- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED

- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT

- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF

- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,

- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT

- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- SUCH DAMAGE.

-

- This software consists of voluntary contributions made by many 

- individuals on behalf of the JDOM Project and was originally 

- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and

- Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information

- on the JDOM Project, please see <http://www.jdom.org/>. 

-

-================================================================================

-

-For Saxon including 

-   saxon-9.x.jar

-   saxon-dom-9.x.jar

-   saxon-xpath-9.x.jar

-   saxon-xqj-9.x.jar

-

- MOZILLA PUBLIC LICENSE

-Version 1.0

-

-1. Definitions.

-

-      1.1. ``Contributor'' means each entity that creates or contributes to the creation of Modifications.

-

-      1.2. ``Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.

-

-      1.3. ``Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.

-

-      1.4. ``Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data.

-

-      1.5. ``Executable'' means Covered Code in any form other than Source Code.

-

-      1.6. ``Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.

-

-      1.7. ``Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.

-

-      1.8. ``License'' means this document.

-

-      1.9. ``Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:

-

-            A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.

-

-            B. Any new file that contains any part of the Original Code or previous Modifications. 

-

-      1.10. ``Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.

-

-      1.11. ``Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or a list of source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.

-

-      1.12. ``You'' means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, ``You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, ``control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of fifty percent (50%) or more of the outstanding shares or beneficial ownership of such entity. 

-

-2. Source Code License.

-

-      2.1. The Initial Developer Grant.

-      The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:

-

-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, or as part of a Larger Work; and

-

-            (b) under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell (``Utilize'') the Original Code (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Original Code (or portions thereof) and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 

-

-      2.2. Contributor Grant.

-      Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:

-

-            (a) to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code or as part of a Larger Work; and

-

-            (b) under patents now or hereafter owned or controlled by Contributor, to Utilize the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to Utilize the Contributor Version (or portions thereof), and not to any greater extent that may be necessary to Utilize further Modifications or combinations. 

-

-3. Distribution Obligations.

-

-      3.1. Application of License.

-      The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.

-

-      3.2. Availability of Source Code.

-      Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.

-

-      3.3. Description of Modifications.

-      You must cause all Covered Code to which you contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.

-

-      3.4. Intellectual Property Matters

-

-            (a) Third Party Claims.

-            If You have knowledge that a party claims an intellectual property right in particular functionality or code (or its utilization under this License), you must include a text file with the source code distribution titled ``LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If you obtain such knowledge after You make Your Modification available as described in Section 3.2, You shall promptly modify the LEGAL file in all copies You make available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.

-

-            (b) Contributor APIs.

-            If Your Modification is an application programming interface and You own or control patents which are reasonably necessary to implement that API, you must also include this information in the LEGAL file. 

-

-      3.5. Required Notices.

-      You must duplicate the notice in Exhibit A in each file of the Source Code, and this License in any documentation for the Source Code, where You describe recipients' rights relating to Covered Code. If You created one or more Modification(s), You may add your name as a Contributor to the notice described in Exhibit A. If it is not possible to put such notice in a particular Source Code file due to its structure, then you must include such notice in a location (such as a relevant directory file) where a user would be likely to look for such a notice. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.

-

-      3.6. Distribution of Executable Versions.

-      You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.

-

-      3.7. Larger Works.

-      You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code. 

-

-4. Inability to Comply Due to Statute or Regulation.

-

-      If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it. 

-

-5. Application of this License.

-

-      This License applies to code to which the Initial Developer has attached the notice in Exhibit A, and to related Covered Code. 

-

-6. Versions of the License.

-

-      6.1. New Versions.

-      Netscape Communications Corporation (``Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.

-

-      6.2. Effect of New Versions.

-      Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License.

-

-      6.3. Derivative Works.

-      If you create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), you must (a) rename Your license so that the phrases ``Mozilla'', ``MOZILLAPL'', ``MOZPL'', ``Netscape'', ``NPL'' or any confusingly similar phrase do not appear anywhere in your license and (b) otherwise make it clear that your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.) 

-

-7. DISCLAIMER OF WARRANTY.

-

-      COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN ``AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. 

-

-8. TERMINATION.

-

-      This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive. 

-

-9. LIMITATION OF LIABILITY.

-

-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO YOU OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. 

-

-10. U.S. GOVERNMENT END USERS.

-

-      The Covered Code is a ``commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ``commercial computer software'' and ``commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein. 

-

-11. MISCELLANEOUS.

-

-      This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in, the United States of America: (a) unless otherwise agreed in writing, all disputes relating to this License (excepting any dispute relating to intellectual property rights) shall be subject to final and binding arbitration, with the losing party paying all costs of arbitration; (b) any arbitration relating to this Agreement shall be held in Santa Clara County, California, under the auspices of JAMS/EndDispute; and (c) any litigation relating to this Agreement shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. 

-

-12. RESPONSIBILITY FOR CLAIMS.

-

-      Except in cases where another Contributor has failed to comply with Section 3.4, You are responsible for damages arising, directly or indirectly, out of Your utilization of rights under this License, based on the number of copies of Covered Code you made available, the revenues you received from utilizing such rights, and other relevant factors. You agree to work with affected parties to distribute responsibility on an equitable basis. 

-

-EXHIBIT A.

-

-      ``The contents of this file are subject to the Mozilla Public License Version 1.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.mozilla.org/MPL/

-

-      Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.

-

-      The Original Code is ______________________________________.

-

-      The Initial Developer of the Original Code is ________________________. Portions created by ______________________ are Copyright (C) ______ _______________________. All Rights Reserved.

-

-      Contributor(s): ______________________________________.'' 

-

-===============================================================================

-

-The jaxen-1.1.1.jar:

-

- $Id: LICENSE.txt,v 1.5 2006/02/05 21:49:04 elharo Exp $

-

- Copyright 2003-2006 The Werken Company. All Rights Reserved.

- 

- Redistribution and use in source and binary forms, with or without

- modification, are permitted provided that the following conditions are

- met:

-

-  * Redistributions of source code must retain the above copyright

-    notice, this list of conditions and the following disclaimer.

-

-  * Redistributions in binary form must reproduce the above copyright

-    notice, this list of conditions and the following disclaimer in the

-    documentation and/or other materials provided with the distribution.

-

-  * Neither the name of the Jaxen Project nor the names of its

-    contributors may be used to endorse or promote products derived 

-    from this software without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED

-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A

-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER

-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-

-================================================================================

-The asm-3.1.jar are distributed under the license:

-

-Copyright (c) 2000-2005 INRIA, France Telecom

-All rights reserved.

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions

-are met:

-

-1. Redistributions of source code must retain the above copyright

-   notice, this list of conditions and the following disclaimer.

-

-2. Redistributions in binary form must reproduce the above copyright

-   notice, this list of conditions and the following disclaimer in the

-   documentation and/or other materials provided with the distribution.

-

-3. Neither the name of the copyright holders nor the names of its

-   contributors may be used to endorse or promote products derived from

-   this software without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF

-THE POSSIBILITY OF SUCH DAMAGE.

-

-================================================================================

-

-The slf4j-api-1.5.0.jar and slf4j-jdk14-1.5.0.jar are distributed under the license:

-

-Copyright (c) 2004-2008 QOS.ch

- All rights reserved.

-

- Permission is hereby granted, free  of charge, to any person obtaining

- a  copy  of this  software  and  associated  documentation files  (the

- "Software"), to  deal in  the Software without  restriction, including

- without limitation  the rights to  use, copy, modify,  merge, publish,

- distribute,  sublicense, and/or sell  copies of  the Software,  and to

- permit persons to whom the Software  is furnished to do so, subject to

- the following conditions:

- 

- The  above  copyright  notice  and  this permission  notice  shall  be

- included in all copies or substantial portions of the Software.

- 

- THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,

- EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF

- MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND

- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE

- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION

- OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION

- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-

-==========================================================================================
-
-The htmlparser-1.0.5.jar includes files under the following licenses:
-
-This is for the HTML parser as a whole except the rewindable input stream,
-and the Live DOM Viewer. 
-For the copyright notices for individual files, please see individual files.
-
-/*
- * Copyright (c) 2005, 2006, 2007 Henri Sivonen
- * Copyright (c) 2007-2008 Mozilla Foundation
- * Portions of comments Copyright 2004-2007 Apple Computer, Inc., Mozilla 
- * Foundation, and Opera Software ASA.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in 
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
- * DEALINGS IN THE SOFTWARE.
- */
- 
-The following license is for the rewindable input stream.
-
-/*
- * Copyright (c) 2001-2003 Thai Open Source Software Center Ltd
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions 
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright 
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above 
- *    copyright notice, this list of conditions and the following 
- *    disclaimer in the documentation and/or other materials provided 
- *    with the distribution.
- *  * Neither the name of the Thai Open Source Software Center Ltd nor 
- *    the names of its contributors may be used to endorse or promote 
- *    products derived from this software without specific prior 
- *    written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
- * REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-The following license applies to the Live DOM Viewer:
-
-Copyright (c) 2000, 2006, 2008 Ian Hickson and various contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-==========================================================================================
-

-

-The tuscany-assembly-xsd-osoa jar includes XSD files under the following SCA Collaboration license:

-

-License for the Service Component Architecture JavaDoc, Interface 

-Definition files and XSD files.

-

-The Service Component Architecture JavaDoc, Interface Definition files, 

-and XSD files are being provided by the copyright holders under the 

-following license. By using and/or copying this work, you agree that 

-you have read, understood and will comply with the following terms and 

-conditions:

-

-Permission to copy, display, make derivative works of, and distribute 

-the Service Component Architecture JavaDoc, Interface Definition Files 

-and XSD files (the "Artifacts") in any medium without fee or royalty is 

-hereby granted, provided that you include the following on ALL copies 

-of the Artifacts, or portions thereof, that you make: 

-

-1. A link or URL to the Artifacts at this location:

-http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications 

-

-2. The full text of this copyright notice as shown in the Artifacts.

-

-THE ARTIFACTS ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO 

-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE 

-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS, INCLUDING, BUT NOT 

-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 

-PURPOSE, NON-INFRINGEMENT OR TITLE.  

-

-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, 

-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY 

-USE OR DISTRIBUTION OF THE ARTIFACTS.

-

-The name and trademarks of the Authors may NOT be used in any manner, 

-including advertising or publicity pertaining to the Service Component 

-Architecture Specification or its contents without specific, written 

-prior permission. Title to copyright in the Service Component 

-Architecture Specification and the JavaDoc, Interface Definition Files 

-and XSD Files will at all times remain with the Authors.

-

-No other rights are granted by implication, estoppel or otherwise.

-

-Revision level 1.1, last updated on 2007/11/19

-

-

-================================================================================

-

-The tuscany-assembly-xsd.jar includes XSD files under the following OASIS license:

-

-All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual 

-Property Rights Policy (the "OASIS IPR Policy"). The full Policy may be found at the OASIS website.

-This document and translations of it may be copied and furnished to others, and derivative works that 

-comment on or otherwise explain it or assist in its implementation may be prepared, copied, published, 

-and distributed, in whole or in part, without restriction of any kind, provided that the above copyright 

-notice and this section are included on all such copies and derivative works. However, this document 

-itself may not be modified in any way, including by removing the copyright notice or references to OASIS, 

-except as needed for the purpose of developing any document or deliverable produced by an OASIS 

-Technical Committee (in which case the rules applicable to copyrights, as set forth in the OASIS IPR 

-Policy, must be followed) or as required to translate it into languages other than English.

-The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors 

-or assigns.

-This document and the information contained herein is provided on an "AS IS" basis and OASIS 

-DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY 

-WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP 

-RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR 

-PURPOSE.

-OASIS requests that any OASIS Party or any other party that believes it has patent claims that would 

-necessarily be infringed by implementations of this OASIS Committee Specification or OASIS Standard, 

-to notify OASIS TC Administrator and provide an indication of its willingness to grant patent licenses to 

-such patent claims in a manner consistent with the IPR Mode of the OASIS Technical Committee that 

-produced this specification.

-OASIS invites any party to contact the OASIS TC Administrator if it is aware of a claim of ownership of 

-any patent claims that would necessarily be infringed by implementations of this specification by a patent 

-holder that is not willing to provide a license to such patent claims in a manner consistent with the IPR 

-Mode of the OASIS Technical Committee that produced this specification. OASIS may include such 

-claims on its website, but disclaims any obligation to do so.

-OASIS takes no position regarding the validity or scope of any intellectual property or other rights that 

-might be claimed to pertain to the implementation or use of the technology described in this document or 

-the extent to which any license under such rights might or might not be available; neither does it represent 

-that it has made any effort to identify any such rights. Information on OASIS' procedures with respect to 

-rights in any document or deliverable produced by an OASIS Technical Committee can be found on the 

-OASIS website. Copies of claims of rights made available for publication and any assurances of licenses 

-to be made available, or the result of an attempt made to obtain a general license or permission for the use 

-of such proprietary rights by implementers or users of this OASIS Committee Specification or OASIS 

-Standard, can be obtained from the OASIS TC Administrator. OASIS makes no representation that any 

-information or list of intellectual property rights will at any time be complete, or that any claims in such list 

-are, in fact, Essential Claims.

-The names "OASIS",  are trademarks of OASIS, the owner and developer of this specification, and should 

-be used only to refer to the organization and its official outputs. OASIS welcomes reference to, and 

-implementation and use of, specifications, while reserving the right to enforce its marks against misleading 

-uses. Please see http://www.oasis-open.org/who/trademark.php for above guidance.

-

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/release/bin/NOTICE b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/release/bin/NOTICE
deleted file mode 100644
index ebae94517b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/release/bin/NOTICE
+++ /dev/null
@@ -1,85 +0,0 @@
-Apache Tuscany

-Copyright (c) 2005 - 2010 The Apache Software Foundation

-

-This product includes software developed at

-The Apache Software Foundation (http://www.apache.org/).

-
-This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
-
-This product includes/uses JSON-RPC JavaScript client (jsonrpc.js) 
- Copyright (c) 2003-2004 Jan-Klaas Kollhof
- Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
-

-This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)

- Copyright (c) 2002-2003 Axion Development Team. All rights reserved.

-

-This product includes/uses XmlSchema developed at 

-The Apache Software Foundation (http://ws.apache.org/commons/XmlSchema)

- Portions Copyright 2006 International Business Machines Corp.

-

-This product includes/uses the Jetty Servlet Engine (http://jetty.mortbay.org),

-developed by Mort Bay Consulting  (http://www.mortbay.com)

-

-This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/) 

- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.

-

-This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)

-License: Public Domain 

-

-This product includes/uses javacc (https://javacc.dev.java.net/)

- Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.

-

-This product includes software from the GlassFish project (https://glassfish.dev.java.net/)

-    Copyright (c) 2006, Sun Microsystems, Inc.

-    

-This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)

-

-This product includes/uses JDOM (http://www.jdom.org/)

- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.

-

-This product includes/uses javacc (https://javacc.dev.java.net/)

- Copyright (c) 2003 Sun Microsystems, Inc. All  Rights Reserved.

-

-This product includes/uses ASM (http://asm.objectweb.org)

-   Copyright (c) 2000-2005 INRIA, France Telecom. All rights reserved.

-

-This product includes/uses Jaxen (http://jaxen.codehaus.org/)

-   Copyright 2003-2006 The Werken Company. All Rights Reserved.

-

-This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:

- Copyright (c) 2002, A. Abram White. All rights reserved.

-

-This product also includes software under the BSD license

-with the following copyright:

- Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.

-

-The Program includes all or portions of the following software: "The 

-Saxon XSLT and XQuery Processor from Saxonica Limited" distributed under

-an MPL v1.0 license. Please refer to the homepage URL at 

-http://www.saxonica.com/.

-

-This product includes/uses Serp (http://serp.sourceforge.net/) under the BSD license:

- Copyright (c) 2002, A. Abram White. All rights reserved.

-

-This product also includes "OSGi Materials."

- Copyright (c) 2000, 2006

- OSGi Alliance Bishop Ranch 6

- 2400 Camino Ramon, Suite 375

- San Ramon, CA 94583 USA

- All Rights Reserved. 

-

-This product includes software under the Service Component Architecture JavaDoc, 

-Interface Definition files and XSD files license.

-  (c) Copyright SCA Collaboration 2006, 2007

-

-This product includes software under the Service Data Objects JavaDoc and 

-Interface Definition file license

-

-(c) Copyright BEA Systems, Inc., International Business Machines Corporation, 

-Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 

-Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 

-2005, 2006. All rights reserved.

-

-This product includes software under the OASIS license

-Copyright (C) OASIS(R) 2005, 2009. All Rights Reserved.

-

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml
deleted file mode 100644
index 98a3b2c345..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-clients.xml
+++ /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.

--->

-

-<project name="scatours-distribution-clients">

-    <import file="../util/build-defs.xml"/>

-

-    <target name="run-currency-converter-corba">

-        <java classname="scatours.CurrencyConverterCORBAClient" fork="true" failonerror="true">

-            <classpath location="scatours-client-currency-converter-corba.jar"/>

-        </java>

-    </target>

-

-    <target name="run-currency-converter-jms">

-        <java classname="scatours.CurrencyConverterJMSClient" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-client-currency-converter-jms.jar"/>

-                <!-- The following is used to bring in the ActiveMQ runtime. -->

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-currency-converter-rmi">

-        <java classname="scatours.CurrencyConverterRMIClient" fork="true" failonerror="true">

-            <classpath location="scatours-client-currency-converter-rmi.jar"/>

-        </java>

-    </target>

-

-    <target name="run-currency-converter-ws-jaxws">

-        <java classname="scatours.CurrencyConverterWSClient" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-client-currency-converter-ws-jaxws.jar"/>

-                <!-- The following is used to bring in additional dependencies of the JAX-WS runtime. -->

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs-selfcontained.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs-selfcontained.xml
deleted file mode 100644
index f741f28a7b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs-selfcontained.xml
+++ /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.

--->

-

-<!-- The self-contained build does not need any libraries from the Tuscany SCA

-   binary distro. -->

-<project name="build-defs">

-

-    <path id="scatours.tuscany-manifest"/>

-

-    <path id="scatours.tuscany-node-launcher"/>

-

-    <path id="scatours.tuscany-openejb"/>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs.xml
deleted file mode 100644
index f914208f52..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-defs.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<!-- The default build depends on libraries from the Tuscany SCA binary distro. -->

-<project name="build-defs">

-    <property environment="env"/> 

-

-    <path id="scatours.tuscany-manifest">

-        <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-    </path>

-

-    <path id="scatours.tuscany-node-launcher">

-        <fileset dir="${env.TUSCANY_HOME}/modules" includes="tuscany-node-launcher-*.jar"/>

-    </path>

-

-    <path id="scatours.tuscany-openejb">

-        <fileset dir="${env.TUSCANY_HOME}/lib">

-            <!-- exclude some jars to prevent them being loaded by OpenEJB -->

-            <exclude name="tuscany-sca-manifest.jar"/>

-            <exclude name="ode-*.jar"/>

-            <exclude name="jaxb-xjc-*.jar"/>

-            <exclude name="jython-*.jar"/>

-            <exclude name="activemq-all-*.jar"/>

-            <exclude name="js-*.jar"/>

-            <exclude name="org.apache.felix.main-*.jar"/>

-            <exclude name="saxon-*.jar"/>

-        </fileset>

-    </path>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml
deleted file mode 100644
index dbddcb349b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-launchers.xml
+++ /dev/null
@@ -1,310 +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="scatours-distribution-launchers">

-    <import file="../util/build-defs.xml"/>

-

-    <target name="run-blog-feed">

-        <java classname="scatours.BlogFeedLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-blog-feed.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-buildingblocks">

-        <java classname="scatours.BuildingBlocksLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-buildingblocks.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-currency-converter">

-        <java classname="scatours.CurrencyConverterLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-currency-converter.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-currency-converter-corba">

-        <java classname="scatours.CurrencyConverterCORBALauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-currency-converter-corba.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-currency-converter-jms">

-        <java classname="scatours.CurrencyConverterJMSLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-currency-converter-jms.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-currency-converter-rmi">

-        <java classname="scatours.CurrencyConverterRMILauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-currency-converter-rmi.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-currency-converter-ws">

-        <java classname="scatours.CurrencyConverterWSLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-currency-converter-ws.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-databinding">

-        <java classname="scatours.DatabindingLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-databinding.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-feed-logger">

-        <java classname="scatours.FeedLoggerLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-feed-logger.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-fullapp">

-        <java classname="scatours.FullAppLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-fullapp.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-fullapp-domain">

-        <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher" fork="true" failonerror="true">

-            <arg value="../domainconfig/fullapp"/>

-            <classpath>

-                <path refid="scatours.tuscany-node-launcher"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-fullapp-nodes">

-        <java classname="scatours.FullAppNodesLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-fullapp-nodes.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-help-pages">

-        <java classname="scatours.HelpPagesLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-help-pages.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-interaction">

-        <java classname="scatours.InteractionLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-interaction.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-introducing">

-        <java classname="scatours.IntroducingLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-introducing.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-introducing-client">

-        <java classname="scatours.IntroducingClientLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-introducing-client.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-introducing-domain">

-        <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher" fork="true" failonerror="true">

-            <arg value="../domainconfig/introducing"/>

-            <classpath>

-                <path refid="scatours.tuscany-node-launcher"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-introducing-tours">

-        <java classname="org.apache.tuscany.sca.node.launcher.NodeLauncher" fork="true" failonerror="true">

-            <arg value="http://localhost:9990/node-config/ToursNode"/>

-            <classpath>

-                <path refid="scatours.tuscany-node-launcher"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-introducing-trips">

-        <java classname="org.apache.tuscany.sca.node.launcher.NodeLauncher" fork="true" failonerror="true">

-            <arg value="http://localhost:9990/node-config/TripsNode"/>

-            <classpath>

-                <path refid="scatours.tuscany-node-launcher"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-jumpstart">

-        <java classname="scatours.JumpstartLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-jumpstart.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-notification-corba">

-        <java classname="scatours.NotificationCORBALauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-notification-corba.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-notification-ejb">

-        <java classname="scatours.NotificationEJBLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-notification-ejb.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-notification-jms">

-        <java classname="scatours.NotificationJMSLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-notification-jms.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-notification-rmi">

-        <java classname="scatours.NotificationRMILauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-notification-rmi.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-notification-ws">

-        <java classname="scatours.NotificationWSLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-notification-ws.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-payment-bpel">

-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-payment-bpel.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-payment-groovy">

-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-payment-groovy.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-payment-java">

-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-payment-java.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-payment-java-policy">

-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-java-policy.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-payment-spring">

-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-payment-spring.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-payment-spring-scatag">

-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-spring-scatag.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-policy">

-        <java classname="scatours.PolicyLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-launcher-policy.jar"/>

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml b/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml
deleted file mode 100644
index 6154f0b451..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/distribution/src/main/resources/build-services.xml
+++ /dev/null
@@ -1,64 +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="scatours-distribution-services">

-    <import file="../util/build-defs.xml"/>

-

-    <target name="run-smsgateway-corba">

-        <java classname="scatours.smsgateway.SMSGatewayCORBAServiceBootstrap" fork="true" failonerror="true">

-            <classpath location="scatours-service-smsgateway-corba.jar"/>

-        </java>

-    </target>

-

-    <target name="run-smsgateway-ejb">

-        <java classname="com.tuscanyscatours.smsgateway.SMSGatewayEJBServiceBootstrap" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="scatours-service-smsgateway-ejb.jar"/>

-                <!-- The following is used to bring in additional dependencies of the OpenEJB runtime. -->

-                <path refid="scatours.tuscany-openejb"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-smsgateway-jaxws">

-        <java classname="com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap" fork="true">

-            <classpath>

-                <pathelement location="scatours-service-smsgateway-jaxws.jar"/>

-                <!-- The following is used to bring in additional dependencies of the JAX-WS runtime. -->

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-smsgateway-jms">

-        <java classname="scatours.smsgateway.SMSGatewayJMSServiceBootstrap" fork="true">

-            <classpath>

-                <pathelement location="scatours-service-smsgateway-jms.jar"/>

-                <!-- The following is used to bring in the ActiveMQ runtime. -->

-                <path refid="scatours.tuscany-manifest"/>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="run-smsgateway-rmi">

-        <java classname="com.tuscanyscatours.smsgateway.SMSGatewayRMIServiceBootstrap" fork="true" failonerror="true">

-            <classpath location="scatours-service-smsgateway-rmi.jar"/>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/build.xml
deleted file mode 100644
index 04219dd032..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/build.xml
+++ /dev/null
@@ -1,45 +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="scatours-domainconfig" default="compile">

-

-    <target name="compile">

-        <antcall target="allsubdirs">

-            <param name="target" value="compile"/>

-        </antcall>

-    </target>

-

-    <target name="test">

-        <antcall target="allsubdirs">

-            <param name="target" value="test"/>

-        </antcall>

-    </target>

-

-    <target name="clean">

-        <antcall target="allsubdirs">

-            <param name="target" value="clean"/>

-        </antcall>

-    </target>

-

-    <target name="allsubdirs">

-        <ant dir="fullapp" target="${target}"/>

-        <ant dir="introducing" target="${target}"/>

-    </target>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
deleted file mode 100644
index 3fd52446fc..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-domainconfig-fullapp" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/pom.xml
deleted file mode 100644
index 3dcae3b88b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-domainconfig-fullapp</artifactId>

-    <name>Apache Tuscany SCA Tours Full App Domain Configuration</name>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <resources>

-            <resource>

-                <directory>src/main/resources</directory>

-                <excludes>

-                    <exclude>workspace-distribution.xml</exclude>

-                </excludes>

-            </resource>

-        </resources>

-        <plugins>

-            <plugin>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <phase>process-resources</phase>

-                        <configuration>

-                            <tasks>

-                                <mkdir dir="target/jar-classes/fullapp"/>

-                                <copy todir="target/jar-classes/fullapp">

-                                    <fileset dir="src/main/resources">

-                                        <exclude name="workspace*.xml"/>

-                                    </fileset>

-                                </copy>

-                                <copy todir="target/jar-classes/fullapp">

-                                    <fileset dir="src/main/resources">

-                                        <include name="workspace-distribution.xml"/>

-                                    </fileset>

-                                    <globmapper from="workspace-distribution.xml" to="workspace.xml"/>

-                                </copy>

-                            </tasks>

-                        </configuration>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <configuration>

-                    <classesDirectory>target/jar-classes</classesDirectory>

-                </configuration>

-            </plugin>

-        </plugins>                      

-    </build>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite
deleted file mode 100644
index 7e15e7d28e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud.composite
+++ /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.    

--->

-<composite name="cloud.composite"

-           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"

-           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-           xmlns:ns2="http://tuscany.apache.org/cloud">

-      

-  <include name="ns2:ui" uri="http://tuscany.apache.org/cloud" />

-  <include name="ns2:coordination" uri="http://tuscany.apache.org/cloud" />

-  <include name="ns2:packagedtrip" uri="http://tuscany.apache.org/cloud" />

-  <include name="ns2:bespoketrip" uri="http://tuscany.apache.org/cloud" />

-  <include name="ns2:currency" uri="http://tuscany.apache.org/cloud" />

-  <include name="ns2:shoppingcart" uri="http://tuscany.apache.org/cloud" />

-  <include name="ns2:payment" uri="http://tuscany.apache.org/cloud" />

-  <include name="ns2:creditcard" uri="http://tuscany.apache.org/cloud" />

-  

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.composite
deleted file mode 100644
index bae4396eff..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-bespoketrip.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://docs.oasis-open.org/ns/opencsa/sca/200912"

-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"

-        targetNamespace="http://tuscany.apache.org/cloud"

-        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-        xmlns:s="http://tuscanyscatours.com/"

-		name="bespoketrip">

-

-    <component name="bespoketrip">

-        <t:implementation.node uri="fullapp-bespoketrip" composite="s:fullapp-bespoketrip"/>

-        <service name="Node">

-            <binding.sca uri="http://localhost:8086"/>

-            <binding.ws uri="http://localhost:8086"/>

-            <tuscany:binding.jsonrpc uri="http://localhost:8086"/>

-        </service>

-    </component>

-     

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.composite
deleted file mode 100644
index 35438bbf2c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-coordination.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://docs.oasis-open.org/ns/opencsa/sca/200912"

-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"

-        targetNamespace="http://tuscany.apache.org/cloud"

-        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-        xmlns:s="http://tuscanyscatours.com/"

-		name="coordination">

-

-    <component name="coordination">

-        <t:implementation.node uri="fullapp-coordination" composite="s:fullapp-coordination"/>

-        <service name="Node">

-            <binding.sca uri="http://localhost:8084"/>

-            <binding.ws uri="http://localhost:8084"/>

-            <tuscany:binding.jsonrpc uri="http://localhost:8084"/>

-        </service>

-    </component>

-     

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.composite
deleted file mode 100644
index cc40d15e66..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-creditcard.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://docs.oasis-open.org/ns/opencsa/sca/200912"

-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"

-        targetNamespace="http://tuscany.apache.org/cloud"

-        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-        xmlns:s="http://tuscanyscatours.com/"

-		name="creditcard">

-

-    <component name="creditcard">

-        <t:implementation.node uri="fullapp-creditcard" composite="s:creditcard"/>

-        <service name="Node">

-            <binding.sca uri="http://localhost:8082"/>

-            <binding.ws uri="http://localhost:8082"/>

-            <tuscany:binding.jsonrpc uri="http://localhost:8082"/>

-        </service>

-    </component>

-     

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.composite
deleted file mode 100644
index cedaa92564..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-currency.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://docs.oasis-open.org/ns/opencsa/sca/200912"

-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"

-        targetNamespace="http://tuscany.apache.org/cloud"

-        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-        xmlns:s="http://tuscanyscatours.com/"

-		name="currency">

-

-    <component name="currency">

-        <t:implementation.node uri="fullapp-currency" composite="s:fullapp-currency"/>

-        <service name="Node">

-            <binding.sca uri="http://localhost:8083"/>

-            <binding.ws uri="http://localhost:8083"/>

-            <tuscany:binding.jsonrpc uri="http://localhost:8083"/>

-        </service>

-    </component>

-     

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
deleted file mode 100644
index 98348b5078..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-packagedtrip.composite
+++ /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.    

--->

-<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"

-        targetNamespace="http://tuscany.apache.org/cloud"

-        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-        xmlns:s="http://tuscanyscatours.com/"

-		name="packagedtrip">

-

-    <component name="packagedtrip">

-        <t:implementation.node uri="fullapp-packagedtrip" composite="s:fullapp-packagedtrip"/>

-        <service name="Node">

-            <binding.sca uri="http://localhost:8085"/>

-            <tuscany:binding.jsonrpc uri="http://localhost:8085"/>

-        </service>

-    </component>

-     

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.composite
deleted file mode 100644
index 0a63cacbec..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-payment.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://docs.oasis-open.org/ns/opencsa/sca/200912"

-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"

-        targetNamespace="http://tuscany.apache.org/cloud"

-        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-        xmlns:s="http://tuscanyscatours.com/"

-		name="payment">

-

-    <component name="payment">

-        <t:implementation.node uri="fullapp-payment" composite="s:payment"/>

-        <service name="Node">

-            <binding.sca uri="http://localhost:8081"/>

-            <binding.ws uri="http://localhost:8081"/>

-            <tuscany:binding.jsonrpc uri="http://localhost:8081"/>

-        </service>

-    </component>

-     

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.composite
deleted file mode 100644
index 05eb009974..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-shoppingcart.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://docs.oasis-open.org/ns/opencsa/sca/200912"

-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"

-        targetNamespace="http://tuscany.apache.org/cloud"

-        xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"

-        xmlns:s="http://tuscanyscatours.com/"

-		name="shoppingcart">

-

-    <component name="shoppingcart">

-        <t:implementation.node uri="fullapp-shoppingcart" composite="s:fullapp-shoppingcart"/>

-        <service name="Node">

-            <binding.sca uri="http://localhost:8087"/>

-            <binding.ws uri="http://localhost:8087"/>

-            <tuscany:binding.jsonrpc uri="http://localhost:8087"/>

-        </service>

-    </component>

-     

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
deleted file mode 100644
index b54a48f2c0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/cloud/fullapp-ui.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

--->

-<composite	xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-		xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"

-		targetNamespace="http://tuscany.apache.org/cloud"

-		xmlns:s="http://tuscanyscatours.com/"

-		name="ui">

-

-    <component name="ui">

-        <t:implementation.node uri="fullapp-ui" composite="s:fullapp-ui"/>

-        <service name="Node">

-            <binding.sca uri="http://localhost:8080"/>

-        </service>

-    </component>

-     

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
deleted file mode 100644
index 69a83c4ed4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/domain.composite
+++ /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.    

--->

-<composite name="domain.composite"

-           targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"

-           xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-           xmlns:ns2="http://tuscanyscatours.com/">

-       

-  <include name="ns2:creditcard" uri="fullapp-creditcard" />         

-  <include name="ns2:payment" uri="fullapp-payment" />    

-  <include name="ns2:fullapp-shoppingcart" uri="fullapp-shoppingcart" />

-  <include name="ns2:fullapp-currency" uri="fullapp-currency" />

-  <include name="ns2:fullapp-packagedtrip" uri="fullapp-packagedtrip" /> 

-  <include name="ns2:fullapp-bespoketrip" uri="fullapp-bespoketrip" />

-  <include name="ns2:fullapp-coordination" uri="fullapp-coordination" />         

-  <include name="ns2:fullapp-ui" uri="fullapp-ui" /> 

-

-</composite>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
deleted file mode 100644
index 272c88a744..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace-distribution.xml
+++ /dev/null
@@ -1,41 +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.    

--->

-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.1" 

-           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.1">

-  <contribution location="file:../contributions/scatours-contribution-common.jar"  uri="common"/>

-  <contribution location="file:../contributions/scatours-contribution-currency.jar"  uri="currency"/>

-  <contribution location="file:../contributions/scatours-contribution-hotel.jar"  uri="hotel"/>

-  <contribution location="file:../contributions/scatours-contribution-flight.jar"  uri="flight"/>

-  <contribution location="file:../contributions/scatours-contribution-car.jar"  uri="car"/>

-  <contribution location="file:../contributions/scatours-contribution-trip.jar"  uri="trip"/>

-  <contribution location="file:../contributions/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>

-  <contribution location="file:../contributions/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>

-  <contribution location="file:../contributions/scatours-contribution-payment-spring-policy.jar"  uri="fullapp-payment"/>

-  <contribution location="file:../contributions/scatours-contribution-creditcard-payment-jaxb-policy.jar"  uri="fullapp-creditcard"/>

-  <contribution location="file:../contributions/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>

-  <contribution location="file:../contributions/scatours-contribution-scatours.jar"  uri="scatours"/>

-  <contribution location="file:../contributions/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>

-  <contribution location="file:../contributions/scatours-contribution-fullapp-coordination.jar"  uri="fullapp-coordination"/>

-  <contribution location="file:../contributions/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>

-  <contribution location="file:../contributions/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>

-  <contribution location="file:../contributions/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>

-  <contribution location="file:../contributions/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>

-  <contribution location="file:../domainconfig/fullapp/cloud" uri="http://tuscany.apache.org/cloud"/>  

-</workspace>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace.xml
deleted file mode 100644
index a7aaf433c3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/fullapp/src/main/resources/workspace.xml
+++ /dev/null
@@ -1,41 +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.    

--->

-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.1" 

-           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.1">

-  <contribution location="file:../../contributions/common/target/scatours-contribution-common.jar"  uri="common"/>

-  <contribution location="file:../../contributions/currency/target/scatours-contribution-currency.jar"  uri="currency"/>

-  <contribution location="file:../../contributions/hotel/target/scatours-contribution-hotel.jar"  uri="hotel"/>

-  <contribution location="file:../../contributions/flight/target/scatours-contribution-flight.jar"  uri="flight"/>

-  <contribution location="file:../../contributions/car/target/scatours-contribution-car.jar"  uri="car"/>

-  <contribution location="file:../../contributions/trip/target/scatours-contribution-trip.jar"  uri="trip"/>

-  <contribution location="file:../../contributions/tripbooking/target/scatours-contribution-tripbooking.jar"  uri="tripbooking"/>

-  <contribution location="file:../../contributions/travelcatalog/target/scatours-contribution-travelcatalog.jar"  uri="travelcatalog"/>

-  <contribution location="file:../../contributions/payment-java/target/scatours-contribution-payment-spring-policy.jar"  uri="fullapp-payment"/>

-  <contribution location="file:../../contributions/creditcard-payment-jaxb/target/scatours-contribution-creditcard-payment-jaxb-policy.jar"  uri="fullapp-creditcard"/>

-  <contribution location="file:../../contributions/shoppingcart/target/scatours-contribution-shoppingcart.jar"  uri="shoppingcart"/>

-  <contribution location="file:../../contributions/scatours/target/scatours-contribution-scatours.jar"  uri="scatours"/>

-  <contribution location="file:../../contributions/fullapp-ui/target/scatours-contribution-fullapp-ui.jar"  uri="fullapp-ui"/>

-  <contribution location="file:../../contributions/fullapp-coordination/target/scatours-contribution-fullapp-coordination.jar"  uri="fullapp-coordination"/>

-  <contribution location="file:../../contributions/fullapp-currency/target/scatours-contribution-fullapp-currency.jar"  uri="fullapp-currency"/>

-  <contribution location="file:../../contributions/fullapp-packagedtrip/target/scatours-contribution-fullapp-packagedtrip.jar"  uri="fullapp-packagedtrip"/>

-  <contribution location="file:../../contributions/fullapp-bespoketrip/target/scatours-contribution-fullapp-bespoketrip.jar"  uri="fullapp-bespoketrip"/>

-  <contribution location="file:../../contributions/fullapp-shoppingcart/target/scatours-contribution-fullapp-shoppingcart.jar"  uri="fullapp-shoppingcart"/>

-  <contribution location="file:../../domainconfig/fullapp/target/classes/cloud" uri="http://tuscany.apache.org/cloud"/>  

-</workspace>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
deleted file mode 100644
index 5ce51edcce..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-domainconfig-introducing" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/pom.xml
deleted file mode 100644
index f07dde2e95..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-domainconfig-introducing</artifactId>

-    <name>Apache Tuscany SCA Tours Introducing Domain Configuration</name>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <resources>

-            <resource>

-                <directory>src/main/resources</directory>

-                <excludes>

-                    <exclude>workspace-distribution.xml</exclude>

-                </excludes>

-            </resource>

-        </resources>

-        <plugins>

-            <plugin>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <executions>

-                    <execution>

-                        <phase>process-resources</phase>

-                        <configuration>

-                            <tasks>

-                                <mkdir dir="target/jar-classes/introducing"/>

-                                <copy todir="target/jar-classes/introducing">

-                                    <fileset dir="src/main/resources">

-                                        <exclude name="workspace*.xml"/>

-                                    </fileset>

-                                </copy>

-                                <copy todir="target/jar-classes/introducing">

-                                    <fileset dir="src/main/resources">

-                                        <include name="workspace-distribution.xml"/>

-                                    </fileset>

-                                    <globmapper from="workspace-distribution.xml" to="workspace.xml"/>

-                                </copy>

-                            </tasks>

-                        </configuration>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <configuration>

-                    <classesDirectory>target/jar-classes</classesDirectory>

-                </configuration>

-            </plugin>

-        </plugins>                      

-    </build>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite
deleted file mode 100644
index 273d2ec169..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud.composite
+++ /dev/null
@@ -1,26 +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 local="true" name="cloud"
-  targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-  xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912">
-  <include name="ns2:ToursNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:TripsNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:ClientNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
deleted file mode 100644
index 30eccd4325..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ClientNode.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" xmlns:c="http://client.scatours/" targetNamespace="http://tuscany.apache.org/cloud" name="ClientNode">
-
-	<component name="ClientNode">
-		<t:implementation.node uri="introducing-client" composite="c:Client" />
-		<service name="Node">
-            <binding.sca uri="http://localhost:8083" />
-			<binding.ws uri="http://localhost:8083" />
-			<t:binding.http uri="http://localhost:8083" />
-			<t:binding.jsonrpc uri="http://localhost:8083" />
-			<t:binding.atom uri="http://localhost:8083" />
-		</service>
-	</component>
-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
deleted file mode 100644
index 046decc592..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/ToursNode.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" xmlns:c="http://tuscanyscatours.com/" targetNamespace="http://tuscany.apache.org/cloud" name="ToursNode">
-
-	<component name="ToursNode">
-		<t:implementation.node uri="introducing-tours" composite="c:Tours" />
-		<service name="Node">
-            <binding.sca uri="http://localhost:8081" />
-			<binding.ws uri="http://localhost:8081" />
-			<t:binding.http uri="http://localhost:8081" />
-			<t:binding.jsonrpc uri="http://localhost:8081" />
-			<t:binding.atom uri="http://localhost:8081" />
-		</service>
-	</component>
-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
deleted file mode 100644
index 917ae2f821..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/cloud/TripsNode.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" xmlns:c="http://goodvaluetrips.com/" targetNamespace="http://tuscany.apache.org/cloud" name="TripsNode">
-
-	<component name="TripsNode">
-		<t:implementation.node uri="introducing-trips" composite="c:Trips" />
-		<service name="Node">
-            <binding.sca uri="http://localhost:8082" />
-			<binding.ws uri="http://localhost:8082" />
-			<t:binding.http uri="http://localhost:8082" />
-			<t:binding.jsonrpc uri="http://localhost:8082" />
-			<t:binding.atom uri="http://localhost:8082" />
-		</service>
-	</component>
-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite
deleted file mode 100644
index 89b7514ea8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/domain.composite
+++ /dev/null
@@ -1,26 +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 local="true" name="domain"
-  targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1"
-  xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:ns1="http://docs.oasis-open.org/ns/opencsa/sca/200912">
-  <include name="ns2:Tours" uri="introducing-tours" xmlns:ns2="http://tuscanyscatours.com/"/>
-  <include name="ns2:Trips" uri="introducing-trips" xmlns:ns2="http://goodvaluetrips.com/"/>
-  <include name="ns2:Client" uri="introducing-client" xmlns:ns2="http://client.scatours/"/>
-</composite>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml
deleted file mode 100644
index e778d64d8f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace-distribution.xml
+++ /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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
-           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.1">
-    <contribution location="file:../domainconfig/introducing/cloud"
-           uri="http://tuscany.apache.org/cloud"/>
-    <contribution location="file:../contributions/scatours-contribution-introducing-tours.jar"
-           uri="introducing-tours"/>
-    <contribution location="file:../contributions/scatours-contribution-introducing-trips.jar"
-           uri="introducing-trips"/>
-    <contribution location="file:../contributions/scatours-contribution-introducing-client.jar"
-           uri="introducing-client"/>
-</workspace>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace.xml
deleted file mode 100644
index b90f4d276e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/introducing/src/main/resources/workspace.xml
+++ /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.    
--->
-<workspace xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
-           xmlns:ns1="http://tuscany.apache.org/xmlns/sca/1.1">
-    <contribution location="file:../../domainconfig/introducing/target/classes/cloud"
-           uri="http://tuscany.apache.org/cloud"/>
-    <contribution location="file:../../contributions/introducing-tours/target/scatours-contribution-introducing-tours.jar"
-           uri="introducing-tours"/>
-    <contribution location="file:../../contributions/introducing-trips/target/scatours-contribution-introducing-trips.jar"
-           uri="introducing-trips"/>
-    <contribution location="file:../../contributions/introducing-client/target/scatours-contribution-introducing-client.jar"
-           uri="introducing-client"/>
-</workspace>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/pom.xml
deleted file mode 100644
index 41f75d3068..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/domainconfig/pom.xml
+++ /dev/null
@@ -1,47 +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>scatours</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-domainconfig</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Tours Domain Configurations</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>fullapp</module>

-                <module>introducing</module>

-            </modules>

-        </profile>

-

-    </profiles>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/build.xml
deleted file mode 100644
index f7c4bee524..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-blog-feed" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <target name="run">

-        <java classname="scatours.BlogFeedLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
deleted file mode 100644
index 8797045b2c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/pom.xml
+++ /dev/null
@@ -1,110 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-blog-feed</artifactId>

-    <name>Apache Tuscany SCA Tours Blog Feed Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-atom-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rss-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.BlogFeedLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>       

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java
deleted file mode 100644
index 76ddbbb079..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/blog-feed/src/main/java/scatours/BlogFeedLauncher.java
+++ /dev/null
@@ -1,50 +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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-public class BlogFeedLauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution feedContribution = locate("blog-feed");

-

-        Node node = NodeFactory.getInstance().createNode("blog-feed.composite", feedContribution);

-        node.start();

-

-        System.out.println("Node started - Press enter to shutdown.");

-        System.out.println();

-        System.out.println("To view the blog feed, use your Web browser to view:");

-        System.out.println("  Feeds using Tuscany Data APIs");

-        System.out.println("    http://localhost:8090/BlogAtom");

-        System.out.println("    http://localhost:8090/BlogRSS");

-        System.out.println("  Feeds using Atom APIs");

-        System.out.println("    http://localhost:8090/BlogAtomAPIs");

-        System.out.println("  Feeds using RSS APIs");

-        System.out.println("    http://localhost:8090/BlogRSSAPIs");

-        System.out.println();

-        System.in.read();

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/build.xml
deleted file mode 100644
index fd11d4c28a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/build.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-launchers" default="compile">

-

-    <target name="compile">

-        <antcall target="allsubdirs">

-            <param name="target" value="compile"/>

-        </antcall>

-    </target>

-

-    <target name="test">

-        <antcall target="allsubdirs">

-            <param name="target" value="test"/>

-        </antcall>

-    </target>

-

-    <target name="clean">

-        <antcall target="allsubdirs">

-            <param name="target" value="clean"/>

-        </antcall>

-    </target>

-

-    <target name="allsubdirs">

-        <ant dir="blog-feed" target="${target}"/>

-        <ant dir="buildingblocks" target="${target}"/>

-        <ant dir="currency-converter" target="${target}"/>

-        <ant dir="currency-converter-corba" target="${target}"/>

-        <ant dir="currency-converter-jms" target="${target}"/>

-        <ant dir="currency-converter-rmi" target="${target}"/>

-        <ant dir="currency-converter-ws" target="${target}"/>

-        <ant dir="databinding" target="${target}"/>

-        <ant dir="feed-logger" target="${target}"/>

-        <ant dir="fullapp" target="${target}"/>

-        <ant dir="fullapp-domain" target="${target}"/>

-        <ant dir="fullapp-nodes" target="${target}"/>

-        <ant dir="help-pages" target="${target}"/>

-        <ant dir="interaction" target="${target}"/>

-        <ant dir="introducing" target="${target}"/>

-        <ant dir="introducing-client" target="${target}"/>

-        <ant dir="introducing-domain" target="${target}"/>

-        <ant dir="introducing-tours" target="${target}"/>

-        <ant dir="introducing-trips" target="${target}"/>

-        <ant dir="jumpstart" target="${target}"/>

-        <ant dir="notification-corba" target="${target}"/>

-        <ant dir="notification-ejb" target="${target}"/>

-        <ant dir="notification-jms" target="${target}"/>

-        <ant dir="notification-rmi" target="${target}"/>

-        <ant dir="notification-ws" target="${target}"/>

-        <ant dir="policy" target="${target}"/>

-    </target>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/build.xml
deleted file mode 100644
index b61282f368..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-buildingblocks" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <target name="run">

-        <java classname="scatours.BuildingBlocksLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml
deleted file mode 100644
index 67796e7f6b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/pom.xml
+++ /dev/null
@@ -1,123 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-buildingblocks</artifactId>

-    <name>Apache Tuscany SCA Tours Building Blocks Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-all</artifactId>

-            <version>5.2.0</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.activemq</groupId>

-                    <artifactId>activemq-web-demo</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.BuildingBlocksLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>  

-        </plugins>            

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java
deleted file mode 100644
index 2d966f8f5d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/java/scatours/BuildingBlocksLauncher.java
+++ /dev/null
@@ -1,91 +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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.activemq.broker.BrokerService;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-public class BuildingBlocksLauncher {

-

-    public static void main(String[] args) throws Exception {

-        runImpl();

-        runImplInclude();

-        runAppl();

-    }

-

-    private static void runImpl() throws Exception {

-        Node node =

-            NodeFactory.getInstance().createNode("tours-impl-client.composite",

-                                                       locate("buildingblocks"),

-                                                       locate("buildingblocks-client"));

-

-        node.start();

-

-        Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");

-        client.run();

-

-        node.stop();

-    }

-

-    private static void runImplInclude() throws Exception {

-        Node node =

-            NodeFactory.getInstance().createNode("tours-impl-include-client.composite",

-                                                       locate("introducing-trips"),

-                                                       locate("buildingblocks"),

-                                                       locate("buildingblocks-client"));

-

-        node.start();

-

-        Runnable client = ((Node)node).getService(Runnable.class, "ToursClient/Runnable");

-        client.run();

-

-        node.stop();

-    }

-

-    private static void runAppl() throws Exception {

-        final BrokerService jmsBroker = new BrokerService();

-        jmsBroker.setPersistent(false);

-        jmsBroker.setUseJmx(false);

-        jmsBroker.addConnector("tcp://localhost:61619");

-

-        Node node1 =

-            NodeFactory.getInstance().createNode("tours-appl.composite",

-                                                       locate("introducing-trips"),

-                                                       locate("buildingblocks"));

-

-        Node node2 =

-            NodeFactory.getInstance().createNode("tours-appl-client.composite",

-                                                       locate("buildingblocks-client"));

-

-        jmsBroker.start();

-        node1.start();

-        node2.start();

-

-        Runnable client = ((Node)node2).getService(Runnable.class, "ApplClient/Runnable");

-        client.run();

-

-        node2.stop();

-        node1.stop();

-        jmsBroker.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/resources/jndi.properties b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/resources/jndi.properties
deleted file mode 100644
index 88270fd1e0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/main/resources/jndi.properties
+++ /dev/null
@@ -1,39 +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.

-## ---------------------------------------------------------------------------

-

-# START SNIPPET: jndi

-

-java.naming.factory.initial = org.apache.activemq.jndi.ActiveMQInitialContextFactory

-

-# use the following property to configure the default connector

-java.naming.provider.url = vm://localhost?broker.persistent=false

-

-# use the following property to specify the JNDI name the connection factory

-# should appear as. 

-#connectionFactoryNames = connectionFactory, queueConnectionFactory, topicConnectionFactry

-connectionFactoryNames = ConnectionFactory

-

-# register some queues in JNDI using the form

-# queue.[jndiName] = [physicalName]

-queue.BookTrip = BookTripRequestQueue

-queue.Checkout = CheckoutRequestQueue

-

-# register some topics in JNDI using the form

-# topic.[jndiName] = [physicalName]

-#topic.MyTopic = example.MyTopic

-

-# END SNIPPET: jndi

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/test/java/scatours/BuildingBlocksTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/test/java/scatours/BuildingBlocksTestCase.java
deleted file mode 100644
index 55943e2f45..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/buildingblocks/src/test/java/scatours/BuildingBlocksTestCase.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package scatours;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests the launcher

- */

-public class BuildingBlocksTestCase {

-

-    @Before

-    public void startServer() throws Exception {

-    }

-

-    @Test

-    public void testLauncher() throws Exception {

-        BuildingBlocksLauncher.main(null);

-    }

-

-    @After

-    public void stopServer() throws Exception {

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/build.xml
deleted file mode 100644
index c5f32d4588..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-launcher-currency-converter-corba" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <!-- After starting the SCA CORBA service by invoking the "run" target below,

-       the CORBA Java implementation of the currency converter client should be

-       run in another process using the "run-client" target. -->

-    <target name="run-client">

-        <ant dir="../../clients/currency-converter-corba" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.CurrencyConverterCORBALauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
deleted file mode 100644
index 93e38eee83..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/pom.xml
+++ /dev/null
@@ -1,104 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-currency-converter-corba</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter CORBA Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-corba-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-corba-jse-tns</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.CurrencyConverterCORBALauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                      

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java
deleted file mode 100644
index 514fc9fb41..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/CurrencyConverterCORBALauncher.java
+++ /dev/null
@@ -1,52 +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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-import scatours.currencyconverter.CurrencyConverter;

-

-public class CurrencyConverterCORBALauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution currencyCORBAContribution = locate("currency-corba");

-        Contribution currencyContribution = locate("currency");

-

-        Node node =

-            NodeFactory.getInstance().createNode("currency-converter-corba.composite",

-                                                       currencyContribution,

-                                                       currencyCORBAContribution);

-        node.start();

-

-        System.out.println("Quick currency converter test");

-        CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");

-        System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));

-        System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");

-

-        System.out.println("Node started - Press enter to shutdown.");

-        System.in.read();

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java
deleted file mode 100644
index 80d623d22d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-corba/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package scatours.currencyconverter;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The CurrencyConverter service interface

- */

-@Remotable

-public interface CurrencyConverter {

-

-    double getExchangeRate(String fromCurrencyCode, String toCurrencyCode);

-

-    double convert(String fromCurrencyCode, String toCurrencyCode, double amount);

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml
deleted file mode 100644
index 3ccf56b2c8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-launcher-currency-converter-jms" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <!-- After starting the SCA JMS service by invoking the "run" target below,

-       the ActiveMQ JMS implementation of the currency converter client should be

-       run in another process using the "run-client" target. -->

-    <target name="run-client">

-        <ant dir="../../clients/currency-converter-jms" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.CurrencyConverterJMSLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
deleted file mode 100644
index 6243a02f4b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/pom.xml
+++ /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.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-currency-converter-jms</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter JMS Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-jms-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-all</artifactId>

-            <version>5.2.0</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.activemq</groupId>

-                    <artifactId>activemq-web-demo</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.CurrencyConverterJMSLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                             

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.java
deleted file mode 100644
index 306ec1a9bf..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-jms/src/main/java/scatours/CurrencyConverterJMSLauncher.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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.activemq.broker.BrokerService;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-public class CurrencyConverterJMSLauncher {

-

-    public static void main(String[] args) throws Exception {

-        final BrokerService jmsBroker = new BrokerService();

-        jmsBroker.setPersistent(false);

-        jmsBroker.setUseJmx(false);

-        jmsBroker.addConnector("tcp://localhost:61619");

-        jmsBroker.start();

-

-        Contribution currencyJMSContribution = locate("currency-jms");

-        Contribution currencyContribution = locate("currency");

-

-        Node node =

-            NodeFactory.getInstance().createNode("currency-converter-jms.composite",

-                                                       currencyContribution,

-                                                       currencyJMSContribution);

-        node.start();

-

-        System.out.println("Node started - Press enter to shutdown.");

-        System.in.read();

-

-        node.stop();

-        jmsBroker.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/build.xml
deleted file mode 100644
index 8990723c63..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-launcher-currency-converter-rmi" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <!-- After starting the SCA RMI service by invoking the "run" target below,

-       the RMI Java implementation of the currency converter client should be

-       run in another process using the "run-client" target. -->

-    <target name="run-client">

-        <ant dir="../../clients/currency-converter-rmi" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.CurrencyConverterRMILauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
deleted file mode 100644
index 588fd37dc3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-currency-converter-rmi</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter RMI Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-            

-       <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-rmi</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.CurrencyConverterRMILauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                     

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
deleted file mode 100644
index 3ebd23b2d0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/com/tuscanyscatours/currencyconverter/CurrencyConverter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package com.tuscanyscatours.currencyconverter;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The CurrencyConverter service interface

- */

-@Remotable

-public interface CurrencyConverter {

-

-    double getExchangeRate(String fromCurrencyCode, String toCurrencyCode);

-

-    double convert(String fromCurrencyCode, String toCurrencyCode, double amount);

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java
deleted file mode 100644
index 8af4a90f57..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-rmi/src/main/java/scatours/CurrencyConverterRMILauncher.java
+++ /dev/null
@@ -1,56 +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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-import com.tuscanyscatours.currencyconverter.CurrencyConverter;

-

-public class CurrencyConverterRMILauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution currencyRMIContribution = locate("currency-rmi");

-        Contribution currencyContribution = locate("currency");

-

-        Node node =

-            NodeFactory.getInstance().createNode("currency-converter-rmi.composite",

-                                                       currencyContribution,

-                                                       currencyRMIContribution);

-        node.start();

-

-        System.out.println("Quick currency converter test");

-        CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");

-        System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));

-        System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");

-

-        System.out.println("Node started - Press enter to shutdown.");

-        System.in.read();

-        node.stop();

-

-        // The following line is a workaround for TUSCANY-3277 when running

-        // on Tuscany SCA 1.6 (the JVM hangs when exiting).

-        System.exit(0);

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/build.xml
deleted file mode 100644
index 2fd3663bab..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-launcher-currency-converter-ws" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <!-- After starting the SCA Web service by invoking the "run" target below,

-       the JAX-WS implementation of the currency converter client should be

-       run in another process using the "run-client" target. -->

-    <target name="run-client">

-        <ant dir="../../clients/currency-converter-ws-jaxws" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.CurrencyConverterWSLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
deleted file mode 100644
index f231094902..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/pom.xml
+++ /dev/null
@@ -1,105 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-currency-converter-ws</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter Web Service Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.CurrencyConverterWSLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.java
deleted file mode 100644
index c844463cbf..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/CurrencyConverterWSLauncher.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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-import scatours.currencyconverter.CurrencyConverter;

-

-public class CurrencyConverterWSLauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution currencyWSContribution = locate("currency-ws");

-        Contribution currencyContribution = locate("currency");

-

-        Node node =

-            NodeFactory.getInstance().createNode("currency-converter-ws.composite",

-                                                       currencyContribution,

-                                                       currencyWSContribution);

-        node.start();

-

-        System.out.println("Quick currency converter test");

-        CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");

-        System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));

-        System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");

-

-        System.out.println("Node started - Press enter to shutdown.");

-        System.in.read();

-

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java
deleted file mode 100644
index 80d623d22d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter-ws/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package scatours.currencyconverter;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The CurrencyConverter service interface

- */

-@Remotable

-public interface CurrencyConverter {

-

-    double getExchangeRate(String fromCurrencyCode, String toCurrencyCode);

-

-    double convert(String fromCurrencyCode, String toCurrencyCode, double amount);

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/build.xml
deleted file mode 100644
index 2cd41af723..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-currency-converter" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <target name="run">

-        <java classname="scatours.CurrencyConverterLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
deleted file mode 100644
index 9b3f0db297..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/pom.xml
+++ /dev/null
@@ -1,90 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-currency-converter</artifactId>

-    <name>Apache Tuscany SCA Tours Currency Converter Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.CurrencyConverterLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>              

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.java
deleted file mode 100644
index 7d7d6e3987..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/CurrencyConverterLauncher.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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-import scatours.currencyconverter.CurrencyConverter;

-

-public class CurrencyConverterLauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution currencyContribution = locate("currency");

-

-        Node node = NodeFactory.getInstance().createNode("currency-converter.composite", currencyContribution);

-        node.start();

-

-        System.out.println("Quick currency converter test");

-        CurrencyConverter converter = ((Node)node).getService(CurrencyConverter.class, "CurrencyConverter");

-        System.out.println("USD -> GBP = " + converter.getExchangeRate("USD", "GBP"));

-        System.out.println("100 USD = " + converter.convert("USD", "GBP", 100) + "GBP");

-

-        System.out.println("Node started - Press enter to shutdown.");

-        System.in.read();

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java
deleted file mode 100644
index 80d623d22d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/currency-converter/src/main/java/scatours/currencyconverter/CurrencyConverter.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package scatours.currencyconverter;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * The CurrencyConverter service interface

- */

-@Remotable

-public interface CurrencyConverter {

-

-    double getExchangeRate(String fromCurrencyCode, String toCurrencyCode);

-

-    double convert(String fromCurrencyCode, String toCurrencyCode, double amount);

-

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/build.xml
deleted file mode 100644
index dc099ea479..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-databinding" default="compile">
-    <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
-    </path>
-
-    <target name="run">
-        <java classname="scatours.DatabindingLauncher" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="target/${ant.project.name}.jar"/>
-                <path refid="compile-path"/>
-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml
deleted file mode 100644
index 176570ffdd..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/pom.xml
+++ /dev/null
@@ -1,169 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-launcher-databinding</artifactId>
-    <name>Apache Tuscany SCA Tours Databinding Launcher</name>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-util-launcher-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
-                        </manifestEntries>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.DatabindingLauncher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java
deleted file mode 100644
index d7cae1e280..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/databinding/src/main/java/scatours/DatabindingLauncher.java
+++ /dev/null
@@ -1,45 +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 scatours;
-
-import static scatours.launcher.LauncherUtil.locate;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-public class DatabindingLauncher {
-    public static void main(String[] args) throws Exception {
-        Node node1 = NodeFactory.getInstance().createNode(
-                                                                   locate("payment-java"), 
-                                                                   locate("databinding-client"));
-
-        Node node2 = NodeFactory.getInstance().createNode(locate("creditcard-payment-sdo"));
-
-        node1.start();
-        node2.start();
-
-        Runnable runner = ((Node)node1).getService(Runnable.class, "TestClient/Runnable");
-        runner.run();
-
-        node1.stop();
-        node2.stop();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/build.xml
deleted file mode 100644
index 826c542cdb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-feed-logger" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <target name="run">

-        <java classname="scatours.FeedLoggerLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
deleted file mode 100644
index 4115eb92ab..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-    * Licensed to the Apache Software Foundation (ASF) under one

-    * or more contributor license agreements.  See the NOTICE file

-    * distributed with this work for additional information

-    * regarding copyright ownership.  The ASF licenses this file

-    * to you under the Apache License, Version 2.0 (the

-    * "License"); you may not use this file except in compliance

-    * with the License.  You may obtain a copy of the License at

-    * 

-    *   http://www.apache.org/licenses/LICENSE-2.0

-    * 

-    * Unless required by applicable law or agreed to in writing,

-    * software distributed under the License is distributed on an

-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-    * KIND, either express or implied.  See the License for the

-    * specific language governing permissions and limitations

-    * under the License.    

--->

-<project>

-    <modelVersion>4.0.0</modelVersion>

-    <parent>

-        <groupId>org.apache.tuscany.sca</groupId>

-        <artifactId>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-feed-logger</artifactId>

-    <name>Apache Tuscany SCA Tours Feed Logger Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-atom-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rss-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.FeedLoggerLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>       

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java
deleted file mode 100644
index 35c3560645..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/FeedLoggerLauncher.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-

-package scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-import scatours.feedlogger.FeedLogger;

-

-public class FeedLoggerLauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution feedContribution = locate("feed-logger");

-

-        Node node = NodeFactory.getInstance().createNode("feed-logger.composite", feedContribution);

-        node.start();

-

-        FeedLogger logger = ((Node)node).getService(FeedLogger.class, "FeedLogger");

-        logger.logFeeds(5);

-

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/feedlogger/FeedLogger.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/feedlogger/FeedLogger.java
deleted file mode 100644
index 8187e34d2c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/feed-logger/src/main/java/scatours/feedlogger/FeedLogger.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 scatours.feedlogger;
-
-public interface FeedLogger {
-
-    /**
-     * Captures the configured feeds and logs the feed entries.
-     * 
-     * @param maxEntriesPerFeed The maximum number of entries to log per feed 
-     */
-    public void logFeeds(int maxEntriesPerFeed);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/build.xml
deleted file mode 100644
index 10df2cf9f8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/build.xml
+++ /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.

--->

-

-<project name="scatours-launcher-fullapp-domain" default="run">

-    <import file="../../antdefs.xml"/>

-

-    <!-- The "run" target runs the DomainManagerLauncher class directly

-       (as if it had been invoked from a command line) and passes in the

-       domain configuration directory as a command-line argument.  This

-       only works with Tuscany SCA Java version 1.6 and above. -->

-    <target name="run">

-        <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"

-              dir="." fork="true" failonerror="true">

-            <classpath>

-                <fileset dir="${env.TUSCANY_HOME}/modules">

-                    <include name="tuscany-node-launcher-*.jar"/>

-                </fileset>

-            </classpath>

-        	<arg value="./target/classes"/>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
deleted file mode 100644
index c0e8f0c83d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/pom.xml
+++ /dev/null
@@ -1,115 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-fullapp-domain</artifactId>

-    <name>Apache Tuscany SCA Tours Full App Domain Launcher</name>

-    

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-bespoketrip</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-currency</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-coordination</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-packagedtrip</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-payment-java</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-shoppingcart</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-fullapp-ui</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.FullAppDomainLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                      

-    </build>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.java
deleted file mode 100644
index 599ca75e24..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-domain/src/main/java/scatours/FullAppDomainLauncher.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 scatours;
-
-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;
-
-public class FullAppDomainLauncher {
-
-    public static void main(String[] args) throws Exception {
-        String[] dmArgs = {"../domainconfig/fullapp"};
-        DomainManagerLauncher.main(dmArgs);
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/build.xml
deleted file mode 100644
index b147a2087a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/build.xml
+++ /dev/null
@@ -1,37 +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="scatours-launcher-fullapp-nodes" default="compile">
-    <import file="../../antdefs.xml"/>
-
-    <!-- Before invoking the "run" target, the domain manager needs
-       to be started and running in a different process. -->
-    <target name="run-domain">
-        <ant dir="../fullapp-domain" target="run"/>
-    </target>
-
-    <target name="run">
-        <java classname="scatours.FullAppNodesLauncher" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="target/${ant.project.name}.jar"/>
-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
deleted file mode 100644
index 37d85ead4b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/pom.xml
+++ /dev/null
@@ -1,212 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-launcher-fullapp-nodes</artifactId>
-    <name>Apache Tuscany SCA Tours Full Application Nodes Launcher</name>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>        
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-launcher</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-sca</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-<!-- 
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-transaction</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency> 
--->
-        
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.FullAppNodesLauncher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>              
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java
deleted file mode 100644
index cd618a45e0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp-nodes/src/main/java/scatours/FullAppNodesLauncher.java
+++ /dev/null
@@ -1,78 +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 scatours;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-public class FullAppNodesLauncher {
-
-    public static void main(String[] args) throws Exception {
-        Node nodeCreditcard =
-            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/creditcard");
-        nodeCreditcard.start();
-
-        Node nodePayment =
-            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/payment");
-        nodePayment.start();
-
-        Node nodeShoppingcart =
-            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/shoppingcart");
-        nodeShoppingcart.start();
-
-        Node nodeCurrency =
-            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/currency");
-        nodeCurrency.start();
-
-        Node nodePackagedtrip =
-            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/packagedtrip");
-        nodePackagedtrip.start();
-
-        Node nodeBespoketrip =
-            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/bespoketrip");
-        nodeBespoketrip.start();
-
-        Node nodeFrontend =
-            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/coordination");
-        nodeFrontend.start();
-
-        Node nodeUI = NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/ui");
-        nodeUI.start();
-
-        System.out.println("Point your browser at - http://localhost:8080/scatours/ ");
-        System.out.println("Nodes started - Press enter to shutdown.");
-
-        try {
-            System.in.read();
-        } catch (IOException e) {
-        }
-
-        nodeCreditcard.stop();
-        nodePayment.stop();
-        nodeShoppingcart.stop();
-        nodeCurrency.stop();
-        nodePackagedtrip.stop();
-        nodeBespoketrip.stop();
-        nodeFrontend.stop();
-        nodeUI.stop();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/build.xml
deleted file mode 100644
index ab2f62460c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-fullapp" default="compile">
-    <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
-    </path>
-
-    <target name="run">
-        <java classname="scatours.FullAppLauncher" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="target/${ant.project.name}.jar"/>
-                <path refid="compile-path"/>
-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
deleted file mode 100644
index 0043e0b7bf..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/pom.xml
+++ /dev/null
@@ -1,208 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-launcher-fullapp</artifactId>
-    <name>Apache Tuscany SCA Tours Full Application Launcher</name>
-
-    <dependencies>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-util-launcher-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>        
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-js-dojo</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency> 
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-sca</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.derby</groupId>
-            <artifactId>derby</artifactId>
-            <version>10.3.1.4</version>
-            <scope>runtime</scope>
-        </dependency>
-
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
-                        </manifestEntries>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.FullAppLauncher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>              
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
deleted file mode 100644
index c3f68e2d60..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/fullapp/src/main/java/scatours/FullAppLauncher.java
+++ /dev/null
@@ -1,66 +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 scatours;
-
-import static scatours.launcher.LauncherUtil.locate;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-public class FullAppLauncher {
-
-    public static void main(String[] args) throws Exception {
-        Node node =
-            NodeFactory.getInstance().createNode(
-                                                       locate("common"),
-                                                       locate("currency"),
-                                                       locate("hotel"),
-                                                       locate("flight"),
-                                                       locate("car"),
-                                                       locate("trip"),
-                                                       locate("tripbooking"),
-                                                       locate("travelcatalog"),
-                                                       //locate("payment-java-policy"),
-                                                       locate("payment-spring-policy"),
-                                                       locate("creditcard-payment-jaxb-policy"),
-                                                       locate("shoppingcart"),
-                                                       locate("scatours"),
-                                                       locate("fullapp-ui"),
-                                                       locate("fullapp-coordination"),
-                                                       locate("fullapp-currency"),
-                                                       locate("fullapp-packagedtrip"),
-                                                       locate("fullapp-bespoketrip"),
-                                                       locate("fullapp-shoppingcart"));
-
-        node.start();
-
-        System.out.println("Point your browser at - http://localhost:8080/scatours/ ");
-        System.out.println("Node started - Press enter to shutdown.");
-
-        try {
-            System.in.read();
-        } catch (IOException e) {
-        }
-
-        node.stop();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/build.xml
deleted file mode 100644
index a763c082e0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-help-pages" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <target name="run">

-        <java classname="scatours.HelpPagesLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
deleted file mode 100644
index 0c83357935..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/pom.xml
+++ /dev/null
@@ -1,104 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-help-pages</artifactId>

-    <name>Apache Tuscany SCA Tours Help Pages Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-resource-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-http-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.HelpPagesLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>  

-        </plugins>     

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java
deleted file mode 100644
index 4b8960e6ae..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/help-pages/src/main/java/scatours/HelpPagesLauncher.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-

-package scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-public class HelpPagesLauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution helpContribution = locate("help-pages");

-

-        Node node = NodeFactory.getInstance().createNode("help-pages.composite", helpContribution);

-        node.start();

-

-        System.out.println("Node started - Press enter to shutdown.");

-        System.out.println();

-        System.out.println("To view the help pages, use your Web browser to view:");

-        System.out.println("    http://localhost:8085/help/index.html");

-        System.out.println();

-        System.in.read();

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/build.xml
deleted file mode 100644
index 8db09fe972..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-interaction" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <target name="run">

-        <java classname="scatours.InteractionLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
deleted file mode 100644
index c259624844..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/pom.xml
+++ /dev/null
@@ -1,104 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-interaction</artifactId>

-    <name>Apache Tuscany SCA Tours Interaction Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.InteractionLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>  

-        </plugins>            

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
deleted file mode 100644
index 9b66a5c838..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/main/java/scatours/InteractionLauncher.java
+++ /dev/null
@@ -1,70 +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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-public class InteractionLauncher {

-

-    public static void main(String[] args) throws Exception {

-        Node node1 =

-            NodeFactory.getInstance().createNode("client.composite",

-                                                       locate("common"),

-                                                       locate("currency"),

-                                                       locate("calendar"),

-                                                       locate("shoppingcart"),

-                                                       locate("interaction-client"));

-

-        Node node2 =

-            NodeFactory.getInstance().createNode("service.composite",

-                                                       locate("common"),

-                                                       locate("hotel"),

-                                                       locate("flight"),

-                                                       locate("interaction-service-remote"));

-

-        node2.start();

-        node1.start();

-

-        Runnable localInteraction = ((Node)node1).getService(Runnable.class, "InteractionLocalClient/Runnable");

-        localInteraction.run();

-

-        Runnable remoteInteraction = ((Node)node1).getService(Runnable.class, "InteractionRemoteClient/Runnable");

-        remoteInteraction.run();

-

-        Runnable requestResponseInteraction =

-            ((Node)node1).getService(Runnable.class, "InteractionRequestResponseClient/Runnable");

-        requestResponseInteraction.run();

-

-        Runnable onewayCallbackInteraction =

-            ((Node)node1).getService(Runnable.class, "InteractionOneWayCallbackClient/Runnable");

-        onewayCallbackInteraction.run();

-

-        Runnable conversationalInteraction =

-            ((Node)node1).getService(Runnable.class, "InteractionConversationClient/Runnable");

-        conversationalInteraction.run();

-

-        node1.stop();

-        node2.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/test/java/scatours/InteractionTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/test/java/scatours/InteractionTestCase.java
deleted file mode 100644
index c64e5d1e5b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/interaction/src/test/java/scatours/InteractionTestCase.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package scatours;

-

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests the launcher

- */

-public class InteractionTestCase {

-

-    @Before

-    public void startServer() throws Exception {

-    }

-

-    @Test

-    public void testLauncher() throws Exception {

-        InteractionLauncher.main(null);

-    }

-

-    @After

-    public void stopServer() throws Exception {

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/build.xml
deleted file mode 100644
index 84b3ade200..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-launcher-introducing-client" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <!-- Before invoking the "run" target, the domain manager and the

-       introducing-trips and introducing-tours nodes need to be started

-       and running in different processes. -->

-    <target name="run-domain">

-        <ant dir="../introducing-domain" target="run"/>

-    </target>

-    <target name="run-trips">

-        <ant dir="../introducing-trips" target="run"/>

-    </target>

-    <target name="run-tours">

-        <ant dir="../introducing-tours" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.IntroducingClientLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
deleted file mode 100644
index 95e327481a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/pom.xml
+++ /dev/null
@@ -1,93 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-introducing-client</artifactId>

-    <name>Apache Tuscany SCA Tours Introducing Client Launcher</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-sca-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.IntroducingClientLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>  

-        </plugins>            

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java
deleted file mode 100644
index ade9ffad42..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-client/src/main/java/scatours/IntroducingClientLauncher.java
+++ /dev/null
@@ -1,37 +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 scatours;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-public class IntroducingClientLauncher {

-

-    public static void main(String[] args) throws Exception {

-        Node node =

-            NodeFactory.getInstance().createNodeFromURL("http://localhost:9990/node-config/ClientNode");

-        node.start();

-

-        Runnable client = node.getService(Runnable.class, "TestClient/Runnable");

-        client.run();

-

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/build.xml
deleted file mode 100644
index c1810f816b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/build.xml
+++ /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.

--->

-

-<project name="scatours-launcher-introducing-domain" default="run">

-    <import file="../../antdefs.xml"/>

-

-    <!-- The "run" target runs the DomainManagerLauncher class directly

-       (as if it had been invoked from a command line) and passes in the

-       domain configuration directory as a command-line argument.  This

-       only works with Tuscany SCA Java version 1.6 and above. -->

-    <target name="run">

-        <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher"

-              dir="." fork="true" failonerror="true">

-            <classpath>

-                <fileset dir="${env.TUSCANY_HOME}/modules">

-                    <include name="tuscany-node-launcher-*.jar"/>

-                </fileset>

-            </classpath>

-            <arg value="./target/classes"/>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
deleted file mode 100644
index 817f4409e5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/pom.xml
+++ /dev/null
@@ -1,80 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-introducing-domain</artifactId>

-    <name>Apache Tuscany SCA Tours Introducing Domain Launcher</name>

-    

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-tours</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-trips</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-contribution-introducing-client</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>        

-    </dependencies>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.IntroducingDomainLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                      

-    </build>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/src/main/java/scatours/IntroducingDomainLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/src/main/java/scatours/IntroducingDomainLauncher.java
deleted file mode 100644
index b9f7fe040f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-domain/src/main/java/scatours/IntroducingDomainLauncher.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 scatours;

-

-import org.apache.tuscany.sca.node.launcher.DomainManagerLauncher;

-

-public class IntroducingDomainLauncher {

-

-    public static void main(String[] args) throws Exception {

-        String[] dmArgs = {"../domainconfig/introducing"};

-        DomainManagerLauncher.main(dmArgs);

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/build.xml
deleted file mode 100644
index 1713b85e03..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/build.xml
+++ /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.

--->

-

-<project name="scatours-launcher-introducing-tours" default="run">

-    <import file="../../antdefs.xml"/>

-

-    <target name="run">

-        <java classname="org.apache.tuscany.sca.node.launcher.NodeLauncher"

-              fork="true" failonerror="true">

-            <arg value="http://localhost:9990/node-config/ToursNode"/>

-            <classpath>

-                <fileset dir="${env.TUSCANY_HOME}/modules">

-                    <include name="tuscany-node-launcher-*.jar"/>

-                </fileset>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml
deleted file mode 100644
index 77b8223a8d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/pom.xml
+++ /dev/null
@@ -1,58 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-introducing-tours</artifactId>

-    <name>Apache Tuscany SCA Tours Introducing Tours Launcher</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.IntroducingToursLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>  

-        </plugins>            

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/src/main/java/scatours/IntroducingToursLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/src/main/java/scatours/IntroducingToursLauncher.java
deleted file mode 100644
index 7a1dd79890..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-tours/src/main/java/scatours/IntroducingToursLauncher.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 scatours;

-

-import org.apache.tuscany.sca.node.launcher.NodeLauncher;

-

-public class IntroducingToursLauncher {

-

-    public static void main(String[] args) throws Exception {

-        String[] dmArgs = {"http://localhost:9990/node-config/ToursNode"};

-    	NodeLauncher.main(dmArgs);

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/build.xml
deleted file mode 100644
index 4059606a08..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/build.xml
+++ /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.

--->

-

-<project name="scatours-launcher-introducing-trips" default="run">

-    <import file="../../antdefs.xml"/>

-

-    <target name="run">

-        <java classname="org.apache.tuscany.sca.node.launcher.NodeLauncher"

-              fork="true" failonerror="true">

-            <arg value="http://localhost:9990/node-config/TripsNode"/>

-            <classpath>

-                <fileset dir="${env.TUSCANY_HOME}/modules">

-                    <include name="tuscany-node-launcher-*.jar"/>

-                </fileset>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml
deleted file mode 100644
index ccd54dc055..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/pom.xml
+++ /dev/null
@@ -1,58 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-introducing-trips</artifactId>

-    <name>Apache Tuscany SCA Tours Introducing Trips Launcher</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-launcher</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.IntroducingTripsLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>  

-        </plugins>            

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/src/main/java/scatours/IntroducingTripsLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/src/main/java/scatours/IntroducingTripsLauncher.java
deleted file mode 100644
index 781949940c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing-trips/src/main/java/scatours/IntroducingTripsLauncher.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 scatours;

-

-import org.apache.tuscany.sca.node.launcher.NodeLauncher;

-

-public class IntroducingTripsLauncher {

-

-    public static void main(String[] args) throws Exception {

-        String[] dmArgs = {"http://localhost:9990/node-config/TripsNode"};

-    	NodeLauncher.main(dmArgs);

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/build.xml
deleted file mode 100644
index 217679604d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-introducing" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <target name="run">

-        <java classname="scatours.IntroducingLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
deleted file mode 100644
index 4294dd2a96..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/pom.xml
+++ /dev/null
@@ -1,90 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-introducing</artifactId>

-    <name>Apache Tuscany SCA Tours Introducing Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.IntroducingLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>  

-        </plugins>                   

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java
deleted file mode 100644
index 7008c834b8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/main/java/scatours/IntroducingLauncher.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package scatours;
-
-import static scatours.launcher.LauncherUtil.locate;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-public class IntroducingLauncher {
-
-    public static void main(String[] args) throws Exception {
-        Node node =
-            NodeFactory.getInstance().createNode(
-                                                       locate("introducing-tours"),
-                                                       locate("introducing-trips"),
-                                                       locate("introducing-client"));
-
-        node.start();
-
-        Runnable proxy = ((Node)node).getService(Runnable.class, "TestClient/Runnable");
-        proxy.run();
-
-        node.stop();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.java
deleted file mode 100644
index 5270cbabe6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/introducing/src/test/java/scatours/IntroducingTestCase.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 scatours;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Test case to run the test code in the introducing-client contribution

- * that tests components and services in the introducing-tours contribution

- * and the introducing-trips contribution.

- */

-public class IntroducingTestCase {

-

-    private Node node;

-

-    @Before

-    public void startServer() throws Exception {

-        node =

-            NodeFactory.getInstance()

-                .createNode(

-                               new Contribution("introducing-tours",

-                                                   "../../contributions/introducing-tours/target/classes"),

-                               new Contribution("introducing-trips",

-                                                   "../../contributions/introducing-trips/target/classes"),

-                               new Contribution("introducing-client",

-                                                   "../../contributions/introducing-client/target/classes"));

-        node.start();

-    }

-

-    @Test

-    public void testClient() throws Exception {

-        Runnable proxy = ((Node)node).getService(Runnable.class, "TestClient/Runnable");

-        proxy.run();

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml
deleted file mode 100644
index 5da2b075b6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-jumpstart" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <target name="run">

-        <java classname="scatours.JumpstartLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
deleted file mode 100644
index ffc19a754a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/pom.xml
+++ /dev/null
@@ -1,90 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-jumpstart</artifactId>

-    <name>Apache Tuscany SCA Tours Jump Start Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-         <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.JumpstartLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                             

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
deleted file mode 100644
index f478aadae0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/JumpstartLauncher.java
+++ /dev/null
@@ -1,43 +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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-public class JumpstartLauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution gvtContribution = locate("introducing-trips");

-

-        Node node = NodeFactory.getInstance().createNode("trips.composite", gvtContribution);

-

-        node.start();

-

-        Trips tripProvider = node.getService(Trips.class, "TripProvider/Trips");

-

-        System.out.println("Trip boooking code = " + tripProvider.checkAvailability("FS1APR4", 1));

-

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java
deleted file mode 100644
index 32db895bf4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/main/java/scatours/Trips.java
+++ /dev/null
@@ -1,26 +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 scatours;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface Trips {

-    String checkAvailability(String trip, int people);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java
deleted file mode 100644
index 12654494ac..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/jumpstart/src/test/java/scatours/JumpstartTestCase.java
+++ /dev/null
@@ -1,56 +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 scatours;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.junit.After;

-import org.junit.Before;

-import org.junit.Test;

-

-/**

- * Tests the Jump Start scenario

- */

-public class JumpstartTestCase {

-

-    private Node node;

-

-    @Before

-    public void startServer() throws Exception {

-        node =

-            NodeFactory.getInstance()

-                .createNode("trips.composite",

-                               new Contribution("introducing-trips",

-                                                   "../../contributions/introducing-trips/target/classes"));

-        node.start();

-    }

-

-    @Test

-    public void testClient() throws Exception {

-        Trips tripProvider = ((Node)node).getService(Trips.class, "TripProvider/Trips");

-        System.out.println("Trip boooking code = " + tripProvider.checkAvailability("FS1APR4", 2));

-    }

-

-    @After

-    public void stopServer() throws Exception {

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/build.xml
deleted file mode 100644
index 4c2524fdd0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/build.xml
+++ /dev/null
@@ -1,41 +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="scatours-launcher-notification-corba" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <!-- Before invoking the "run" target, the CORBA SMS Gateway service

-       needs to be started and running in a different process. -->

-    <target name="run-smsgateway">

-        <ant dir="../../services/smsgateway-corba" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.NotificationCORBALauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
deleted file mode 100644
index 1670a304a4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/pom.xml
+++ /dev/null
@@ -1,104 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-notification-corba</artifactId>

-    <name>Apache Tuscany SCA Tours Notification CORBA Service Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-corba-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-corba-jse-tns</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.NotificationCORBALauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                                    

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.java
deleted file mode 100644
index c245dc57fb..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/NotificationCORBALauncher.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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-import scatours.notification.Notification;

-

-public class NotificationCORBALauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution notificationContribution = locate("notification");

-        Contribution notificationCORBAContribution = locate("notification-corba");

-

-        Node node =

-            NodeFactory.getInstance().createNode("notification-corba.composite",

-                                                       notificationContribution,

-                                                       notificationCORBAContribution);

-        node.start();

-

-        System.out.println("Quick notification test");

-        Notification notification = ((Node)node).getService(Notification.class, "Notification");

-        String accountID = "1234";

-        String subject = "Holiday payment taken";

-        String message = "Payment of £102.37 accepted...";

-        notification.notify(accountID, subject, message);

-

-        System.out.println("Node started - Press enter to shutdown.");

-        System.in.read();

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/notification/Notification.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/notification/Notification.java
deleted file mode 100644
index 020e1e40db..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-corba/src/main/java/scatours/notification/Notification.java
+++ /dev/null
@@ -1,26 +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 scatours.notification;
-
-public interface Notification {
-
-    boolean notify(String accountID, String subject, String message);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/build.xml
deleted file mode 100644
index ec1416635c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-launcher-notification-ejb" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <!-- Before invoking the "run" target, the EJB server for the SMS Gateway EJB

-       needs to be started and running in a different process. -->

-    <target name="run-smsgateway">

-        <ant dir="../../services/smsgateway-ejb" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.NotificationEJBLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-                <fileset dir="${env.OPENEJB_HOME}/lib"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
deleted file mode 100644
index 6f5d074213..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
+++ /dev/null
@@ -1,104 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-notification-ejb</artifactId>

-    <name>Apache Tuscany SCA Tours Notification EJB Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-           

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ejb</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ejb-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency> 

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar ../util/scatours-util-openejb-runtime.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.NotificationEJBLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                                       

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java
deleted file mode 100644
index d7b44c9c59..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/NotificationEJBLauncher.java
+++ /dev/null
@@ -1,59 +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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import javax.naming.Context;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-import scatours.notification.Notification;

-

-public class NotificationEJBLauncher {

-

-    public static void main(String[] args) throws Exception {

-        System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");

-        System.setProperty(Context.PROVIDER_URL, "ejbd://localhost:4201");

-

-        Contribution notificationContribution = locate("notification");

-        Contribution notificationEJBContribution = locate("notification-ejb");

-

-        Node node =

-            NodeFactory.getInstance().createNode("notification-ejb.composite",

-                                                       notificationContribution,

-                                                       notificationEJBContribution);

-        node.start();

-

-        System.out.println("Quick notification test");

-        Notification notification = ((Node)node).getService(Notification.class, "Notification");

-        String accountID = "1234";

-        String subject = "Holiday payment taken";

-        String message = "Payment of £102.37 accepted...";

-        notification.notify(accountID, subject, message);

-

-        System.out.println("Node started - Press enter to shutdown.");

-        System.in.read();

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/notification/Notification.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/notification/Notification.java
deleted file mode 100644
index 020e1e40db..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ejb/src/main/java/scatours/notification/Notification.java
+++ /dev/null
@@ -1,26 +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 scatours.notification;
-
-public interface Notification {
-
-    boolean notify(String accountID, String subject, String message);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/build.xml
deleted file mode 100644
index e7129ddc61..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/build.xml
+++ /dev/null
@@ -1,41 +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="scatours-launcher-notification-jms" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <!-- Before invoking the "run" target, the JMS implementation of the

-       SMS gateway needs to be started and running in a different process. -->

-    <target name="run-smsgateway">

-        <ant dir="../../services/smsgateway-jms" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.NotificationJMSLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
deleted file mode 100644
index 69da77abab..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/pom.xml
+++ /dev/null
@@ -1,142 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-notification-jms</artifactId>

-    <name>Apache Tuscany SCA Tours Notification JMS Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-all</artifactId>

-            <version>5.2.0</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.activemq</groupId>

-                    <artifactId>activemq-web-demo</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-api</artifactId>

-            <version>1.2.7</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>xerces</groupId>

-                    <artifactId>xercesImpl</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>xml-apis</groupId>

-                    <artifactId>xml-apis</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-impl</artifactId>

-            <version>1.2.7</version>

-            <scope>runtime</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.NotificationJMSLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                                       

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java
deleted file mode 100644
index 55b0c0830a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/NotificationJMSLauncher.java
+++ /dev/null
@@ -1,56 +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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-import scatours.notification.Notification;

-

-public class NotificationJMSLauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution notificationContribution = locate("notification");

-        Contribution notificationJMSContribution = locate("notification-jms");

-

-        Node node =

-            NodeFactory.getInstance().createNode("notification-jms.composite",

-                                                       notificationContribution,

-                                                       notificationJMSContribution);

-

-        try {

-            node.start();

-

-            System.out.println("Quick notification test");

-            Notification notification = ((Node)node).getService(Notification.class, "Notification");

-            String accountID = "1234";

-            String subject = "Holiday payment taken";

-            String message = "Payment of £102.37 accepted...";

-            notification.notify(accountID, subject, message);

-            System.out.println("Notification sent");

-        } finally {

-            node.stop();

-        }

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/notification/Notification.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/notification/Notification.java
deleted file mode 100644
index 020e1e40db..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-jms/src/main/java/scatours/notification/Notification.java
+++ /dev/null
@@ -1,26 +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 scatours.notification;
-
-public interface Notification {
-
-    boolean notify(String accountID, String subject, String message);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/build.xml
deleted file mode 100644
index a4f7b17d01..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/build.xml
+++ /dev/null
@@ -1,41 +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="scatours-launcher-notification-rmi" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <!-- Before invoking the "run" target, the RMI server for the SMS Gateway

-       remote object needs to be started and running in a different process. -->

-    <target name="run-smsgateway">

-        <ant dir="../../services/smsgateway-rmi" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.NotificationRMILauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
deleted file mode 100644
index fe3140acb9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/pom.xml
+++ /dev/null
@@ -1,104 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-notification-rmi</artifactId>

-    <name>Apache Tuscany SCA Tours Notification RMI Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-rmi-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency> 

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.NotificationRMILauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                                  

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
deleted file mode 100644
index 4ce528fd23..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.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 com.tuscanyscatours.smsgateway;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * A gateway to send SMS messages.
- */
-public interface SMSGateway extends Remote {
-    boolean sendSMS(String fromNumber, String toNumber, String text) throws RemoteException;
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.java
deleted file mode 100644
index 48d229f2f0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/NotificationRMILauncher.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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-import scatours.notification.Notification;

-

-public class NotificationRMILauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution notificationContribution = locate("notification");

-        Contribution notificationRMIContribution = locate("notification-rmi");

-

-        Node node =

-            NodeFactory.getInstance().createNode("notification-rmi.composite",

-                                                       notificationContribution,

-                                                       notificationRMIContribution);

-        node.start();

-

-        System.out.println("Quick notification test");

-        Notification notification = ((Node)node).getService(Notification.class, "Notification");

-        String accountID = "1234";

-        String subject = "Holiday payment taken";

-        String message = "Payment of £102.37 accepted...";

-        notification.notify(accountID, subject, message);

-

-        System.out.println("Node started - Press enter to shutdown.");

-        System.in.read();

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/notification/Notification.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/notification/Notification.java
deleted file mode 100644
index 020e1e40db..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-rmi/src/main/java/scatours/notification/Notification.java
+++ /dev/null
@@ -1,26 +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 scatours.notification;
-
-public interface Notification {
-
-    boolean notify(String accountID, String subject, String message);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/build.xml
deleted file mode 100644
index a6a3ac5ef0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/build.xml
+++ /dev/null
@@ -1,41 +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="scatours-launcher-notification-ws" default="compile">

-    <import file="../../antdefs.xml"/>

-    <path id="compile-path">

-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>

-    </path>

-

-    <!-- Before invoking the "run" target, the JAX-WS server for the SMS Gateway

-       remote object needs to be started and running in a different process. -->

-    <target name="run-smsgateway">

-        <ant dir="../../services/smsgateway-jaxws" target="run"/>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.NotificationWSLauncher" fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="compile-path"/>

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
deleted file mode 100644
index 5e666379f6..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/pom.xml
+++ /dev/null
@@ -1,104 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launcher-notification-ws</artifactId>

-    <name>Apache Tuscany SCA Tours Notification Web Service Launcher</name>

-

-    <dependencies>

-    

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>scatours-util-launcher-common</artifactId>

-            <version>${pom.version}</version>

-            <scope>provided</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-api</artifactId>

-            <version>${tuscany.version}</version>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-implementation-java-runtime</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-node-impl</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.tuscany.sca</groupId>

-            <artifactId>tuscany-host-jetty</artifactId>

-            <version>${tuscany.version}</version>

-            <scope>runtime</scope>

-        </dependency> 

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>

-                        </manifestEntries>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.NotificationWSLauncher</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>       

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.java
deleted file mode 100644
index 8957e1ddf0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/NotificationWSLauncher.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 scatours;

-

-import static scatours.launcher.LauncherUtil.locate;

-

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.Contribution;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-

-import scatours.notification.Notification;

-

-public class NotificationWSLauncher {

-

-    public static void main(String[] args) throws Exception {

-        Contribution notificationContribution = locate("notification");

-        Contribution notificationWSContribution = locate("notification-ws");

-

-        Node node =

-            NodeFactory.getInstance().createNode("notification-ws.composite",

-                                                       notificationContribution,

-                                                       notificationWSContribution);

-        node.start();

-

-        System.out.println("Quick notification test");

-        Notification notification = ((Node)node).getService(Notification.class, "Notification");

-        String accountID = "1234";

-        String subject = "Holiday payment taken";

-        String message = "Payment of £102.37 accepted...";

-        notification.notify(accountID, subject, message);

-

-        System.out.println("Node started - Press enter to shutdown.");

-        System.in.read();

-        node.stop();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/notification/Notification.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/notification/Notification.java
deleted file mode 100644
index 020e1e40db..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/notification-ws/src/main/java/scatours/notification/Notification.java
+++ /dev/null
@@ -1,26 +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 scatours.notification;
-
-public interface Notification {
-
-    boolean notify(String accountID, String subject, String message);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
deleted file mode 100644
index f9d839c17e..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
+++ /dev/null
@@ -1,41 +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="scatours-launcher-payment-bpel" default="compile">
-    <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
-    </path>
-
-    <target name="run">
-        <unzip dest="target/ode">
-            <fileset dir="${env.TUSCANY_HOME}/lib">
-                <include name="ode-dao-jpa-ojpa-derby-*.zip"/>
-            </fileset>
-        </unzip>
-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="target/${ant.project.name}.jar"/>
-                <pathelement location="target/ode"/>
-                <path refid="compile-path"/>
-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
deleted file mode 100644
index 9416653519..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
+++ /dev/null
@@ -1,146 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-launcher-payment-bpel</artifactId>
-    <name>Apache Tuscany SCA Tours Payment BPEL Launcher</name>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-util-launcher-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>       
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <!-- Replace commons-logging-1.0.4 brought in by tuscany-implementation-bpel-ode --> 
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>avalon-framework</groupId>
-                    <artifactId>avalon-framework</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar ../ode/</Class-Path>
-                        </manifestEntries>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.payment.PaymentLauncher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>              
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
deleted file mode 100644
index e5f3ef3cad..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Status" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberResponseType", propOrder = {
-    "status"
-})
-public class MakePaymentMemberResponseType {
-
-    @XmlElement(name = "Status", required = true)
-    protected String status;
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
deleted file mode 100644
index ca94d86628..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
+++ /dev/null
@@ -1,82 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="CustomerId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Amount" type="{http://www.w3.org/2001/XMLSchema}float"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberType", propOrder = {
-    "customerId",
-    "amount"
-})
-public class MakePaymentMemberType {
-
-    @XmlElement(name = "CustomerId", required = true)
-    protected String customerId;
-    @XmlElement(name = "Amount")
-    protected float amount;
-
-    /**
-     * Gets the value of the customerId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    /**
-     * Sets the value of the customerId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCustomerId(String value) {
-        this.customerId = value;
-    }
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     */
-    public float getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     */
-    public void setAmount(float value) {
-        this.amount = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
deleted file mode 100644
index b069b2ba94..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.tuscanyscatours.payment package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _MakePaymentMember_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMember");
-    private final static QName _MakePaymentMemberResponse_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMemberResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.tuscanyscatours.payment
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberResponseType }
-     * 
-     */
-    public MakePaymentMemberResponseType createMakePaymentMemberResponseType() {
-        return new MakePaymentMemberResponseType();
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberType }
-     * 
-     */
-    public MakePaymentMemberType createMakePaymentMemberType() {
-        return new MakePaymentMemberType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMember")
-    public JAXBElement<MakePaymentMemberType> createMakePaymentMember(MakePaymentMemberType value) {
-        return new JAXBElement<MakePaymentMemberType>(_MakePaymentMember_QNAME, MakePaymentMemberType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMemberResponse")
-    public JAXBElement<MakePaymentMemberResponseType> createMakePaymentMemberResponse(MakePaymentMemberResponseType value) {
-        return new JAXBElement<MakePaymentMemberResponseType>(_MakePaymentMemberResponse_QNAME, MakePaymentMemberResponseType.class, null, value);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/Payment.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/Payment.java
deleted file mode 100644
index bbbd03d89a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/Payment.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "Payment", targetNamespace = "http://www.tuscanyscatours.com/Payment/")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface Payment {
-
-
-    /**
-     * 
-     * @param amount
-     * @param customerId
-     * @return
-     *     returns java.lang.String
-     */
-    @WebMethod(action = "http://www.tuscanyscatours.com/Payment/makePayment")
-    @WebResult(name = "Status", targetNamespace = "")
-    @RequestWrapper(localName = "makePaymentMember", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberType")
-    @ResponseWrapper(localName = "makePaymentMemberResponse", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberResponseType")
-    public String makePaymentMember(
-        @WebParam(name = "CustomerId", targetNamespace = "")
-        String customerId,
-        @WebParam(name = "Amount", targetNamespace = "")
-        float amount);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/PaymentService.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/PaymentService.java
deleted file mode 100644
index a430175976..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/PaymentService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "PaymentService", targetNamespace = "http://www.tuscanyscatours.com/Payment/", wsdlLocation = "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl")
-public class PaymentService
-    extends Service
-{
-
-    private final static URL PAYMENTSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.tuscanyscatours.payment.PaymentService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.tuscanyscatours.payment.PaymentService.class.getResource(".");
-            url = new URL(baseUrl, "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        PAYMENTSERVICE_WSDL_LOCATION = url;
-    }
-
-    public PaymentService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public PaymentService() {
-        super(PAYMENTSERVICE_WSDL_LOCATION, new QName("http://www.tuscanyscatours.com/Payment/", "PaymentService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort() {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class, features);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/package-info.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/package-info.java
deleted file mode 100644
index acd208f5c9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/com/tuscanyscatours/payment/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tuscanyscatours.com/Payment/")
-package com.tuscanyscatours.payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.java
deleted file mode 100644
index 2107c6ebcd..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-bpel/src/main/java/scatours/payment/PaymentLauncher.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 scatours.payment;
-
-import static scatours.launcher.LauncherUtil.locate;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import com.tuscanyscatours.payment.Payment;
-
-public class PaymentLauncher {
-
-    public static void main(String[] args) throws Exception {
-        Node node = NodeFactory.getInstance().createNode(
-                                                                  locate("payment-bpel-process"),
-        		                                                  locate("payment-bpel"),
-        		                                                  locate("creditcard-payment-jaxb"),
-        		                                                  locate("emailgateway"));
-        node.start();
-        
-        Node client = (Node)node;
-        Payment payment = client.getService(Payment.class, "Payment/paymentPartnerLink");
-
-        System.out.println("Payment BPEL test");
-        System.out.println("\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
-        System.out.println("\n\nFailed Payment - Status = \n\n" + payment.makePaymentMember("c-1", 100.00f));
-        
-        node.stop();
-
-        // The following line is a workaround for TUSCANY-3475 when running
-        // on Tuscany SCA 1.6 (the JVM waits for 60 seconds before exiting).
-        System.exit(0);
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml
deleted file mode 100644
index 17bd0943a0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-payment-groovy" default="compile">
-    <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
-    </path>
-
-    <target name="run">
-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="target/${ant.project.name}.jar"/>
-                <path refid="compile-path"/>
-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
deleted file mode 100644
index 6942fa7307..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/pom.xml
+++ /dev/null
@@ -1,129 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-launcher-payment-groovy</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Groovy Launcher</name>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-util-launcher-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-script</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
-                        </manifestEntries>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.payment.PaymentLauncher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>              
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
deleted file mode 100644
index 0e4e9726de..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/EmailGateway.java
+++ /dev/null
@@ -1,40 +0,0 @@
-
-package com.tuscanyscatours.emailgateway;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "EmailGateway", targetNamespace = "http://www.tuscanyscatours.com/EmailGateway/")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface EmailGateway {
-
-
-    /**
-     * 
-     * @param email
-     * @return
-     *     returns java.lang.String
-     */
-    @WebMethod(action = "http://www.tuscanyscatours.com/EmailGateway/sendEmail")
-    @WebResult(name = "Status", targetNamespace = "")
-    @RequestWrapper(localName = "sendEmail", targetNamespace = "http://www.tuscanyscatours.com/EmailGateway/", className = "com.tuscanyscatours.emailgateway.SendEmailType")
-    @ResponseWrapper(localName = "sendEmailResponse", targetNamespace = "http://www.tuscanyscatours.com/EmailGateway/", className = "com.tuscanyscatours.emailgateway.SendEmailResponseType")
-    public String sendEmail(
-        @WebParam(name = "Email", targetNamespace = "")
-        EmailType email);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/EmailGatewayService.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/EmailGatewayService.java
deleted file mode 100644
index 8f87855dd9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/EmailGatewayService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.emailgateway;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "EmailGatewayService", targetNamespace = "http://www.tuscanyscatours.com/EmailGateway/", wsdlLocation = "file:/C:/simon/tuscany/travelsample/contributions/payment-groovy/src/main/resources/EmailGateway.wsdl")
-public class EmailGatewayService
-    extends Service
-{
-
-    private final static URL EMAILGATEWAYSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.tuscanyscatours.emailgateway.EmailGatewayService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.tuscanyscatours.emailgateway.EmailGatewayService.class.getResource(".");
-            url = new URL(baseUrl, "file:/C:/simon/tuscany/travelsample/contributions/payment-groovy/src/main/resources/EmailGateway.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/C:/simon/tuscany/travelsample/contributions/payment-groovy/src/main/resources/EmailGateway.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        EMAILGATEWAYSERVICE_WSDL_LOCATION = url;
-    }
-
-    public EmailGatewayService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public EmailGatewayService() {
-        super(EMAILGATEWAYSERVICE_WSDL_LOCATION, new QName("http://www.tuscanyscatours.com/EmailGateway/", "EmailGatewayService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns EmailGateway
-     */
-    @WebEndpoint(name = "EmailGatewayPort")
-    public EmailGateway getEmailGatewayPort() {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/EmailGateway/", "EmailGatewayPort"), EmailGateway.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns EmailGateway
-     */
-    @WebEndpoint(name = "EmailGatewayPort")
-    public EmailGateway getEmailGatewayPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/EmailGateway/", "EmailGatewayPort"), EmailGateway.class, features);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/EmailType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/EmailType.java
deleted file mode 100644
index 25935d2303..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/EmailType.java
+++ /dev/null
@@ -1,118 +0,0 @@
-
-package com.tuscanyscatours.emailgateway;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for EmailType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="EmailType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="To" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Title" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Body" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "EmailType", propOrder = {
-    "to",
-    "title",
-    "body"
-})
-public class EmailType {
-
-    @XmlElement(name = "To", required = true)
-    protected String to;
-    @XmlElement(name = "Title", required = true)
-    protected String title;
-    @XmlElement(name = "Body", required = true)
-    protected String body;
-
-    /**
-     * Gets the value of the to property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTo() {
-        return to;
-    }
-
-    /**
-     * Sets the value of the to property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTo(String value) {
-        this.to = value;
-    }
-
-    /**
-     * Gets the value of the title property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * Sets the value of the title property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTitle(String value) {
-        this.title = value;
-    }
-
-    /**
-     * Gets the value of the body property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBody() {
-        return body;
-    }
-
-    /**
-     * Sets the value of the body property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBody(String value) {
-        this.body = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/ObjectFactory.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/ObjectFactory.java
deleted file mode 100644
index f414bb3eb3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/ObjectFactory.java
+++ /dev/null
@@ -1,79 +0,0 @@
-
-package com.tuscanyscatours.emailgateway;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.tuscanyscatours.emailgateway package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _SendEmailResponse_QNAME = new QName("http://www.tuscanyscatours.com/EmailGateway/", "sendEmailResponse");
-    private final static QName _SendEmail_QNAME = new QName("http://www.tuscanyscatours.com/EmailGateway/", "sendEmail");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.tuscanyscatours.emailgateway
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link SendEmailType }
-     * 
-     */
-    public SendEmailType createSendEmailType() {
-        return new SendEmailType();
-    }
-
-    /**
-     * Create an instance of {@link EmailType }
-     * 
-     */
-    public EmailType createEmailType() {
-        return new EmailType();
-    }
-
-    /**
-     * Create an instance of {@link SendEmailResponseType }
-     * 
-     */
-    public SendEmailResponseType createSendEmailResponseType() {
-        return new SendEmailResponseType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SendEmailResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/EmailGateway/", name = "sendEmailResponse")
-    public JAXBElement<SendEmailResponseType> createSendEmailResponse(SendEmailResponseType value) {
-        return new JAXBElement<SendEmailResponseType>(_SendEmailResponse_QNAME, SendEmailResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SendEmailType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/EmailGateway/", name = "sendEmail")
-    public JAXBElement<SendEmailType> createSendEmail(SendEmailType value) {
-        return new JAXBElement<SendEmailType>(_SendEmail_QNAME, SendEmailType.class, null, value);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/SendEmailResponseType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/SendEmailResponseType.java
deleted file mode 100644
index 6d366b7554..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/SendEmailResponseType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.tuscanyscatours.emailgateway;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for SendEmailResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SendEmailResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Status" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SendEmailResponseType", propOrder = {
-    "status"
-})
-public class SendEmailResponseType {
-
-    @XmlElement(name = "Status", required = true)
-    protected String status;
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/SendEmailType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/SendEmailType.java
deleted file mode 100644
index cc8e15366c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/SendEmailType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.tuscanyscatours.emailgateway;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for SendEmailType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SendEmailType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Email" type="{http://www.tuscanyscatours.com/EmailGateway/}EmailType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SendEmailType", propOrder = {
-    "email"
-})
-public class SendEmailType {
-
-    @XmlElement(name = "Email", required = true)
-    protected EmailType email;
-
-    /**
-     * Gets the value of the email property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EmailType }
-     *     
-     */
-    public EmailType getEmail() {
-        return email;
-    }
-
-    /**
-     * Sets the value of the email property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EmailType }
-     *     
-     */
-    public void setEmail(EmailType value) {
-        this.email = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/package-info.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/package-info.java
deleted file mode 100644
index 2c2d603ada..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/emailgateway/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tuscanyscatours.com/EmailGateway/")
-package com.tuscanyscatours.emailgateway;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
deleted file mode 100644
index e5f3ef3cad..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Status" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberResponseType", propOrder = {
-    "status"
-})
-public class MakePaymentMemberResponseType {
-
-    @XmlElement(name = "Status", required = true)
-    protected String status;
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
deleted file mode 100644
index ca94d86628..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
+++ /dev/null
@@ -1,82 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="CustomerId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Amount" type="{http://www.w3.org/2001/XMLSchema}float"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberType", propOrder = {
-    "customerId",
-    "amount"
-})
-public class MakePaymentMemberType {
-
-    @XmlElement(name = "CustomerId", required = true)
-    protected String customerId;
-    @XmlElement(name = "Amount")
-    protected float amount;
-
-    /**
-     * Gets the value of the customerId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    /**
-     * Sets the value of the customerId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCustomerId(String value) {
-        this.customerId = value;
-    }
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     */
-    public float getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     */
-    public void setAmount(float value) {
-        this.amount = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
deleted file mode 100644
index b069b2ba94..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.tuscanyscatours.payment package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _MakePaymentMember_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMember");
-    private final static QName _MakePaymentMemberResponse_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMemberResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.tuscanyscatours.payment
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberResponseType }
-     * 
-     */
-    public MakePaymentMemberResponseType createMakePaymentMemberResponseType() {
-        return new MakePaymentMemberResponseType();
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberType }
-     * 
-     */
-    public MakePaymentMemberType createMakePaymentMemberType() {
-        return new MakePaymentMemberType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMember")
-    public JAXBElement<MakePaymentMemberType> createMakePaymentMember(MakePaymentMemberType value) {
-        return new JAXBElement<MakePaymentMemberType>(_MakePaymentMember_QNAME, MakePaymentMemberType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMemberResponse")
-    public JAXBElement<MakePaymentMemberResponseType> createMakePaymentMemberResponse(MakePaymentMemberResponseType value) {
-        return new JAXBElement<MakePaymentMemberResponseType>(_MakePaymentMemberResponse_QNAME, MakePaymentMemberResponseType.class, null, value);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/Payment.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/Payment.java
deleted file mode 100644
index bbbd03d89a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/Payment.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "Payment", targetNamespace = "http://www.tuscanyscatours.com/Payment/")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface Payment {
-
-
-    /**
-     * 
-     * @param amount
-     * @param customerId
-     * @return
-     *     returns java.lang.String
-     */
-    @WebMethod(action = "http://www.tuscanyscatours.com/Payment/makePayment")
-    @WebResult(name = "Status", targetNamespace = "")
-    @RequestWrapper(localName = "makePaymentMember", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberType")
-    @ResponseWrapper(localName = "makePaymentMemberResponse", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberResponseType")
-    public String makePaymentMember(
-        @WebParam(name = "CustomerId", targetNamespace = "")
-        String customerId,
-        @WebParam(name = "Amount", targetNamespace = "")
-        float amount);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/PaymentService.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/PaymentService.java
deleted file mode 100644
index a430175976..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/PaymentService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "PaymentService", targetNamespace = "http://www.tuscanyscatours.com/Payment/", wsdlLocation = "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl")
-public class PaymentService
-    extends Service
-{
-
-    private final static URL PAYMENTSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.tuscanyscatours.payment.PaymentService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.tuscanyscatours.payment.PaymentService.class.getResource(".");
-            url = new URL(baseUrl, "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        PAYMENTSERVICE_WSDL_LOCATION = url;
-    }
-
-    public PaymentService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public PaymentService() {
-        super(PAYMENTSERVICE_WSDL_LOCATION, new QName("http://www.tuscanyscatours.com/Payment/", "PaymentService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort() {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class, features);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/package-info.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/package-info.java
deleted file mode 100644
index acd208f5c9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/com/tuscanyscatours/payment/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tuscanyscatours.com/Payment/")
-package com.tuscanyscatours.payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java
deleted file mode 100644
index 46edb706fc..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-groovy/src/main/java/scatours/payment/PaymentLauncher.java
+++ /dev/null
@@ -1,47 +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 scatours.payment;
-
-import static scatours.launcher.LauncherUtil.locate;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import com.tuscanyscatours.payment.Payment;
-
-public class PaymentLauncher {
-
-    public static void main(String[] args) throws Exception {
-        Node node = NodeFactory.getInstance().createNode(
-        		                                                  locate("payment-groovy"),
-        		                                                  locate("creditcard-payment-jaxb"),
-        		                                                  locate("emailgateway"));
-        node.start();
-        
-        Node client = (Node)node;
-        Payment payment = client.getService(Payment.class, "Payment");
-
-        System.out.println("Payment Groovy test");
-        System.out.println("\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
-        
-        node.stop();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/build.xml
deleted file mode 100644
index 9579c408ff..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-payment-java-policy" default="compile">
-    <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
-    </path>
-
-    <target name="run">
-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="target/${ant.project.name}.jar"/>
-                <path refid="compile-path"/>
-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
deleted file mode 100644
index c0177e8afa..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/pom.xml
+++ /dev/null
@@ -1,122 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-launcher-payment-java-policy</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Java Policy Launcher</name>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-util-launcher-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
-                        </manifestEntries>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.payment.PaymentLauncher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>              
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
deleted file mode 100644
index e5f3ef3cad..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Status" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberResponseType", propOrder = {
-    "status"
-})
-public class MakePaymentMemberResponseType {
-
-    @XmlElement(name = "Status", required = true)
-    protected String status;
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
deleted file mode 100644
index ca94d86628..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
+++ /dev/null
@@ -1,82 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="CustomerId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Amount" type="{http://www.w3.org/2001/XMLSchema}float"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberType", propOrder = {
-    "customerId",
-    "amount"
-})
-public class MakePaymentMemberType {
-
-    @XmlElement(name = "CustomerId", required = true)
-    protected String customerId;
-    @XmlElement(name = "Amount")
-    protected float amount;
-
-    /**
-     * Gets the value of the customerId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    /**
-     * Sets the value of the customerId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCustomerId(String value) {
-        this.customerId = value;
-    }
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     */
-    public float getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     */
-    public void setAmount(float value) {
-        this.amount = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
deleted file mode 100644
index b069b2ba94..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.tuscanyscatours.payment package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _MakePaymentMember_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMember");
-    private final static QName _MakePaymentMemberResponse_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMemberResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.tuscanyscatours.payment
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberResponseType }
-     * 
-     */
-    public MakePaymentMemberResponseType createMakePaymentMemberResponseType() {
-        return new MakePaymentMemberResponseType();
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberType }
-     * 
-     */
-    public MakePaymentMemberType createMakePaymentMemberType() {
-        return new MakePaymentMemberType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMember")
-    public JAXBElement<MakePaymentMemberType> createMakePaymentMember(MakePaymentMemberType value) {
-        return new JAXBElement<MakePaymentMemberType>(_MakePaymentMember_QNAME, MakePaymentMemberType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMemberResponse")
-    public JAXBElement<MakePaymentMemberResponseType> createMakePaymentMemberResponse(MakePaymentMemberResponseType value) {
-        return new JAXBElement<MakePaymentMemberResponseType>(_MakePaymentMemberResponse_QNAME, MakePaymentMemberResponseType.class, null, value);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/Payment.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/Payment.java
deleted file mode 100644
index bbbd03d89a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/Payment.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "Payment", targetNamespace = "http://www.tuscanyscatours.com/Payment/")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface Payment {
-
-
-    /**
-     * 
-     * @param amount
-     * @param customerId
-     * @return
-     *     returns java.lang.String
-     */
-    @WebMethod(action = "http://www.tuscanyscatours.com/Payment/makePayment")
-    @WebResult(name = "Status", targetNamespace = "")
-    @RequestWrapper(localName = "makePaymentMember", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberType")
-    @ResponseWrapper(localName = "makePaymentMemberResponse", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberResponseType")
-    public String makePaymentMember(
-        @WebParam(name = "CustomerId", targetNamespace = "")
-        String customerId,
-        @WebParam(name = "Amount", targetNamespace = "")
-        float amount);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/PaymentService.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/PaymentService.java
deleted file mode 100644
index a430175976..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/PaymentService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "PaymentService", targetNamespace = "http://www.tuscanyscatours.com/Payment/", wsdlLocation = "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl")
-public class PaymentService
-    extends Service
-{
-
-    private final static URL PAYMENTSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.tuscanyscatours.payment.PaymentService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.tuscanyscatours.payment.PaymentService.class.getResource(".");
-            url = new URL(baseUrl, "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        PAYMENTSERVICE_WSDL_LOCATION = url;
-    }
-
-    public PaymentService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public PaymentService() {
-        super(PAYMENTSERVICE_WSDL_LOCATION, new QName("http://www.tuscanyscatours.com/Payment/", "PaymentService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort() {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class, features);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/package-info.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/package-info.java
deleted file mode 100644
index acd208f5c9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/com/tuscanyscatours/payment/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tuscanyscatours.com/Payment/")
-package com.tuscanyscatours.payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java
deleted file mode 100644
index cda3ebd091..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java-policy/src/main/java/scatours/payment/PaymentLauncher.java
+++ /dev/null
@@ -1,47 +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 scatours.payment;
-
-import static scatours.launcher.LauncherUtil.locate;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import com.tuscanyscatours.payment.Payment;
-
-public class PaymentLauncher {
-
-    public static void main(String[] args) throws Exception {
-        Node node = NodeFactory.getInstance().createNode(
-        		                                                  locate("payment-java-policy"),
-        		                                                  locate("creditcard-payment-jaxb-policy"));
-        node.start();
-        
-        Node client = (Node)node;
-        Payment payment = client.getService(Payment.class, "Payment");
-
-        System.out.println("Payment Java Policy test");
-        System.out.println("\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
-        System.out.println("\n\nFailed Payment - Status = \n\n" + payment.makePaymentMember("c-1", 100.00f));
-        
-        node.stop();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/build.xml
deleted file mode 100644
index 1e3c69119f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-payment-java" default="compile">
-    <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
-    </path>
-
-    <target name="run">
-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="target/${ant.project.name}.jar"/>
-                <path refid="compile-path"/>
-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
deleted file mode 100644
index c8889d109a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/pom.xml
+++ /dev/null
@@ -1,122 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-launcher-payment-java</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Java Launcher</name>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-util-launcher-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
-                        </manifestEntries>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.payment.PaymentLauncher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>              
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
deleted file mode 100644
index e5f3ef3cad..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Status" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberResponseType", propOrder = {
-    "status"
-})
-public class MakePaymentMemberResponseType {
-
-    @XmlElement(name = "Status", required = true)
-    protected String status;
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
deleted file mode 100644
index ca94d86628..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
+++ /dev/null
@@ -1,82 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="CustomerId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Amount" type="{http://www.w3.org/2001/XMLSchema}float"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberType", propOrder = {
-    "customerId",
-    "amount"
-})
-public class MakePaymentMemberType {
-
-    @XmlElement(name = "CustomerId", required = true)
-    protected String customerId;
-    @XmlElement(name = "Amount")
-    protected float amount;
-
-    /**
-     * Gets the value of the customerId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    /**
-     * Sets the value of the customerId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCustomerId(String value) {
-        this.customerId = value;
-    }
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     */
-    public float getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     */
-    public void setAmount(float value) {
-        this.amount = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
deleted file mode 100644
index b069b2ba94..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.tuscanyscatours.payment package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _MakePaymentMember_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMember");
-    private final static QName _MakePaymentMemberResponse_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMemberResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.tuscanyscatours.payment
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberResponseType }
-     * 
-     */
-    public MakePaymentMemberResponseType createMakePaymentMemberResponseType() {
-        return new MakePaymentMemberResponseType();
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberType }
-     * 
-     */
-    public MakePaymentMemberType createMakePaymentMemberType() {
-        return new MakePaymentMemberType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMember")
-    public JAXBElement<MakePaymentMemberType> createMakePaymentMember(MakePaymentMemberType value) {
-        return new JAXBElement<MakePaymentMemberType>(_MakePaymentMember_QNAME, MakePaymentMemberType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMemberResponse")
-    public JAXBElement<MakePaymentMemberResponseType> createMakePaymentMemberResponse(MakePaymentMemberResponseType value) {
-        return new JAXBElement<MakePaymentMemberResponseType>(_MakePaymentMemberResponse_QNAME, MakePaymentMemberResponseType.class, null, value);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/Payment.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/Payment.java
deleted file mode 100644
index bbbd03d89a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/Payment.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "Payment", targetNamespace = "http://www.tuscanyscatours.com/Payment/")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface Payment {
-
-
-    /**
-     * 
-     * @param amount
-     * @param customerId
-     * @return
-     *     returns java.lang.String
-     */
-    @WebMethod(action = "http://www.tuscanyscatours.com/Payment/makePayment")
-    @WebResult(name = "Status", targetNamespace = "")
-    @RequestWrapper(localName = "makePaymentMember", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberType")
-    @ResponseWrapper(localName = "makePaymentMemberResponse", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberResponseType")
-    public String makePaymentMember(
-        @WebParam(name = "CustomerId", targetNamespace = "")
-        String customerId,
-        @WebParam(name = "Amount", targetNamespace = "")
-        float amount);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/PaymentService.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/PaymentService.java
deleted file mode 100644
index a430175976..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/PaymentService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "PaymentService", targetNamespace = "http://www.tuscanyscatours.com/Payment/", wsdlLocation = "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl")
-public class PaymentService
-    extends Service
-{
-
-    private final static URL PAYMENTSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.tuscanyscatours.payment.PaymentService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.tuscanyscatours.payment.PaymentService.class.getResource(".");
-            url = new URL(baseUrl, "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        PAYMENTSERVICE_WSDL_LOCATION = url;
-    }
-
-    public PaymentService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public PaymentService() {
-        super(PAYMENTSERVICE_WSDL_LOCATION, new QName("http://www.tuscanyscatours.com/Payment/", "PaymentService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort() {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class, features);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/package-info.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/package-info.java
deleted file mode 100644
index acd208f5c9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/com/tuscanyscatours/payment/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tuscanyscatours.com/Payment/")
-package com.tuscanyscatours.payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java
deleted file mode 100644
index cc80ec4128..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-java/src/main/java/scatours/payment/PaymentLauncher.java
+++ /dev/null
@@ -1,47 +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 scatours.payment;
-
-import static scatours.launcher.LauncherUtil.locate;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import com.tuscanyscatours.payment.Payment;
-
-public class PaymentLauncher {
-
-    public static void main(String[] args) throws Exception {
-        Node node = NodeFactory.getInstance().createNode(
-        		                                                  locate("payment-java"),
-        		                                                  locate("creditcard-payment-jaxb"));
-        node.start();
-        
-        Node client = (Node)node;
-        Payment payment = client.getService(Payment.class, "Payment");
-
-        System.out.println("Payment Java test");
-        System.out.println("\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
-        System.out.println("\n\nFailed Payment - Status = \n\n" + payment.makePaymentMember("c-1", 100.00f));
-        
-        node.stop();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/build.xml
deleted file mode 100644
index 6ccd55f641..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-payment-spring-scatag" default="compile">
-    <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
-    </path>
-
-    <target name="run">
-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="target/${ant.project.name}.jar"/>
-                <path refid="compile-path"/>
-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/pom.xml
deleted file mode 100644
index 22c5829eae..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-launcher-payment-spring-scatag</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Spring SCATag Launcher</name>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-util-launcher-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>          
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-sca</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
-                        </manifestEntries>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.payment.PaymentLauncher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>              
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
deleted file mode 100644
index e5f3ef3cad..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Status" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberResponseType", propOrder = {
-    "status"
-})
-public class MakePaymentMemberResponseType {
-
-    @XmlElement(name = "Status", required = true)
-    protected String status;
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
deleted file mode 100644
index ca94d86628..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
+++ /dev/null
@@ -1,82 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="CustomerId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Amount" type="{http://www.w3.org/2001/XMLSchema}float"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberType", propOrder = {
-    "customerId",
-    "amount"
-})
-public class MakePaymentMemberType {
-
-    @XmlElement(name = "CustomerId", required = true)
-    protected String customerId;
-    @XmlElement(name = "Amount")
-    protected float amount;
-
-    /**
-     * Gets the value of the customerId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    /**
-     * Sets the value of the customerId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCustomerId(String value) {
-        this.customerId = value;
-    }
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     */
-    public float getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     */
-    public void setAmount(float value) {
-        this.amount = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
deleted file mode 100644
index b069b2ba94..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.tuscanyscatours.payment package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _MakePaymentMember_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMember");
-    private final static QName _MakePaymentMemberResponse_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMemberResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.tuscanyscatours.payment
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberResponseType }
-     * 
-     */
-    public MakePaymentMemberResponseType createMakePaymentMemberResponseType() {
-        return new MakePaymentMemberResponseType();
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberType }
-     * 
-     */
-    public MakePaymentMemberType createMakePaymentMemberType() {
-        return new MakePaymentMemberType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMember")
-    public JAXBElement<MakePaymentMemberType> createMakePaymentMember(MakePaymentMemberType value) {
-        return new JAXBElement<MakePaymentMemberType>(_MakePaymentMember_QNAME, MakePaymentMemberType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMemberResponse")
-    public JAXBElement<MakePaymentMemberResponseType> createMakePaymentMemberResponse(MakePaymentMemberResponseType value) {
-        return new JAXBElement<MakePaymentMemberResponseType>(_MakePaymentMemberResponse_QNAME, MakePaymentMemberResponseType.class, null, value);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/Payment.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/Payment.java
deleted file mode 100644
index bbbd03d89a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/Payment.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "Payment", targetNamespace = "http://www.tuscanyscatours.com/Payment/")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface Payment {
-
-
-    /**
-     * 
-     * @param amount
-     * @param customerId
-     * @return
-     *     returns java.lang.String
-     */
-    @WebMethod(action = "http://www.tuscanyscatours.com/Payment/makePayment")
-    @WebResult(name = "Status", targetNamespace = "")
-    @RequestWrapper(localName = "makePaymentMember", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberType")
-    @ResponseWrapper(localName = "makePaymentMemberResponse", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberResponseType")
-    public String makePaymentMember(
-        @WebParam(name = "CustomerId", targetNamespace = "")
-        String customerId,
-        @WebParam(name = "Amount", targetNamespace = "")
-        float amount);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/PaymentService.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/PaymentService.java
deleted file mode 100644
index a430175976..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/PaymentService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "PaymentService", targetNamespace = "http://www.tuscanyscatours.com/Payment/", wsdlLocation = "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl")
-public class PaymentService
-    extends Service
-{
-
-    private final static URL PAYMENTSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.tuscanyscatours.payment.PaymentService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.tuscanyscatours.payment.PaymentService.class.getResource(".");
-            url = new URL(baseUrl, "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        PAYMENTSERVICE_WSDL_LOCATION = url;
-    }
-
-    public PaymentService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public PaymentService() {
-        super(PAYMENTSERVICE_WSDL_LOCATION, new QName("http://www.tuscanyscatours.com/Payment/", "PaymentService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort() {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class, features);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/package-info.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/package-info.java
deleted file mode 100644
index acd208f5c9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/com/tuscanyscatours/payment/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tuscanyscatours.com/Payment/")
-package com.tuscanyscatours.payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java
deleted file mode 100644
index 7e5d7225e5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring-scatag/src/main/java/scatours/payment/PaymentLauncher.java
+++ /dev/null
@@ -1,47 +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 scatours.payment;
-
-import static scatours.launcher.LauncherUtil.locate;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import com.tuscanyscatours.payment.Payment;
-
-public class PaymentLauncher {
-
-    public static void main(String[] args) throws Exception {
-        Node node = NodeFactory.getInstance().createNode(
-        		                                                  locate("payment-spring-scatag"),
-        		                                                  locate("creditcard-payment-jaxb"));
-        node.start();
-        
-        Node client = (Node)node;
-        Payment payment = client.getService(Payment.class, "Payment/Payment");
-
-        System.out.println("Payment Spring SCATag test");
-        System.out.println("\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
-        System.out.println("\n\nFailed Payment - Status = \n\n" + payment.makePaymentMember("c-1", 100.00f));
-        
-        node.stop();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/build.xml
deleted file mode 100644
index 73cdf2da6a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-payment-spring" default="compile">
-    <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
-    </path>
-
-    <target name="run">
-        <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
-            <classpath>
-                <pathelement location="target/${ant.project.name}.jar"/>
-                <path refid="compile-path"/>
-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/pom.xml
deleted file mode 100644
index d433b6a1b5..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/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>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-launcher-payment-spring</artifactId>
-    <name>Apache Tuscany SCA Tours Payment Spring Launcher</name>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-util-launcher-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.soap</groupId>
-                    <artifactId>saaj-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>          
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-spring-sca</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
-                        </manifestEntries>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.payment.PaymentLauncher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>              
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
deleted file mode 100644
index e5f3ef3cad..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberResponseType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="Status" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberResponseType", propOrder = {
-    "status"
-})
-public class MakePaymentMemberResponseType {
-
-    @XmlElement(name = "Status", required = true)
-    protected String status;
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
deleted file mode 100644
index ca94d86628..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/MakePaymentMemberType.java
+++ /dev/null
@@ -1,82 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MakePaymentMemberType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="MakePaymentMemberType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="CustomerId" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="Amount" type="{http://www.w3.org/2001/XMLSchema}float"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MakePaymentMemberType", propOrder = {
-    "customerId",
-    "amount"
-})
-public class MakePaymentMemberType {
-
-    @XmlElement(name = "CustomerId", required = true)
-    protected String customerId;
-    @XmlElement(name = "Amount")
-    protected float amount;
-
-    /**
-     * Gets the value of the customerId property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    /**
-     * Sets the value of the customerId property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCustomerId(String value) {
-        this.customerId = value;
-    }
-
-    /**
-     * Gets the value of the amount property.
-     * 
-     */
-    public float getAmount() {
-        return amount;
-    }
-
-    /**
-     * Sets the value of the amount property.
-     * 
-     */
-    public void setAmount(float value) {
-        this.amount = value;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
deleted file mode 100644
index b069b2ba94..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/ObjectFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the com.tuscanyscatours.payment package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
-@XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _MakePaymentMember_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMember");
-    private final static QName _MakePaymentMemberResponse_QNAME = new QName("http://www.tuscanyscatours.com/Payment/", "makePaymentMemberResponse");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.tuscanyscatours.payment
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberResponseType }
-     * 
-     */
-    public MakePaymentMemberResponseType createMakePaymentMemberResponseType() {
-        return new MakePaymentMemberResponseType();
-    }
-
-    /**
-     * Create an instance of {@link MakePaymentMemberType }
-     * 
-     */
-    public MakePaymentMemberType createMakePaymentMemberType() {
-        return new MakePaymentMemberType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMember")
-    public JAXBElement<MakePaymentMemberType> createMakePaymentMember(MakePaymentMemberType value) {
-        return new JAXBElement<MakePaymentMemberType>(_MakePaymentMember_QNAME, MakePaymentMemberType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MakePaymentMemberResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.tuscanyscatours.com/Payment/", name = "makePaymentMemberResponse")
-    public JAXBElement<MakePaymentMemberResponseType> createMakePaymentMemberResponse(MakePaymentMemberResponseType value) {
-        return new JAXBElement<MakePaymentMemberResponseType>(_MakePaymentMemberResponse_QNAME, MakePaymentMemberResponseType.class, null, value);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/Payment.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/Payment.java
deleted file mode 100644
index bbbd03d89a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/Payment.java
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebService(name = "Payment", targetNamespace = "http://www.tuscanyscatours.com/Payment/")
-@XmlSeeAlso({
-    ObjectFactory.class
-})
-public interface Payment {
-
-
-    /**
-     * 
-     * @param amount
-     * @param customerId
-     * @return
-     *     returns java.lang.String
-     */
-    @WebMethod(action = "http://www.tuscanyscatours.com/Payment/makePayment")
-    @WebResult(name = "Status", targetNamespace = "")
-    @RequestWrapper(localName = "makePaymentMember", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberType")
-    @ResponseWrapper(localName = "makePaymentMemberResponse", targetNamespace = "http://www.tuscanyscatours.com/Payment/", className = "com.tuscanyscatours.payment.MakePaymentMemberResponseType")
-    public String makePaymentMember(
-        @WebParam(name = "CustomerId", targetNamespace = "")
-        String customerId,
-        @WebParam(name = "Amount", targetNamespace = "")
-        float amount);
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/PaymentService.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/PaymentService.java
deleted file mode 100644
index a430175976..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/PaymentService.java
+++ /dev/null
@@ -1,71 +0,0 @@
-
-package com.tuscanyscatours.payment;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.logging.Logger;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.7-b01-
- * Generated source version: 2.1
- * 
- */
-@WebServiceClient(name = "PaymentService", targetNamespace = "http://www.tuscanyscatours.com/Payment/", wsdlLocation = "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl")
-public class PaymentService
-    extends Service
-{
-
-    private final static URL PAYMENTSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(com.tuscanyscatours.payment.PaymentService.class.getName());
-
-    static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = com.tuscanyscatours.payment.PaymentService.class.getResource(".");
-            url = new URL(baseUrl, "file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/C:/simon/tuscany/travelsample/contributions/payment-java/src/main/resources/Payment.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        PAYMENTSERVICE_WSDL_LOCATION = url;
-    }
-
-    public PaymentService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public PaymentService() {
-        super(PAYMENTSERVICE_WSDL_LOCATION, new QName("http://www.tuscanyscatours.com/Payment/", "PaymentService"));
-    }
-
-    /**
-     * 
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort() {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns Payment
-     */
-    @WebEndpoint(name = "PaymentPort")
-    public Payment getPaymentPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://www.tuscanyscatours.com/Payment/", "PaymentPort"), Payment.class, features);
-    }
-
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/package-info.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/package-info.java
deleted file mode 100644
index acd208f5c9..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/com/tuscanyscatours/payment/package-info.java
+++ /dev/null
@@ -1,2 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tuscanyscatours.com/Payment/")
-package com.tuscanyscatours.payment;
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java
deleted file mode 100644
index d877d55569..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/payment-spring/src/main/java/scatours/payment/PaymentLauncher.java
+++ /dev/null
@@ -1,47 +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 scatours.payment;
-
-import static scatours.launcher.LauncherUtil.locate;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import com.tuscanyscatours.payment.Payment;
-
-public class PaymentLauncher {
-
-    public static void main(String[] args) throws Exception {
-        Node node = NodeFactory.getInstance().createNode(
-        		                                                  locate("payment-spring"),
-        		                                                  locate("creditcard-payment-jaxb"));
-        node.start();
-        
-        Node client = (Node)node;
-        Payment payment = client.getService(Payment.class, "Payment/Payment");
-
-        System.out.println("Payment Spring test");
-        System.out.println("\nSuccessful Payment - Status = \n\n" + payment.makePaymentMember("c-0", 100.00f));
-        System.out.println("\n\nFailed Payment - Status = \n\n" + payment.makePaymentMember("c-1", 100.00f));
-        
-        node.stop();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/build.xml
deleted file mode 100644
index 57001f70e3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-launcher-policy" default="compile">
-    <import file="../../antdefs.xml"/>
-    <path id="compile-path">
-        <pathelement path="../../util/launcher-common/target/scatours-util-launcher-common.jar"/>
-    </path>
-
-    <target name="run">
-        <java classname="scatours.PolicyLauncher" fork="true">
-            <classpath>
-                <pathelement location="target/${ant.project.name}.jar"/>
-                <path refid="compile-path"/>
-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml
deleted file mode 100644
index 3adfca89f4..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/maven-eclipse.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<project default="copy-resources">
-  <target name="init"/>
-  <target name="copy-resources" depends="init">
-    <copy todir="target/classes/META-INF" filtering="true">
-      <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/>
-    </copy>
-  </target>
-</project>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
deleted file mode 100644
index 05964e23dd..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/pom.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-launcher-policy</artifactId>
-    <name>Apache Tuscany SCA Tours Policy Launcher</name>
-
-    <dependencies>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-util-launcher-common</artifactId>
-            <version>${pom.version}</version>
-            <scope>provided</scope>
-        </dependency>
-            
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-policy-security</artifactId>
-            <version>${tuscany.version}</version>
-            <scope>runtime</scope>
-        </dependency>        
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    
-    <build>
-       <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
-                        </manifestEntries>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>scatours.PolicyLauncher</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>              
-    </build>
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java b/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
deleted file mode 100644
index 8fc3e92059..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/policy/src/main/java/scatours/PolicyLauncher.java
+++ /dev/null
@@ -1,49 +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 scatours;
-
-import static scatours.launcher.LauncherUtil.locate;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-public class PolicyLauncher {
-
-    public static void main(String[] args) throws Exception {
-        Node node1 =
-            NodeFactory.getInstance().createNode(
-                                                       locate("policy-client"), 
-                                                       locate("payment-java-policy"));
-
-        node1.start();
-
-        Node node2 = NodeFactory.getInstance().createNode(
-                                                                   locate("creditcard-payment-jaxb-policy"));
-
-        node2.start();
-
-        Runnable client = ((Node)node1).getService(Runnable.class, "TestClient/Runnable");
-        client.run();
-
-        node1.stop();
-        node2.stop();
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml
deleted file mode 100644
index f0211eafd0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/launchers/pom.xml
+++ /dev/null
@@ -1,77 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-launchers</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Tours Launchers</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>blog-feed</module>

-                <module>buildingblocks</module>

-                <module>currency-converter</module>

-                <module>currency-converter-corba</module>

-                <module>currency-converter-jms</module>

-                <module>currency-converter-rmi</module>

-                <module>currency-converter-ws</module>

-                <module>databinding</module>

-                <module>feed-logger</module>

-                <module>interaction</module>

-                <module>introducing</module>

-                <module>introducing-client</module>

-                <module>introducing-domain</module>

-                <module>introducing-tours</module>

-                <module>introducing-trips</module>

-                <module>jumpstart</module>

-                <module>fullapp</module>

-                <module>fullapp-domain</module>

-                <module>fullapp-nodes</module>

-                <module>help-pages</module>

-                <module>notification-ws</module>

-                <module>notification-corba</module>

-                <module>notification-ejb</module>

-                <module>notification-jms</module>

-                <module>notification-rmi</module>

-                <module>payment-java</module>

-                <module>payment-java-policy</module>

-                <module>payment-spring</module>

-                <module>payment-spring-scatag</module>

-                <module>payment-bpel</module>

-                <module>payment-groovy</module>

-                <module>policy</module>

-            </modules>

-        </profile>

-

-    </profiles>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/pom.xml
deleted file mode 100644
index 1be8251598..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/pom.xml
+++ /dev/null
@@ -1,115 +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>2.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>scatours</artifactId>
-    <packaging>pom</packaging>
-    <version>2.0-SNAPSHOT</version>
-    <name>Apache Tuscany SCA Tours Travel Sample</name>
-
-    <repositories>
-        <repository>
-            <id>maven.central</id>
-            <url>http://repo2.maven.org/maven2</url>
-            <releases>
-               <enabled>true</enabled>
-            </releases>
-            <snapshots>
-               <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven 1.x Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net2</id>
-            <name>java.net Maven 2.x Repository</name>
-            <url>http://download.java.net/maven/2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <profiles>
-        <profile>
-            <!-- The default profile produces a subset distribution which excludes
-               libraries that are present in the Tuscany SCA binary distro. -->
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <properties>
-                <scatours.selfContained>false</scatours.selfContained>
-            </properties>
-        </profile>
-
-        <profile>
-            <!-- Use mvn -Pselfcontained to produce a self-contained distribution
-               with all library dependencies included. -->
-            <id>selfcontained</id>
-            <properties>
-                <scatours.selfContained>true</scatours.selfContained>
-            </properties>
-        </profile>
-    </profiles>
-
-    <properties>
-        <scatours.version>2.0-SNAPSHOT</scatours.version>
-        <tuscany.version>2.0-SNAPSHOT</tuscany.version>
-    </properties>
-
-    <modules>
-        <module>util</module>
-        <module>contributions</module>
-<!--
-        <module>domainconfig</module>
--->
-        <module>launchers</module>
-        <module>services</module>
-        <module>clients</module>
-<!--
-        <module>distribution</module>
--->
-    </modules>
-
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/build.xml
deleted file mode 100644
index 21b282707c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/build.xml
+++ /dev/null
@@ -1,49 +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="scatours-services" default="compile">

-

-    <target name="compile">

-        <antcall target="allsubdirs">

-            <param name="target" value="compile"/>

-        </antcall>

-    </target>

-

-    <target name="test">

-        <antcall target="allsubdirs">

-            <param name="target" value="test"/>

-        </antcall>

-    </target>

-

-    <target name="clean">

-        <antcall target="allsubdirs">

-            <param name="target" value="clean"/>

-        </antcall>

-    </target>

-

-    <target name="allsubdirs">

-        <ant dir="creditcard-payment-jaxws" target="${target}"/>

-        <ant dir="smsgateway-corba" target="${target}"/>

-        <ant dir="smsgateway-ejb" target="${target}"/>

-        <ant dir="smsgateway-jaxws" target="${target}"/>

-        <ant dir="smsgateway-jms" target="${target}"/>

-        <ant dir="smsgateway-rmi" target="${target}"/>

-    </target>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml
deleted file mode 100644
index 266dbec28c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/build.xml
+++ /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.

--->

-

-<project name="scatours-service-creditcard-payment-jaxws" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <!-- The "run" target starts a JAX-WS service endpoint for a simple

-       credit card payment service.  This endpoint does not appear to be

-       used currently anywhere else in the travel application. -->

-    <target name="run" depends="is-jdk6, jaxws-jdk6, jaxws-jdk5">

-        <java classname="scatours.creditcard.CreditCardServiceBootstrap" fork="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="jaxws-path"/>

-            </classpath>

-        </java>

-    </target>

-

-    <!-- check to see if we are running on JDK 6 -->

-    <target name="is-jdk6">

-        <condition property="jdk6">

-            <available classname="javax.xml.ws.Endpoint"/>

-        </condition>

-    </target>

-

-    <!-- JDK 6 contains JAX-WS so we don't need it on the classpath -->

-    <target name="jaxws-jdk6" if="jdk6">

-        <path id="jaxws-path"/>

-    </target>

-

-    <!-- on JDK 5 we need to add the JAX-WS runtime to the classpath -->

-    <target name="jaxws-jdk5" unless="jdk6">

-        <path id="jaxws-path">

-            <fileset dir="${env.JAXWS_HOME}/lib"/>

-        </path>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml
deleted file mode 100644
index b0ea6b919a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/pom.xml
+++ /dev/null
@@ -1,70 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-service-creditcard-payment-jaxws</artifactId>

-    <name>Apache Tuscany SCA Tours Credit Card Payment JAX-WS Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>javax.xml.ws</groupId>

-            <artifactId>jaxws-api</artifactId>

-            <version>2.1</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>javax.xml.soap</groupId>

-                    <artifactId>saaj-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-       <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-jaxws-runtime.jar</Class-Path>

-                            <Main-Class>scatours.creditcard.CreditCardServiceBootstrap</Main-Class>

-                        </manifestEntries>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>         

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardService.java b/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardService.java
deleted file mode 100644
index a0f2912f7b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardService.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 scatours.creditcard;

-

-import javax.jws.WebMethod;

-import javax.jws.WebService;

-import javax.jws.soap.SOAPBinding;

-import javax.jws.soap.SOAPBinding.Style;

-

-@WebService

-@SOAPBinding(style = Style.RPC)

-public interface CreditCardService {

-

-    String NOT_AUTHORIZED = "Not_Authorized";

-

-    @WebMethod

-    String makePayment(String cardNumber, String name, double amount);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardServiceBootstrap.java b/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardServiceBootstrap.java
deleted file mode 100644
index 2fa12fc187..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardServiceBootstrap.java
+++ /dev/null
@@ -1,31 +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 scatours.creditcard;

-

-import javax.xml.ws.Endpoint;

-

-public class CreditCardServiceBootstrap {

-

-    public static void main(String[] args) {

-        System.out.println("Publishing Credit Card Service as web service: http://localhost:8081/CreditCardService");

-        System.out.println("Press Ctrl^C to terminate...");

-

-        Endpoint.publish("http://localhost:8081/CreditCardService", new CreditCardServiceImpl());

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardServiceImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardServiceImpl.java
deleted file mode 100644
index 7118edbc1f..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/creditcard-payment-jaxws/src/main/java/scatours/creditcard/CreditCardServiceImpl.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 scatours.creditcard;

-

-import javax.jws.WebService;

-

-@WebService(endpointInterface = "scatours.creditcard.CreditCardService")

-public class CreditCardServiceImpl implements CreditCardService {

-

-    public String makePayment(String cardNumber, String name, double amount) {

-        System.out.println("Payment request from " + name);

-

-        if (cardNumber != null && cardNumber.startsWith("1")) {

-            return "AUTH_ID:" + System.currentTimeMillis();

-        }

-        return NOT_AUTHORIZED;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml
deleted file mode 100644
index 1dbc8effad..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/pom.xml
+++ /dev/null
@@ -1,51 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-services</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Tours non-SCA Services</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>creditcard-payment-jaxws</module>

-                <module>smsgateway-jaxws</module>

-                <module>smsgateway-corba</module>

-                <module>smsgateway-ejb</module>

-                <module>smsgateway-jms</module>

-                <module>smsgateway-rmi</module>

-            </modules>

-        </profile>

-

-    </profiles>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/build.xml
deleted file mode 100644
index 0495e2b956..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/build.xml
+++ /dev/null
@@ -1,37 +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="scatours-service-smsgateway-corba" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <target name="idljava">

-        <antcall target="idlj">

-            <param name="idljopts" value="-fall"/>

-            <param name="idlfile" value="sms-gateway.idl"/>

-            <param name="javaclass" value="scatours/smsgateway/SMSGatewayPOA.class"/>

-        </antcall>

-    </target>

-

-    <target name="run">

-        <java classname="scatours.smsgateway.SMSGatewayCORBAServiceBootstrap"

-              fork="true" failonerror="true">

-            <classpath location="target/${ant.project.name}.jar"/>

-       </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml
deleted file mode 100644
index 3f64d66a2d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/pom.xml
+++ /dev/null
@@ -1,85 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-service-smsgateway-corba</artifactId>

-    <name>Apache Tuscany SCA Tours SMS Gateway CORBA Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.smsgateway.SMSGatewayCORBAServiceBootstrap</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-            <plugin>

-                <groupId>org.codehaus.mojo</groupId>

-                <artifactId>idlj-maven-plugin</artifactId>

-                <version>1.1</version>

-                <executions>

-                    <execution>

-                        <goals>

-                            <goal>generate</goal>

-                        </goals>

-                    </execution>

-                </executions>

-                <configuration>

-                    <compiler>idlj</compiler>

-                    <sources>

-                        <source>

-                            <includes>

-                                <include>sms-gateway.idl</include>

-                            </includes>

-                            <emitStubs>true</emitStubs>

-                            <emitSkeletons>true</emitSkeletons>

-                            <compatible>false</compatible>
-                        </source>

-                    </sources>

-                    <sourceDirectory>${basedir}/src/main/resources</sourceDirectory>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java
deleted file mode 100644
index 9a53303e88..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayCORBAServiceBootstrap.java
+++ /dev/null
@@ -1,105 +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 scatours.smsgateway;

-

-import java.io.BufferedReader;

-import java.io.InputStream;

-import java.io.InputStreamReader;

-

-import org.omg.CORBA.ORB;

-import org.omg.CORBA.Object;

-import org.omg.CosNaming.NameComponent;

-import org.omg.CosNaming.NamingContextExt;

-import org.omg.CosNaming.NamingContextExtHelper;

-import org.omg.PortableServer.POA;

-import org.omg.PortableServer.POAHelper;

-

-public class SMSGatewayCORBAServiceBootstrap {

-

-    public static void main(String[] args) throws Exception {

-        String home = System.getProperty("java.home");

-        String[] tnsCommand = {"" + home + "/bin/tnameserv", "-ORBInitialPort", "5080"};

-        Process tns = null;

-

-        try {

-            System.out.println("Starting transient name server process (port=5080)");

-

-            // Start tnameserv in a separate process

-            tns = Runtime.getRuntime().exec(tnsCommand);

-

-            // Wait for the tnameserv process to complete its startup, and

-            // display the output from the tnameserv process on the console

-            InputStream tnsOut = tns.getInputStream();

-            BufferedReader tnsOutReader = new BufferedReader(new InputStreamReader(tnsOut));

-            while (true) {

-                String line = tnsOutReader.readLine();

-                System.out.println("tnameserv: " + line);

-                if ("Ready.".equals(line)) {

-                    break;

-                }

-            }

-

-            System.out.println("Publishing SMS Gateway Service as a CORBA service: SMSGatewayCORBAService (port=5080)");

-

-            String[] orbArgs = {"-ORBInitialPort", "5080"};

-            ORB orb = ORB.init(orbArgs, null);

-

-            NamingContextExt namingCtx;

-            try {

-                Object objRef = orb.resolve_initial_references("NameService");

-                namingCtx = NamingContextExtHelper.narrow(objRef);

-            } catch (Exception ex) {

-                System.err.println("ERROR: Failed to resolve Name Service.");

-                //System.err.println("Don't forget to run it with:");

-                //System.err.println("  tnameserv -ORBInitialPort 5080");

-                return;

-            }

-

-            Object rootPoaRef = orb.resolve_initial_references("RootPOA");

-            POA rootPoa = POAHelper.narrow(rootPoaRef);

-            rootPoa.the_POAManager().activate();

-

-            SMSGatewayServant smsGateway = new SMSGatewayServant();

-            Object smsGatewayRef = rootPoa.servant_to_reference(smsGateway);

-

-            String corbaServerName = "SMSGatewayCORBAService";

-            NameComponent[] name = {new NameComponent(corbaServerName, "")};

-            namingCtx.rebind(name, smsGatewayRef);

-

-            System.out.println("CORBA server running - press Enter to shutdown");

-            System.in.read();

-

-            orb.shutdown(true);

-            orb.destroy();

-

-        } finally {

-            // Make sure that the tnameserv process gets destroyed and its

-            // listener port is released

-            if (tns != null) {

-                System.out.println("Destroying transient name server process");

-                try {

-                    tns.destroy();

-                    System.out.println("Transient name server process destroyed");

-                } catch (Exception e) {

-                    // ignore

-                }

-            }

-        }

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayServant.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayServant.java
deleted file mode 100644
index 693a909dca..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/java/scatours/smsgateway/SMSGatewayServant.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 scatours.smsgateway;

-

-public class SMSGatewayServant extends SMSGatewayPOA {

-

-    public boolean sendSMS(String fromNumber, String toNumber, String text) {

-        System.out.println("Sending SMS message");

-        System.out.println("From:    " + fromNumber);

-        System.out.println("To:      " + toNumber);

-        System.out.println("Message: " + text);

-        return true;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/resources/sms-gateway.idl b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/resources/sms-gateway.idl
deleted file mode 100644
index 30a87f5c7a..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-corba/src/main/resources/sms-gateway.idl
+++ /dev/null
@@ -1,26 +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.
- */
- 
- module scatours {
-    module smsgateway {
-        interface SMSGateway {
-            boolean sendSMS(in string fromNumber, in string toNumber, in string text);
-        };
-    };
-};
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/build.xml
deleted file mode 100644
index cc7456ac52..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-service-smsgateway-ejb" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <!-- The "run" target starts an OpenEJB service endpoint for the

-       SMS gateway service.  This endpoint is used by the "run" target

-       of the notification-ejb launcher. -->

-    <target name="run">

-        <java classname="com.tuscanyscatours.smsgateway.SMSGatewayEJBServiceBootstrap"

-              fork="true" failonerror="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <fileset dir="${env.OPENEJB_HOME}/lib"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml
deleted file mode 100644
index 8dd65669fc..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml
+++ /dev/null
@@ -1,58 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-service-smsgateway-ejb</artifactId>

-    <name>Apache Tuscany SCA Tours SMS Gateway EJB Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.openejb</groupId>

-            <artifactId>javaee-api</artifactId>

-            <version>5.0-2</version>

-            <scope>provided</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-openejb-runtime.jar</Class-Path>

-                            <Main-Class>com.tuscanyscatours.smsgateway.SMSGatewayEJBServiceBootstrap</Main-Class>

-                        </manifestEntries>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                 

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
deleted file mode 100644
index b462dd1be8..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.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 com.tuscanyscatours.smsgateway;
-
-import javax.ejb.Remote;
-
-/**
- * A gateway to send SMS messages.
- */
-@Remote
-public interface SMSGateway {
-    boolean sendSMS(String fromNumber, String toNumber, String text);
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayEJBServiceBootstrap.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayEJBServiceBootstrap.java
deleted file mode 100644
index 4da784bc55..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayEJBServiceBootstrap.java
+++ /dev/null
@@ -1,45 +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 com.tuscanyscatours.smsgateway;

-

-import java.util.Properties;

-

-import javax.naming.Context;

-import javax.naming.InitialContext;

-

-public class SMSGatewayEJBServiceBootstrap {

-

-    public static void main(String[] args) throws Exception {

-        System.out.println("Publishing SMS Gateway Service as an EJB service");

-

-        Properties properties = new Properties();

-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");

-        properties.setProperty("openejb.embedded.remotable", "true");

-

-        InitialContext initialContext = new InitialContext(properties);

-

-        //      Object object = initialContext.lookup("SMSGatewayImplRemote");

-        //      SMSGateway smsGateway = (SMSGateway) object;

-        //      smsGateway.sendSMS("From", "to", "Message");

-

-        System.out.println("EJB server running - waiting for requests");

-        System.out.println("Press enter to shutdown.");

-        System.in.read();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java
deleted file mode 100644
index 3bdf48a7ea..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package com.tuscanyscatours.smsgateway;

-

-import javax.ejb.Stateless;

-

-@Stateless

-public class SMSGatewayImpl implements SMSGateway {

-

-    public boolean sendSMS(String fromNumber, String toNumber, String text) {

-        System.out.println("Sending SMS message");

-        System.out.println("From:    " + fromNumber);

-        System.out.println("To:      " + toNumber);

-        System.out.println("Message: " + text);

-        return true;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/resources/META-INF/ejb-jar.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index 116a25630c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0"?>
- <ejb-jar/>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml
deleted file mode 100644
index 6c57e2420b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/build.xml
+++ /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.

--->

-

-<project name="scatours-service-smsgateway-jaxws" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <!-- The "run" target starts a JAX-WS service endpoint for the

-       SMS gateway service.  This endpoint is used by the "run" target

-       of the notification-ws launcher. -->

-    <target name="run" depends="is-jdk6, jaxws-jdk6, jaxws-jdk5">

-        <java classname="com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap" fork="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <path refid="jaxws-path"/>

-            </classpath>

-        </java>

-    </target>

-

-    <!-- check to see if we are running on JDK 6 -->

-    <target name="is-jdk6">

-        <condition property="jdk6">

-            <available classname="javax.xml.ws.Endpoint"/>

-        </condition>

-    </target>

-

-    <!-- JDK 6 contains JAX-WS so we don't need it on the classpath -->

-    <target name="jaxws-jdk6" if="jdk6">

-        <path id="jaxws-path"/>

-    </target>

-

-    <!-- on JDK 5 we need to add the JAX-WS runtime to the classpath -->

-    <target name="jaxws-jdk5" unless="jdk6">

-        <path id="jaxws-path">

-            <fileset dir="${env.JAXWS_HOME}/lib"/>

-        </path>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml
deleted file mode 100644
index 82e7f28c78..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/pom.xml
+++ /dev/null
@@ -1,70 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-service-smsgateway-jaxws</artifactId>

-    <name>Apache Tuscany SCA Tours SMS Gateway JAX-WS Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>javax.xml.ws</groupId>

-            <artifactId>jaxws-api</artifactId>

-            <version>2.1</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>javax.xml.soap</groupId>

-                    <artifactId>saaj-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-       <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifestEntries>

-                            <Class-Path>../util/scatours-util-jaxws-runtime.jar</Class-Path>

-                            <Main-Class>com.tuscanyscatours.smsgateway.SMSGatewayServiceBootstrap</Main-Class>

-                        </manifestEntries>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayService.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayService.java
deleted file mode 100644
index 696ab12daa..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayService.java
+++ /dev/null
@@ -1,32 +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 com.tuscanyscatours.smsgateway;

-

-import javax.jws.WebMethod;

-import javax.jws.WebService;

-import javax.jws.soap.SOAPBinding;

-import javax.jws.soap.SOAPBinding.Style;

-

-@WebService

-@SOAPBinding(style = Style.RPC)

-public interface SMSGatewayService {

-

-    @WebMethod

-    boolean sendSMS(String fromNumber, String toNumber, String text);

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceBootstrap.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceBootstrap.java
deleted file mode 100644
index 6631aee907..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceBootstrap.java
+++ /dev/null
@@ -1,31 +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 com.tuscanyscatours.smsgateway;

-

-import javax.xml.ws.Endpoint;

-

-public class SMSGatewayServiceBootstrap {

-

-    public static void main(String[] args) {

-        System.out.println("Publishing SMS Gateway Service as web service: http://localhost:8081/SMSGatewayService");

-        System.out.println("Press Ctrl^C to terminate...");

-

-        Endpoint.publish("http://localhost:8081/SMSGatewayService", new SMSGatewayServiceImpl());

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceImpl.java
deleted file mode 100644
index cd4eab052d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jaxws/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayServiceImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package com.tuscanyscatours.smsgateway;

-

-import javax.jws.WebService;

-

-@WebService(endpointInterface = "com.tuscanyscatours.smsgateway.SMSGatewayService")

-public class SMSGatewayServiceImpl implements SMSGatewayService {

-

-    public boolean sendSMS(String fromNumber, String toNumber, String text) {

-        System.out.println("Sending SMS message");

-        System.out.println("From:    " + fromNumber);

-        System.out.println("To:      " + toNumber);

-        System.out.println("Message: " + text);

-        return true;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/build.xml
deleted file mode 100644
index 389f6296c3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/build.xml
+++ /dev/null
@@ -1,35 +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="scatours-service-smsgateway-jms" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <!-- The "run" target creates JMS request and response queues for the

-       SMS gateway service.  These queues are used by the "run" target of

-       the notification-jms launcher. -->

-    <target name="run">

-        <java classname="scatours.smsgateway.SMSGatewayJMSServiceBootstrap" fork="true">

-            <classpath>

-                <pathelement location="target/${ant.project.name}.jar"/>

-                <!-- The following is used to bring in the ActiveMQ runtime. -->

-                <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>

-            </classpath>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml
deleted file mode 100644
index e2767a4966..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/pom.xml
+++ /dev/null
@@ -1,104 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-service-smsgateway-jms</artifactId>

-    <name>Apache Tuscany SCA Tours SMS Gateway JMS Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>org.apache.activemq</groupId>

-            <artifactId>activemq-all</artifactId>

-            <version>5.2.0</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>org.apache.activemq</groupId>

-                    <artifactId>activemq-web-demo</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-api</artifactId>

-            <version>1.2.7</version>

-            <exclusions>

-                <exclusion>

-                    <groupId>xerces</groupId>

-                    <artifactId>xercesImpl</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-                <exclusion>

-                    <groupId>xml-apis</groupId>

-                    <artifactId>xml-apis</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.ws.commons.axiom</groupId>

-            <artifactId>axiom-impl</artifactId>

-            <version>1.2.7</version>

-            <scope>runtime</scope>

-            <exclusions>

-                <exclusion>

-                    <groupId>stax</groupId>

-                    <artifactId>stax-api</artifactId>

-                </exclusion>

-            </exclusions>

-        </dependency>

-

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>scatours.smsgateway.SMSGatewayJMSServiceBootstrap</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                 

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGateway.java
deleted file mode 100644
index e6e866fa1d..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGateway.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 scatours.smsgateway;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * A gateway to send SMS messages.
- */
-public interface SMSGateway extends Remote {
-    boolean sendSMS(String fromNumber, String toNumber, String text) throws RemoteException;
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayImpl.java
deleted file mode 100644
index c35aa61513..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayImpl.java
+++ /dev/null
@@ -1,126 +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 scatours.smsgateway;

-

-import java.io.ByteArrayInputStream;

-

-import javax.jms.BytesMessage;

-import javax.jms.Destination;

-import javax.jms.JMSException;

-import javax.jms.Message;

-import javax.jms.MessageConsumer;

-import javax.jms.MessageProducer;

-import javax.jms.Session;

-import javax.jms.TextMessage;

-import javax.xml.namespace.QName;

-import javax.xml.stream.XMLStreamException;

-

-import org.apache.axiom.om.OMAbstractFactory;

-import org.apache.axiom.om.OMElement;

-import org.apache.axiom.om.OMFactory;

-import org.apache.axiom.om.OMText;

-import org.apache.axiom.om.impl.builder.StAXOMBuilder;

-

-public class SMSGatewayImpl implements SMSGateway {

-

-    private final Session session;

-    private final MessageConsumer consumer;

-    private final MessageProducer producer;

-

-    public SMSGatewayImpl(Session session) throws JMSException {

-        this.session = session;

-        Destination requestDest = session.createQueue("SMSRequestQueue");

-        consumer = session.createConsumer(requestDest);

-

-        Destination responseDest = session.createQueue("SMSResponseQueue");

-        producer = session.createProducer(responseDest);

-    }

-

-    public void start() throws JMSException, XMLStreamException {

-        while (true) {

-            Message message = consumer.receive();

-            handleRequest(message);

-        }

-    }

-

-    private void handleRequest(Message inMessage) throws XMLStreamException, JMSException {

-        OMElement xml = parseXMLPayload(inMessage);

-

-        String fromNumber = getStringArg(xml, 0);

-        String toNumber = getStringArg(xml, 1);

-        String text = getStringArg(xml, 2);

-

-        boolean result = sendSMS(fromNumber, toNumber, text);

-

-        String responseXML = createXMLResponse(result);

-

-        TextMessage outMessage = createResponseMessage(inMessage.getJMSMessageID(), responseXML);

-        producer.send(outMessage);

-    }

-

-    private OMElement parseXMLPayload(Message inMessage) throws JMSException, XMLStreamException {

-        final byte[] msgData;

-        if (inMessage instanceof TextMessage) {

-            msgData = ((TextMessage)inMessage).getText().getBytes();

-        } else if (inMessage instanceof BytesMessage) {

-            BytesMessage bytesMessage = (BytesMessage)inMessage;

-            msgData = new byte[(int)bytesMessage.getBodyLength()];

-            bytesMessage.readBytes(msgData);

-        } else {

-            throw new JMSException("Unsupported JMS message type of " + inMessage.getClass().getName());

-        }

-        ByteArrayInputStream in = new ByteArrayInputStream(msgData);

-        StAXOMBuilder builder = new StAXOMBuilder(in);

-        OMElement doc = builder.getDocumentElement();

-        return doc;

-    }

-

-    private String getStringArg(OMElement doc, int i) {

-        QName argQName = new QName("arg" + i);

-        OMElement arg = doc.getFirstChildWithName(argQName);

-        if (arg == null) {

-            return null;

-        }

-        return arg.getText();

-    }

-

-    public boolean sendSMS(String fromNumber, String toNumber, String text) {

-        System.out.println("From: " + fromNumber);

-        System.out.println("To: " + toNumber);

-        System.out.println(text);

-        return true;

-    }

-

-    private String createXMLResponse(boolean result) {

-        OMFactory omFactory = OMAbstractFactory.getOMFactory();

-        OMElement response = omFactory.createOMElement("sendSMS", "http://smsgateway.scatours/", "ns2");

-        OMElement returnValue = omFactory.createOMElement("return", null);

-        OMText returnV = omFactory.createOMText(Boolean.toString(result));

-        returnValue.addChild(returnV);

-        response.addChild(returnValue);

-        return response.toString();

-    }

-

-    private TextMessage createResponseMessage(String correlationID, String responseXML) throws JMSException {

-        TextMessage outMessage = session.createTextMessage("sendSMS");

-        outMessage.setText(responseXML);

-        outMessage.setJMSCorrelationID(correlationID);

-        return outMessage;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java
deleted file mode 100644
index d8543266e3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-jms/src/main/java/scatours/smsgateway/SMSGatewayJMSServiceBootstrap.java
+++ /dev/null
@@ -1,47 +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 scatours.smsgateway;

-

-import javax.jms.Connection;

-import javax.jms.Session;

-

-import org.apache.activemq.ActiveMQConnectionFactory;

-import org.apache.activemq.broker.BrokerService;

-

-public class SMSGatewayJMSServiceBootstrap {

-

-    public static void main(String[] args) throws Exception {

-        final BrokerService jmsBroker = new BrokerService();

-        jmsBroker.setPersistent(false);

-        jmsBroker.setUseJmx(false);

-        jmsBroker.addConnector("tcp://localhost:61619");

-        jmsBroker.start();

-

-        System.out.println("Publishing SMS Gateway Service as a JMS service: tcp://localhost:61619");

-        System.out.println("Press Ctrl^C to terminate...");

-

-        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("tcp://localhost:61619");

-        Connection connection = connectionFactory.createConnection();

-        connection.start();

-        Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

-

-        SMSGatewayImpl impl = new SMSGatewayImpl(session);

-        impl.start();

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/build.xml
deleted file mode 100644
index 13d4702867..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/build.xml
+++ /dev/null
@@ -1,31 +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="scatours-service-smsgateway-rmi" default="compile">

-    <import file="../../antdefs.xml"/>

-

-    <!-- The "run" target starts an RMI server for the SMS gateway service.

-       This server is used by the "run" target of the notification-rmi launcher. -->

-    <target name="run">

-        <java classname="com.tuscanyscatours.smsgateway.SMSGatewayRMIServiceBootstrap"

-              fork="true" failonerror="true">

-            <classpath location="target/${ant.project.name}.jar"/>

-        </java>

-    </target>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml
deleted file mode 100644
index 16b9fc1270..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/pom.xml
+++ /dev/null
@@ -1,59 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-service-smsgateway-rmi</artifactId>

-    <name>Apache Tuscany SCA Tours SMS Gateway RMI Service</name>

-

-    <dependencies>

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <version>4.5</version>

-            <scope>test</scope>

-        </dependency>

-    </dependencies>

-    

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>${scatours.selfContained}</addClasspath>

-                            <classpathPrefix>../lib/</classpathPrefix>

-                            <mainClass>com.tuscanyscatours.smsgateway.SMSGatewayRMIServiceBootstrap</mainClass>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>                 

-    </build>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.java
deleted file mode 100644
index 4ce528fd23..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGateway.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 com.tuscanyscatours.smsgateway;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-/**
- * A gateway to send SMS messages.
- */
-public interface SMSGateway extends Remote {
-    boolean sendSMS(String fromNumber, String toNumber, String text) throws RemoteException;
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java
deleted file mode 100644
index c33439af8b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayImpl.java
+++ /dev/null
@@ -1,39 +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 com.tuscanyscatours.smsgateway;

-

-import java.rmi.RemoteException;

-import java.rmi.server.UnicastRemoteObject;

-

-public class SMSGatewayImpl extends UnicastRemoteObject implements SMSGateway {

-

-    private static final long serialVersionUID = -2739486025442222295L;

-

-    protected SMSGatewayImpl() throws RemoteException {

-        super();

-    }

-

-    public boolean sendSMS(String fromNumber, String toNumber, String text) {

-        System.out.println("Sending SMS message");

-        System.out.println("From:    " + fromNumber);

-        System.out.println("To:      " + toNumber);

-        System.out.println("Message: " + text);

-        return true;

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayRMIServiceBootstrap.java b/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayRMIServiceBootstrap.java
deleted file mode 100644
index 5b223fb40c..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/services/smsgateway-rmi/src/main/java/com/tuscanyscatours/smsgateway/SMSGatewayRMIServiceBootstrap.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

- */

-package com.tuscanyscatours.smsgateway;

-

-import java.rmi.registry.LocateRegistry;

-import java.rmi.registry.Registry;

-

-public class SMSGatewayRMIServiceBootstrap {

-

-    public static void main(String[] args) throws Exception {

-        System.out.println("Publishing SMS Gateway Service as a RMI service");

-

-        String serviceName = "SMSGatewayRMI";

-        SMSGatewayImpl smsGatewayImpl = new SMSGatewayImpl();

-        Registry rmiRegistry = LocateRegistry.createRegistry(8099);

-        rmiRegistry.bind(serviceName, smsGatewayImpl);

-

-        System.out.println("RMI server running - waiting for requests");

-        System.out.println("Press enter to shutdown.");

-        System.in.read();

-        rmiRegistry.unbind(serviceName);

-        System.exit(-1);

-    }

-}

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/testdomain/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/testdomain/build.xml
deleted file mode 100644
index 1f8d60a8e3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/testdomain/build.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-test-domain" default="run">

-    <property environment="env"/> 

-

-    <target name="run">

-        <java classname="org.apache.tuscany.sca.node.launcher.DomainManagerLauncher" fork="true">

-            <classpath>

-                <fileset dir="${env.TUSCANY_HOME}/modules">

-                    <include name="tuscany-node-launcher-*.jar"/>

-                </fileset>

-            </classpath>

-        </java>

-    </target>

-

-    <target name="clean">

-        <delete dir="./.felix"/>

-        <delete dir="./cloud"/>

-        <delete dir="./target"/>

-        <delete file="./cloud.composite"/>

-        <delete file="./domain.composite"/>

-        <delete file="./workspace.xml"/>

-    </target>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/testdomain/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/testdomain/pom.xml
deleted file mode 100644
index b30add6b13..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/testdomain/pom.xml
+++ /dev/null
@@ -1,58 +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>scatours</artifactId>

-        <version>1.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent><version>1.0-SNAPSHOT</version>

-    <artifactId>scatours-test-domain</artifactId>

-    <name>Apache Tuscany SCA Tours Test Domain</name>

-    

-    <build>

-        <plugins>

-            <plugin>

-                <artifactId>maven-clean-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <filesets>

-                        <fileset>

-                            <directory>./.felix</directory>

-                        </fileset>

-                        <fileset>

-                            <directory>./cloud</directory>

-                        </fileset>

-                        <fileset>

-                            <directory>.</directory>

-                            <includes>

-                                <include>**/cloud.composite</include>

-                                <include>**/domain.composite</include>

-                                <include>**/workspace.xml</include>

-                            </includes>

-                        </fileset>

-                    </filesets>

-                </configuration>

-            </plugin>

-        </plugins>

-    </build>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/travel-scenario.odg b/sca-java-2.x/trunk/tutorials/travelsample/travel-scenario.odg
deleted file mode 100644
index 06298e5221..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/travel-scenario.odg
+++ /dev/null
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/build.xml
deleted file mode 100644
index 3ab8df5da3..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<project name="scatours-util" default="compile">

-

-    <target name="compile">

-        <antcall target="allsubdirs">

-            <param name="target" value="compile"/>

-        </antcall>

-    </target>

-

-    <target name="test">

-        <antcall target="allsubdirs">

-            <param name="target" value="test"/>

-        </antcall>

-    </target>

-

-    <target name="clean">

-        <antcall target="allsubdirs">

-            <param name="target" value="clean"/>

-        </antcall>

-    </target>

-

-    <target name="allsubdirs">

-        <ant dir="launcher-common" target="${target}"/>

-    </target>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml
deleted file mode 100644
index 0a1daf914b..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/jaxws-runtime/pom.xml
+++ /dev/null
@@ -1,148 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-util-jaxws-runtime</artifactId>

-    <name>Apache Tuscany SCA Tours JAX-WS Runtime Dependencies for JDK 5</name>

-

-    <profiles>

-        <profile>

-            <!-- The default profile produces a subset distribution which excludes

-               libraries that are present in the Tuscany SCA binary distro. -->

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <dependencies>

-                <dependency>

-                    <groupId>com.sun.xml.ws</groupId>

-                    <artifactId>jaxws-rt</artifactId>

-                    <version>2.1.7</version>

-                    <scope>runtime</scope>

-                    <exclusions>

-                        <!-- exclude the following because they are part of the Tuscany SCA binary distro -->

-                        <exclusion>

-                            <groupId>com.sun.xml.bind</groupId>

-                            <artifactId>jaxb-impl</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>javax.activation</groupId>

-                            <artifactId>activation</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>javax.xml.stream</groupId>

-                            <artifactId>stax-api</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>javax.xml.ws</groupId>

-                            <artifactId>jaxws-api</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>junit</groupId>

-                            <artifactId>junit</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>org.codehaus.woodstox</groupId>

-                            <artifactId>wstx-asl</artifactId>

-                        </exclusion>

-                        <!-- exclude the following because they aren't needed by the travel sample -->

-                        <exclusion>

-                            <groupId>com.sun.org.apache.xml.internal</groupId>

-                            <artifactId>resolver</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>org.jvnet</groupId>

-                            <artifactId>mimepull</artifactId>

-                        </exclusion>

-                    </exclusions>

-                </dependency>

-

-                <dependency>

-                    <groupId>com.sun.net.httpserver</groupId>

-                    <artifactId>http</artifactId>

-                    <version>20070405</version>

-                    <scope>runtime</scope>

-                </dependency>

-

-                <dependency>

-                    <groupId>javax.xml.soap</groupId>

-                    <artifactId>saaj-api</artifactId>

-                    <version>1.3</version>

-                    <scope>runtime</scope>

-                    <exclusions>

-                        <!-- exclude the following because it is part of the Tuscany SCA binary distro -->

-                        <exclusion>

-                            <groupId>javax.activation</groupId>

-                            <artifactId>activation</artifactId>

-                        </exclusion>

-                    </exclusions>

-                </dependency>

-            </dependencies>

-        </profile>

-

-        <profile>

-            <!-- Use mvn -Pselfcontained to produce a self-contained distribution

-               with all library dependencies included. -->

-            <id>selfcontained</id>

-            <dependencies>

-                <dependency>

-                    <groupId>com.sun.xml.ws</groupId>

-                    <artifactId>jaxws-rt</artifactId>

-                    <version>2.1.7</version>

-                    <scope>runtime</scope>

-                </dependency>

-

-                <dependency>

-                    <groupId>com.sun.net.httpserver</groupId>

-                    <artifactId>http</artifactId>

-                    <version>20070405</version>

-                    <scope>runtime</scope>

-                </dependency>

-            </dependencies>

-        </profile>

-    </profiles>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>true</addClasspath>

-                            <classpathPrefix>../jaxws/</classpathPrefix>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>       

-    </build>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/build.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/build.xml
deleted file mode 100644
index a8fe5faff0..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/build.xml
+++ /dev/null
@@ -1,22 +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="scatours-util-launcher-common" default="compile">

-    <import file="../../antdefs.xml"/>

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml
deleted file mode 100644
index afb66cc792..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/pom.xml
+++ /dev/null
@@ -1,58 +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>scatours</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent><version>2.0-SNAPSHOT</version>
-    <artifactId>scatours-util-launcher-common</artifactId>
-    <name>Apache Tuscany SCA Tours Common Utility for Launchers</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>${tuscany.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.2</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <addClasspath>${scatours.selfContained}</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>       
-    </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java b/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
deleted file mode 100644
index 02a32ecf04..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/launcher-common/src/main/java/scatours/launcher/LauncherUtil.java
+++ /dev/null
@@ -1,86 +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 scatours.launcher;
-
-import java.io.File;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/**
- * This utility locates SCA contributions by name so that the launcher can work with various environments where 
- * contributions are stored differently.
- */
-public class LauncherUtil {
-
-    /**
-     * Locate an SCA contribution by name
-     * @param name The name of the SCA contribution archive
-     * @return The Contribution
-     */
-    public static Contribution locate(String name) {
-        // Try to use the target/classes directory inside Eclipse/Maven
-        File file = new File("../../contributions/" + name + "/target/classes");
-        if (!file.exists()) {
-            // Try to use the target/<contribution>.jar that is generated by maven build
-            file = new File("../../contributions/" + name + "/target/scatours-contribution-" + name + ".jar");
-            if (!file.exists()) {
-                // Try to use the contribution jar under the contributions folder of the distribution
-                file = new File("../contributions/scatours-contribution-" + name + ".jar");
-                if (!file.exists()) {
-                    // Try to use the contribution subfolder under the contributions folder of the distribution
-                    file = new File("../contributions/scatours-contribution-" + name);
-                    if (!file.exists()) {
-                        throw new IllegalArgumentException("Contribution " + name + " cannot be located.");
-                    }
-                }
-            }
-        }
-        return new Contribution(name, file.toURI().toString());
-    }
-
-    /**
-     * Locate an SCA contribution by replacing the ${name} in the pattern 
-     * @param urlPattern The url pattern that contains ${name}
-     * @param name The name of the contribution archive
-     * @return The Contribution
-     */
-    public static Contribution locate(String urlPattern, String name) {
-        String url = urlPattern.replace("${name}", name);
-        return new Contribution(name, url);
-    }
-
-    /**
-     * Create an SCA node from a list of contribution names
-     * @param composite
-     * @param contributionNames
-     * @return
-     */
-    public static Node createNode(String composite, String... contributionNames) {
-        Contribution[] contributions = new Contribution[contributionNames.length];
-        int index = 0;
-        for (String name : contributionNames) {
-            contributions[index++] = locate(name);
-        }
-        Node node = NodeFactory.getInstance().createNode(composite, contributions);
-        return node;
-    }
-}
diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml
deleted file mode 100644
index c6b5a02097..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml
+++ /dev/null
@@ -1,179 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-util-openejb-runtime</artifactId>

-    <name>Apache Tuscany SCA Tours OpenEJB Runtime Dependencies</name>

-

-    <profiles>

-        <profile>

-            <!-- The default profile produces a subset distribution which excludes

-               libraries that are present in the Tuscany SCA binary distro. -->

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <dependencies>

-                <dependency>

-                    <groupId>org.apache.openejb</groupId>

-                    <artifactId>openejb-ejbd</artifactId>

-                    <version>3.1.2</version>

-                    <scope>runtime</scope>

-                    <!-- exclude the following because they are part of the Tuscany SCA binary distro -->

-                    <exclusions>

-                        <exclusion>

-                            <groupId>org.apache.activemq</groupId>

-                            <artifactId>activeio-core</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>org.apache.activemq</groupId>

-                            <artifactId>activemq-core</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>org.apache.activemq</groupId>

-                            <artifactId>activemq-ra</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>backport-util-concurrent</groupId>

-                            <artifactId>backport-util-concurrent</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>commons-collections</groupId>

-                            <artifactId>commons-collections</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>commons-lang</groupId>

-                            <artifactId>commons-lang</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>commons-logging</groupId>

-                            <artifactId>commons-logging</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>commons-pool</groupId>

-                            <artifactId>commons-pool</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>org.apache.geronimo.components</groupId>

-                            <artifactId>geronimo-connector</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>org.apache.geronimo.javamail</groupId>

-                            <artifactId>geronimo-javamail_1.4_mail</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>org.objectweb.howl</groupId>

-                            <artifactId>howl</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>hsqldb</groupId>

-                            <artifactId>hsqldb</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>com.sun.xml.bind</groupId>

-                            <artifactId>jaxb-impl</artifactId>

-                        </exclusion>

-                         <exclusion>

-                            <groupId>junit</groupId>

-                            <artifactId>junit</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>log4j</groupId>

-                            <artifactId>log4j</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>org.apache.openjpa</groupId>

-                            <artifactId>openjpa</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>quartz</groupId>

-                            <artifactId>quartz</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>serp</groupId>

-                            <artifactId>serp</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>stax</groupId>

-                            <artifactId>stax-api</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>org.codehaus.swizzle</groupId>

-                            <artifactId>swizzle-stream</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>wsdl4j</groupId>

-                            <artifactId>wsdl4j</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>org.codehaus.woodstox</groupId>

-                            <artifactId>wstx-asl</artifactId>

-                        </exclusion>

-                        <exclusion>

-                            <groupId>org.apache.xbean</groupId>

-                            <artifactId>xbean-naming</artifactId>

-                        </exclusion>

-                    </exclusions>

-                </dependency>

-            </dependencies>

-        </profile>

-

-        <profile>

-            <!-- Use mvn -Pselfcontained to produce a self-contained distribution

-               with all library dependencies included. -->

-            <id>selfcontained</id>

-            <dependencies>

-                <dependency>

-                    <groupId>org.apache.openejb</groupId>

-                    <artifactId>openejb-ejbd</artifactId>

-                    <version>3.1.2</version>

-                    <scope>runtime</scope>

-                </dependency>

-            </dependencies>

-        </profile>

-    </profiles>

-

-    <build>

-        <finalName>${artifactId}</finalName>

-        <plugins>

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-jar-plugin</artifactId>

-                <version>2.2</version>

-                <configuration>

-                    <archive>

-                        <manifest>

-                            <addClasspath>true</addClasspath>

-                            <classpathPrefix>../openejb/</classpathPrefix>

-                        </manifest>

-                    </archive>

-                </configuration>

-            </plugin>

-        </plugins>       

-    </build>

-

-</project>

diff --git a/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml b/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml
deleted file mode 100644
index 6426cd5189..0000000000
--- a/sca-java-2.x/trunk/tutorials/travelsample/util/pom.xml
+++ /dev/null
@@ -1,47 +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>scatours</artifactId>

-        <version>2.0-SNAPSHOT</version>

-        <relativePath>../pom.xml</relativePath>

-    </parent>

-    <version>2.0-SNAPSHOT</version>

-    <artifactId>scatours-util</artifactId>

-    <packaging>pom</packaging>

-    <name>Apache Tuscany SCA Tours Utilities</name>

-

-    <profiles>

-        <profile>

-            <id>default</id>

-            <activation>

-                <activeByDefault>true</activeByDefault>

-            </activation>

-            <modules>

-                <module>jaxws-runtime</module>

-                <module>launcher-common</module>

-                <module>openejb-runtime</module>

-            </modules>

-        </profile>

-    </profiles>

-

-</project>