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@778666 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 3 deletions

diff --git a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
index 1eb70cce77..029c8c746b 100644
--- a/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
+++ b/branches/sca-java-1.x/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
@@ -284,7 +284,9 @@ public class DeployableCompositeCollectionImpl implements ItemCollection, LocalI
             
             Contribution contribution = (Contribution)contributionProcessor.read(null, uri, location);
             
-            contributionProcessor.resolve(contribution, new DefaultModelResolver());
+            // TODO - analyse dependencies here?
+            
+            //contributionProcessor.resolve(contribution, new DefaultModelResolver());
             
             // Cache contribution
             contributionCache = new ContributionCache();
@@ -298,8 +300,8 @@ public class DeployableCompositeCollectionImpl implements ItemCollection, LocalI
             throw e;
         } catch (MalformedURLException e) {
             throw new ContributionReadException(e);
-        } catch (ContributionResolveException e) {
-            throw new ContributionReadException(e);
+       // } catch (ContributionResolveException e) {
+       //     throw new ContributionReadException(e);
         } catch (Throwable e) {
             throw new ContributionReadException(e);
         }