From e8419233f758611b0b73057f685f1aff675b7e0e Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 4 Nov 2009 22:02:45 +0000
Subject: Providing a store-merger application that explores adding new
 catalogs from different cloud environments to the store application

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@832884 13f79535-47bb-0310-9956-ffa450edef68
---
 .../store-appengine-webapp/war/store.composite             | 14 +++-----------
 .../store-appengine-webapp/war/store.html                  |  2 +-
 2 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'sandbox/sca-cloud-tutorial/store-appengine-webapp')

diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.composite b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.composite
index 8705f9a52a..bbd90a63bb 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.composite
+++ b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.composite
@@ -23,21 +23,13 @@
 	       targetNamespace="http://store" 
 	       name="catalog">
 		
-	<component name="CatalogAggregator">
-		<implementation.java class="services.CatalogAggregatorImpl"/>
+	<component name="Catalog">
+		<implementation.java class="services.FruitsCatalogImpl"/>
 		<property name="currencyCode">USD</property>
 		<service name="Catalog">
 		    <interface.java interface="services.Catalog"/>
-			<tuscany:binding.jsonrpc uri="/CatalogAggregator"/>
+			<tuscany:binding.jsonrpc uri="/Catalog"/>
 		</service>
-		<reference name="fruitsCatalog">
-		    <interface.java interface="services.Catalog"/>
-			<tuscany:binding.jsonrpc uri="http://tuscany-store-catalog.appspot.com/Catalog"/>
-		</reference>
-		<reference name="vegetablesCatalog">
-		    <interface.java interface="services.Catalog"/>
-			<tuscany:binding.jsonrpc uri="http://tuscany.figueiredos.com/store-catalog-ibmcloud-webapp/Catalog"/>
-		</reference>		
 		<reference name="currencyConverter" target="CurrencyConverter" />
 	</component>
 
diff --git a/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.html b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.html
index 0afe661540..aadb4ebd4f 100644
--- a/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.html
+++ b/sandbox/sca-cloud-tutorial/store-appengine-webapp/war/store.html
@@ -33,7 +33,7 @@
 
 	var userServices = new dojo.rpc.JsonService("/User?smd");
 	
-	var catalog = new dojo.rpc.JsonService("/CatalogAggregator?smd");
+	var catalog = new dojo.rpc.JsonService("/Catalog?smd");
 
 	var shoppingCart = new dojo.rpc.JsonService("/ShoppingCart?smd");
 
-- 
cgit v1.2.3