From 6691cbe95d920e0ada6cb957c29ff3458170ec3c Mon Sep 17 00:00:00 2001
From: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 12 Feb 2010 07:10:45 +0000
Subject: Minor cleanup on the composites

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@909271 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/test/resources/catalog-local.composite                |  3 ---
 .../src/test/resources/catalog-remote-jsonrpc.composite       | 11 ++++-------
 .../src/test/resources/catalog-remote-ws.composite            | 11 ++++-------
 3 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'sandbox/lresende')

diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-local.composite b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-local.composite
index 707bc5ae32..cf579f2dbe 100644
--- a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-local.composite
+++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-local.composite
@@ -24,9 +24,6 @@
 		
 	<component name="CatalogAggregator">
 		<implementation.java class="services.sca.CatalogAggregatorImpl"/>
-		<service name="Catalog">
-		    <interface.java interface="services.Catalog"/>
-		</service>
 		<reference name="fruitsCatalog" target="FruitsCatalog">
 		    <interface.java interface="services.Catalog"/>
 		</reference>
diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-jsonrpc.composite b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-jsonrpc.composite
index 545b9d7b10..284196db8d 100644
--- a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-jsonrpc.composite
+++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-jsonrpc.composite
@@ -24,15 +24,12 @@
 
 	<component name="CatalogAggregator">
 		<implementation.java class="services.sca.CatalogAggregatorImpl"/>
-		<service name="Catalog">
-		    <interface.java interface="services.Catalog" remotable="true"/>
-		</service>
 		<reference name="fruitsCatalog">
-		    <interface.java interface="services.Catalog" remotable="true"/>
+		    <interface.java interface="services.Catalog"/>
 		    <tuscany:binding.jsonrpc uri="http://localhost:8085/FruitsCatalog"/>
 		</reference>
 		<reference name="vegetablesCatalog">
-		    <interface.java interface="services.Catalog" remotable="true"/>
+		    <interface.java interface="services.Catalog"/>
 		    <tuscany:binding.jsonrpc uri="http://localhost:8085/VegetableCatalog" />
 		</reference>		
 	</component>
@@ -40,7 +37,7 @@
 	<component name="FruitsCatalog">
 		<implementation.java class="services.sca.FruitsCatalogImpl"/> 
 		<service name="Catalog">
-			<interface.java interface="services.Catalog" remotable="true"/>
+			<interface.java interface="services.Catalog"/>
 			<tuscany:binding.jsonrpc uri="http://localhost:8085/FruitsCatalog" />
    		</service>	
 	</component> 
@@ -48,7 +45,7 @@
 	<component name="VegetablesCatalog">
 		<implementation.java class="services.sca.FruitsCatalogImpl"/> 
 		<service name="Catalog">
-			<interface.java interface="services.Catalog" remotable="true"/>
+			<interface.java interface="services.Catalog"/>
 			<tuscany:binding.jsonrpc uri="http://localhost:8085/VegetableCatalog" />
    		</service>	
 	</component> 
diff --git a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-ws.composite b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-ws.composite
index 5ad7789e84..f1803a8c09 100644
--- a/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-ws.composite
+++ b/sandbox/lresende/sca-2.x/itest/binding-throughput/src/test/resources/catalog-remote-ws.composite
@@ -24,15 +24,12 @@
 
 	<component name="CatalogAggregator">
 		<implementation.java class="services.sca.CatalogAggregatorImpl"/>
-		<service name="Catalog">
-		    <interface.java interface="services.Catalog" remotable="true"/>
-		</service>
 		<reference name="fruitsCatalog">
-		    <interface.java interface="services.Catalog" remotable="true"/>
+		    <interface.java interface="services.Catalog"/>
 		    <binding.ws uri="http://localhost:8086/FruitsCatalog"/>
 		</reference>
 		<reference name="vegetablesCatalog">
-		    <interface.java interface="services.Catalog" remotable="true"/>
+		    <interface.java interface="services.Catalog"/>
 		    <binding.ws uri="http://localhost:8086/VegetableCatalog"/>
 		</reference>		
 	</component>
@@ -40,7 +37,7 @@
 	<component name="FruitsCatalog">
 		<implementation.java class="services.sca.FruitsCatalogImpl"/> 
 		<service name="Catalog">
-			<interface.java interface="services.Catalog" remotable="true"/>
+			<interface.java interface="services.Catalog"/>
 			<binding.ws uri="http://localhost:8086/FruitsCatalog"/>
    		</service>	
 	</component> 
@@ -48,7 +45,7 @@
 	<component name="VegetablesCatalog">
 		<implementation.java class="services.sca.FruitsCatalogImpl"/> 
 		<service name="Catalog">
-			<interface.java interface="services.Catalog" remotable="true"/>
+			<interface.java interface="services.Catalog"/>
 			<binding.ws uri="http://localhost:8086/VegetableCatalog"/>
    		</service>	
 	</component>
-- 
cgit v1.2.3