From 927bf127eb5530bbda2da17ff99a0dab3d3f3a45 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 15 Sep 2009 13:01:26 +0000
Subject: Apply new naming convention to currency converter contributions and
 launchers for RMI, JMS and JSP

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@815305 13f79535-47bb-0310-9956-ffa450edef68
---
 .../currency-jms-contribution/pom.xml              | 83 ----------------------
 .../main/resources/META-INF/sca-contribution.xml   | 22 ------
 .../resources/currency-converter-jms.composite     | 37 ----------
 .../contributions/currency-jms/pom.xml             | 83 ++++++++++++++++++++++
 .../main/resources/META-INF/sca-contribution.xml   | 23 ++++++
 .../resources/currency-converter-jms.composite     | 37 ++++++++++
 .../currency-jsp-contribution/pom.xml              | 65 -----------------
 .../webapp/META-INF/sca-deployables/web.composite  | 34 ---------
 .../src/main/webapp/WEB-INF/web.xml                | 42 -----------
 .../src/main/webapp/currency-converter.jsp         | 49 -------------
 .../contributions/currency-jsp/pom.xml             | 65 +++++++++++++++++
 .../webapp/META-INF/sca-deployables/web.composite  | 34 +++++++++
 .../currency-jsp/src/main/webapp/WEB-INF/web.xml   | 42 +++++++++++
 .../src/main/webapp/currency-converter.jsp         | 49 +++++++++++++
 .../currency-rmi-contribution/pom.xml              | 51 -------------
 .../main/resources/META-INF/sca-contribution.xml   | 22 ------
 .../resources/currency-converter-rmi.composite     | 32 ---------
 .../contributions/currency-rmi/pom.xml             | 51 +++++++++++++
 .../main/resources/META-INF/sca-contribution.xml   | 23 ++++++
 .../resources/currency-converter-rmi.composite     | 32 +++++++++
 sandbox/travelsample/contributions/pom.xml         |  6 +-
 21 files changed, 442 insertions(+), 440 deletions(-)
 delete mode 100644 sandbox/travelsample/contributions/currency-jms-contribution/pom.xml
 delete mode 100644 sandbox/travelsample/contributions/currency-jms-contribution/src/main/resources/META-INF/sca-contribution.xml
 delete mode 100644 sandbox/travelsample/contributions/currency-jms-contribution/src/main/resources/currency-converter-jms.composite
 create mode 100644 sandbox/travelsample/contributions/currency-jms/pom.xml
 create mode 100644 sandbox/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
 create mode 100644 sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
 delete mode 100644 sandbox/travelsample/contributions/currency-jsp-contribution/pom.xml
 delete mode 100644 sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/META-INF/sca-deployables/web.composite
 delete mode 100644 sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/currency-converter.jsp
 create mode 100644 sandbox/travelsample/contributions/currency-jsp/pom.xml
 create mode 100644 sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
 create mode 100644 sandbox/travelsample/contributions/currency-jsp/src/main/webapp/WEB-INF/web.xml
 create mode 100644 sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp
 delete mode 100644 sandbox/travelsample/contributions/currency-rmi-contribution/pom.xml
 delete mode 100644 sandbox/travelsample/contributions/currency-rmi-contribution/src/main/resources/META-INF/sca-contribution.xml
 delete mode 100644 sandbox/travelsample/contributions/currency-rmi-contribution/src/main/resources/currency-converter-rmi.composite
 create mode 100644 sandbox/travelsample/contributions/currency-rmi/pom.xml
 create mode 100644 sandbox/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
 create mode 100644 sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite

(limited to 'sandbox/travelsample/contributions')

diff --git a/sandbox/travelsample/contributions/currency-jms-contribution/pom.xml b/sandbox/travelsample/contributions/currency-jms-contribution/pom.xml
deleted file mode 100644
index cf53088544..0000000000
--- a/sandbox/travelsample/contributions/currency-jms-contribution/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>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <!--relativePath>../../pom.xml</relativePath-->
-    </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-currency-jms-contribution</artifactId>
-    <name>Apache Tuscany SCA Tours Currency Converter Contribution With JMS Binding</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jms-asf</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </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/sandbox/travelsample/contributions/currency-jms-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/currency-jms-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 0924b826b5..0000000000
--- a/sandbox/travelsample/contributions/currency-jms-contribution/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://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.currencyconverter"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/currency-jms-contribution/src/main/resources/currency-converter-jms.composite b/sandbox/travelsample/contributions/currency-jms-contribution/src/main/resources/currency-converter-jms.composite
deleted file mode 100644
index 0c09053ca6..0000000000
--- a/sandbox/travelsample/contributions/currency-jms-contribution/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://www.osoa.org/xmlns/sca/1.0"
-    targetNamespace="http://goodvaluetrips.com/"
-    name="currencyconverter">
-
-    <component name="CurrencyConverter">
-        <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl"/>
-        <service name="CurrencyConverter">
-            <interface.java interface="scatours.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/sandbox/travelsample/contributions/currency-jms/pom.xml b/sandbox/travelsample/contributions/currency-jms/pom.xml
new file mode 100644
index 0000000000..17a2016d04
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency-jms/pom.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.6-SNAPSHOT</version>
+        <!--relativePath>../../pom.xml</relativePath-->
+    </parent><version>1.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-host-embedded</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-jms-asf</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </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/sandbox/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..89ba1a3578
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency-jms/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <import.java package="com.tuscanyscatours.currencyconverter" />
+    <import.java package="com.tuscanyscatours.currencyconverter.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite b/sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
new file mode 100644
index 0000000000..ac34d6f562
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency-jms/src/main/resources/currency-converter-jms.composite
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    targetNamespace="http://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/sandbox/travelsample/contributions/currency-jsp-contribution/pom.xml b/sandbox/travelsample/contributions/currency-jsp-contribution/pom.xml
deleted file mode 100644
index c3378d1235..0000000000
--- a/sandbox/travelsample/contributions/currency-jsp-contribution/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>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <!--relativePath>../../pom.xml</relativePath-->
-    </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-currency-jsp-contribution</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>1.6-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>scatours-currency-contribution</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/META-INF/sca-deployables/web.composite b/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index e93abf480c..0000000000
--- a/sandbox/travelsample/contributions/currency-jsp-contribution/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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    targetNamespace="http://scatours.com"
-    name="CurrencyConverterJSP">
-
-    <component name="WebClient">
-        <implementation.web web-uri=""/>
-        <reference name="currencyConverter" target="CurrencyConverter"/>
-    </component>
-
-    <component name="CurrencyConverter">
-        <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl"/>
-        <service name="CurrencyConverter"/>
-    </component>
-</composite>
diff --git a/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/WEB-INF/web.xml b/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 3b2c79ca76..0000000000
--- a/sandbox/travelsample/contributions/currency-jsp-contribution/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/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/currency-converter.jsp b/sandbox/travelsample/contributions/currency-jsp-contribution/src/main/webapp/currency-converter.jsp
deleted file mode 100644
index 0014492edb..0000000000
--- a/sandbox/travelsample/contributions/currency-jsp-contribution/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="scatours.currencyconverter.CurrencyConverter"/>
-
-<html>
-<body>
-<h2>SCA Tours Currency Converter</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/sandbox/travelsample/contributions/currency-jsp/pom.xml b/sandbox/travelsample/contributions/currency-jsp/pom.xml
new file mode 100644
index 0000000000..25682147ea
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency-jsp/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.6-SNAPSHOT</version>
+        <!--relativePath>../../pom.xml</relativePath-->
+    </parent><version>1.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>1.6-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-web-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-contribution-currency</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
new file mode 100644
index 0000000000..50667b1ac0
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    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/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/WEB-INF/web.xml b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..3b2c79ca76
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp
new file mode 100644
index 0000000000..d1970a37ab
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency-jsp/src/main/webapp/currency-converter.jsp
@@ -0,0 +1,49 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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</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/sandbox/travelsample/contributions/currency-rmi-contribution/pom.xml b/sandbox/travelsample/contributions/currency-rmi-contribution/pom.xml
deleted file mode 100644
index d90ec350a4..0000000000
--- a/sandbox/travelsample/contributions/currency-rmi-contribution/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>tuscany-sca</artifactId>
-        <version>1.6-SNAPSHOT</version>
-        <!--relativePath>../../pom.xml</relativePath-->
-    </parent><version>1.0-SNAPSHOT</version>
-    <artifactId>scatours-currency-rmi-contribution</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>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/sandbox/travelsample/contributions/currency-rmi-contribution/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/currency-rmi-contribution/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 31875cc170..0000000000
--- a/sandbox/travelsample/contributions/currency-rmi-contribution/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://www.osoa.org/xmlns/sca/1.0">
-   <import.java package="scatours.currencyconverter"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/contributions/currency-rmi-contribution/src/main/resources/currency-converter-rmi.composite b/sandbox/travelsample/contributions/currency-rmi-contribution/src/main/resources/currency-converter-rmi.composite
deleted file mode 100644
index 4c14eb9ac0..0000000000
--- a/sandbox/travelsample/contributions/currency-rmi-contribution/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://www.osoa.org/xmlns/sca/1.0"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-    targetNamespace="http://goodvaluetrips.com/"
-    name="currencyconverter">
-
-    <component name="CurrencyConverter">
-        <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl" />
-        <service name="CurrencyConverter">
-            <interface.java interface="scatours.currencyconverter.CurrencyConverter" />
-            <tuscany:binding.rmi host="localhost" port="8099" serviceName="CurrencyConverterRMI"/>
-        </service>
-    </component>
-</composite>
diff --git a/sandbox/travelsample/contributions/currency-rmi/pom.xml b/sandbox/travelsample/contributions/currency-rmi/pom.xml
new file mode 100644
index 0000000000..9638eed0c8
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency-rmi/pom.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.6-SNAPSHOT</version>
+        <!--relativePath>../../pom.xml</relativePath-->
+    </parent><version>1.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>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+       <finalName>${artifactId}</finalName>
+    </build>
+</project>
diff --git a/sandbox/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..cf7325d247
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency-rmi/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0">
+    <import.java package="com.tuscanyscatours.currencyconverter" />
+    <import.java package="com.tuscanyscatours.currencyconverter.impl" />
+</contribution>
diff --git a/sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite b/sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
new file mode 100644
index 0000000000..52df3a183f
--- /dev/null
+++ b/sandbox/travelsample/contributions/currency-rmi/src/main/resources/currency-converter-rmi.composite
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+    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/sandbox/travelsample/contributions/pom.xml b/sandbox/travelsample/contributions/pom.xml
index a395133ac7..42cc847fdc 100644
--- a/sandbox/travelsample/contributions/pom.xml
+++ b/sandbox/travelsample/contributions/pom.xml
@@ -46,9 +46,9 @@
                 <module>creditcard-payment-sdo</module>
                 <module>currency</module>
                 <module>currency-corba</module>
-                <module>currency-jms-contribution</module>
-                <module>currency-jsp-contribution</module>
-                <module>currency-rmi-contribution</module>
+                <module>currency-jms</module>
+                <module>currency-jsp</module>
+                <module>currency-rmi</module>
                 <module>currency-ws</module>
                 <module>databinding-client-contribution</module>
                 <module>emailgateway</module>
-- 
cgit v1.2.3