From 2871272f6f5fd509f0ca255bd7ca8174ebf6a12a Mon Sep 17 00:00:00 2001 From: slaws Date: Tue, 26 May 2009 11:54:36 +0000 Subject: 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 --- .../sca/contribution/resource/impl/ArtifactModelResolver.java | 3 ++- .../domain/manager/impl/DeployableCompositeCollectionImpl.java | 8 +++++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'branches/sca-java-1.x/modules') diff --git a/branches/sca-java-1.x/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java b/branches/sca-java-1.x/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java index e614b47fc7..67836748fc 100644 --- a/branches/sca-java-1.x/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java +++ b/branches/sca-java-1.x/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java @@ -70,7 +70,8 @@ public class ArtifactModelResolver implements ModelResolver { if (import_ instanceof ResourceImport) { ResourceImport resourceImport = (ResourceImport)import_; //check the import location against the computed package name from the componentType URI - if (resourceImport.getURI().equals(uri)) { + if ((resourceImport.getURI().equals(uri)) && + (resourceImport.getModelResolver() != null)){ // Delegate the resolution to the import resolver resolved = resourceImport.getModelResolver().resolveModel(Artifact.class, (Artifact)unresolved); if (!resolved.isUnresolved()) { 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); } -- cgit v1.2.3