diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-26 11:43:42 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-26 11:43:42 +0000 |
commit | 9cda7f1d4fd99777d7dea4ff707d178c16bc42b8 (patch) | |
tree | 512d8c106998a601e74ab6408020427a0729d0d3 /branches/sca-java-1.5/modules/domain-manager/src | |
parent | 3578386a355cb93f6533ad3f55d015a708e29ead (diff) |
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
Diffstat (limited to 'branches/sca-java-1.5/modules/domain-manager/src')
-rw-r--r-- | branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java b/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java index 1eb70cce77..029c8c746b 100644 --- a/branches/sca-java-1.5/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java +++ b/branches/sca-java-1.5/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); } |