move files to correct place

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

2 files changed, 65 insertions, 27 deletions

diff --git a/sandbox/travelsample/ui-contribution-webapp/src/main/webapp/META-INF/sca-deployables/sca-contribution.xml b/sandbox/travelsample/ui-contribution-webapp/src/main/webapp/META-INF/sca-deployables/sca-contribution.xml
deleted file mode 100644
index ca5bb4bc3e..0000000000
--- a/sandbox/travelsample/ui-contribution-webapp/src/main/webapp/META-INF/sca-deployables/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://www.osoa.org/xmlns/sca/1.0"
-   xmlns:scatours="http://scatours">
-   <import.java package="scatours.common"/>
-   <import.java package="scatours.currencyconverter"/>
-   <import.java package="scatours.hotel"/>
-   <import.java package="scatours.trip"/>
-   <deployable composite="scatours:scatours"/>
-</contribution>
\ No newline at end of file
diff --git a/sandbox/travelsample/ui-contribution-webapp/src/main/webapp/META-INF/sca-deployables/scatours.composite b/sandbox/travelsample/ui-contribution-webapp/src/main/webapp/META-INF/sca-deployables/scatours.composite
new file mode 100644
index 0000000000..7d340bebba
--- /dev/null
+++ b/sandbox/travelsample/ui-contribution-webapp/src/main/webapp/META-INF/sca-deployables/scatours.composite
@@ -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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+           targetNamespace="http://scatours"
+           xmlns:scatours="http://scatours"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           name="scatours">
+           
+    <component name="SCATours">
+        <tuscany:implementation.widget location="scatours.html"/>
+        <service name="Widget">
+            <tuscany:binding.http uri="/scatours"/>
+        </service>
+        <reference name="hotel" target="HotelComponent">
+            <tuscany:binding.jsonrpc/>
+        </reference>
+        <reference name="trip" target="TripComponent">
+            <tuscany:binding.jsonrpc/>
+        </reference>
+    </component>
+    
+    <component name="TripComponent">
+        <implementation.java class="scatours.trip.TripImpl"/>
+        <service name="Trip">
+            <tuscany:binding.jsonrpc/>
+        </service>
+        <reference name="hotelSearch" target="HotelComponent">
+            <binding.sca/>
+        </reference>
+        <reference name="currencyConverter" target="CurrencyConverterComponent">
+        </reference>
+    </component>
+        
+    <component name="HotelComponent">
+        <implementation.java class="scatours.hotel.HotelImpl"/>
+        <service name="Search">
+            <binding.sca/>
+            <tuscany:binding.jsonrpc/>
+        </service>
+    </component>    
+    
+    <component name="CurrencyConverterComponent">
+        <implementation.java class="scatours.currencyconverter.CurrencyConverterImpl"/>
+        <service name="CurrencyConverter">
+        </service>
+    </component>
+
+</composite>