TUSCANY-3062 don't resolve composites in the deployable composite collection. Remove unused contributions from domain. Upgrade the README to describe each store scenario and how to run it.

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

3 files changed, 15 insertions, 15 deletions

diff --git a/branches/sca-java-1.5/tutorials/store/domain/cloud.composite b/branches/sca-java-1.5/tutorials/store/domain/cloud.composite
index 8f879c5261..c01653adb7 100644
--- a/branches/sca-java-1.5/tutorials/store/domain/cloud.composite
+++ b/branches/sca-java-1.5/tutorials/store/domain/cloud.composite
@@ -28,9 +28,9 @@
   <include name="ns2:StoreDBNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
   <include name="ns2:StoreSupplierNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
   <include name="ns2:StoreEUNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreMashupNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:StoreMarketNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>   
-  <include name="ns2:CatalogWebAppNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:CatalogMediationNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
-  <include name="ns2:CatalogEJBNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/>
+  <!--include name="ns2:StoreMashupNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/-->
+  <!--include name="ns2:StoreMarketNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/-->   
+  <!--include name="ns2:CatalogWebAppNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/-->
+  <!--include name="ns2:CatalogMediationNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/-->
+  <!--include name="ns2:CatalogEJBNode" uri="http://tuscany.apache.org/cloud" xmlns:ns2="http://tuscany.apache.org/cloud"/-->
 </composite>
diff --git a/branches/sca-java-1.5/tutorials/store/domain/domain.composite b/branches/sca-java-1.5/tutorials/store/domain/domain.composite
index 8d47697df8..aa56546ab7 100644
--- a/branches/sca-java-1.5/tutorials/store/domain/domain.composite
+++ b/branches/sca-java-1.5/tutorials/store/domain/domain.composite
@@ -25,12 +25,12 @@
   <include name="ns2:store-client" uri="store-client" xmlns:ns2="http://store"/>
   <include name="ns2:store-db" uri="store-db" xmlns:ns2="http://store"/>
   <include name="ns2:store-supplier" uri="store-supplier" xmlns:ns2="http://store"/>
-  <include name="ns2:store-market" uri="store-market" xmlns:ns2="http://store"/> 
+  <!--include name="ns2:store-market" uri="store-market" xmlns:ns2="http://store"/--> 
   <include name="ns2:store-eu" uri="store-eu" xmlns:ns2="http://store"/>
-  <include name="ns2:store-mashup" uri="store-mashup" xmlns:ns2="http://store"/>
+  <!-- include name="ns2:store-mashup" uri="store-mashup" xmlns:ns2="http://store"/-->
   <include name="ns2:catalogs" uri="web-services" xmlns:ns2="http://services"/>
   <include name="ns2:currency" uri="web-services" xmlns:ns2="http://services"/>
-  <include name="ns2:catalog-web" uri="catalog-webapp" xmlns:ns2="http://catalog"/>
-  <include name="ns2:catalog-mediation" uri="catalog-mediation" xmlns:ns2="http://catalog"/>
-  <include name="ns2:catalog-ejb" uri="catalog-ejb" xmlns:ns2="http://catalog"/>
+  <!--include name="ns2:catalog-web" uri="catalog-webapp" xmlns:ns2="http://catalog"/-->
+  <!--include name="ns2:catalog-mediation" uri="catalog-mediation" xmlns:ns2="http://catalog"/-->
+  <!--include name="ns2:catalog-ejb" uri="catalog-ejb" xmlns:ns2="http://catalog"/-->
 </composite>
diff --git a/branches/sca-java-1.5/tutorials/store/domain/workspace.xml b/branches/sca-java-1.5/tutorials/store/domain/workspace.xml
index 9cdbe04ac7..b982255012 100644
--- a/branches/sca-java-1.5/tutorials/store/domain/workspace.xml
+++ b/branches/sca-java-1.5/tutorials/store/domain/workspace.xml
@@ -24,12 +24,12 @@
   <contribution location="file:../store-client/target/tutorial-store-client.jar" uri="store-client"/>
   <contribution location="file:../store-db/target/tutorial-store-db.jar" uri="store-db"/>
   <contribution location="file:../store-supplier/target/tutorial-store-supplier.jar" uri="store-supplier"/>
-  <contribution location="file:../store-market/target/tutorial-store-market.jar" uri="store-market"/> 
+  <!-- contribution location="file:../store-market/target/tutorial-store-market.jar" uri="store-market"/--> 
   <contribution location="file:../store-eu/target/tutorial-store-eu.jar" uri="store-eu"/>
-  <contribution location="file:../store-mashup" uri="store-mashup"/>
+  <!-- contribution location="file:../store-mashup" uri="store-mashup"/-->
   <contribution location="file:../web-services/target/tutorial-web-services.jar" uri="web-services"/>
-  <contribution location="file:../catalog-webapp/target/tutorial-catalog-webapp.war" uri="catalog-webapp"/>
-  <contribution location="file:../catalog-mediation/target/tutorial-catalog-mediation.jar" uri="catalog-mediation"/>
-  <contribution location="file:../catalog-ejb/target/tutorial-catalog-ejb.jar" uri="catalog-ejb"/>
+  <!-- contribution location="file:../catalog-webapp/target/tutorial-catalog-webapp.war" uri="catalog-webapp"/-->
+  <!-- contribution location="file:../catalog-mediation/target/tutorial-catalog-mediation.jar" uri="catalog-mediation"/-->
+  <!-- contribution location="file:../catalog-ejb/target/tutorial-catalog-ejb.jar" uri="catalog-ejb"/-->
   <contribution location="file:../domain/cloud" uri="http://tuscany.apache.org/cloud"/>
 </workspace>