You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/10/25 20:59:59 UTC

svn commit: r588311 - in /incubator/tuscany/java/sca/tutorial/store/src/main/resources: merger/ store.composite

Author: jsdelfino
Date: Thu Oct 25 11:59:59 2007
New Revision: 588311

URL: http://svn.apache.org/viewvc?rev=588311&view=rev
Log:
Merge the new catalog into the store.composite instead of using an include as it's simpler.

Removed:
    incubator/tuscany/java/sca/tutorial/store/src/main/resources/merger/
Modified:
    incubator/tuscany/java/sca/tutorial/store/src/main/resources/store.composite

Modified: incubator/tuscany/java/sca/tutorial/store/src/main/resources/store.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/store/src/main/resources/store.composite?rev=588311&r1=588310&r2=588311&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/store/src/main/resources/store.composite (original)
+++ incubator/tuscany/java/sca/tutorial/store/src/main/resources/store.composite Thu Oct 25 11:59:59 2007
@@ -23,8 +23,6 @@
 		xmlns:s="http://store"
 		name="store">
 		
-	<include name="s:new-catalog"/>
-		
 	<component name="ui">
 		<t:implementation.resource location="uiservices"/>
 		<service name="Resource">
@@ -32,6 +30,16 @@
 		</service> 	
 	</component>		
   
+	<component name="NewCatalog">
+		<implementation.java class="services.merger.NewCatalogImpl"/> 
+		<service name="Catalog">
+			<t:binding.jsonrpc/>
+			<binding.ws uri="FruitsAndVegetables"/>
+   		</service>
+		<reference name="fruitsCatalog" target="Catalog"/>	
+		<reference name="vegetablesCatalog" target="VegetablesCatalog"/>	
+	</component> 
+ 	
 	<component name="Catalog">
 		<implementation.java class="services.CatalogImpl"/> 
 		<property name="currencyCode">USD</property>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org