From c0be84658ad4dc4d9df3b7ddbf7cd18b261312d6 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 26 Nov 2009 21:51:04 +0000
Subject: A bit of tidying in the full-app. Mainly renaming frontend to
 coordination and correcting the composite names in the full app contributions

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@884703 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/resources/META-INF/sca-contribution.xml   |  2 +-
 .../src/main/resources/fullapp-ui.composite        | 58 ++++++++++++++++++++++
 .../src/main/resources/scatours.composite          | 58 ----------------------
 3 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
 delete mode 100644 sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite

(limited to 'sandbox/travelsample/contributions/fullapp-ui/src/main/resources')

diff --git a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
index 6832ecaf79..104a78cd92 100644
--- a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/META-INF/sca-contribution.xml
@@ -19,7 +19,7 @@
 -->
 <contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
               xmlns:scatours="http://tuscanyscatours.com/">
-    <deployable composite="scatours:ui" />
+    <deployable composite="scatours:fullapp-ui" />
     <import.java package="com.tuscanyscatours" />
     <import.java package="com.tuscanyscatours.impl" />
     <import.java package="com.tuscanyscatours.shoppingcart" />
diff --git a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
new file mode 100644
index 0000000000..bcfa894ca6
--- /dev/null
+++ b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/fullapp-ui.composite
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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/"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+           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/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite b/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.composite
deleted file mode 100644
index 5dd0d01102..0000000000
--- a/sandbox/travelsample/contributions/fullapp-ui/src/main/resources/scatours.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://www.osoa.org/xmlns/sca/1.0"
-           targetNamespace="http://tuscanyscatours.com/"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-           name="ui">
-           
-    <component name="scatours">
-        <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>
-- 
cgit v1.2.3