diff options
| author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-26 11:54:36 +0000 |
|---|---|---|
| committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-26 11:54:36 +0000 |
| commit | 2871272f6f5fd509f0ca255bd7ca8174ebf6a12a (patch) | |
| tree | 78d2b0d5d41a872931b0957e1be1d1195b3dd190 /branches/sca-java-1.x/modules/contribution-resource | |
| parent | 329737edca64db31b2da73cf383d54d0c73701ec (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@778666 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/contribution-resource')
| -rw-r--r-- | branches/sca-java-1.x/modules/contribution-resource/src/main/java/org/apache/tuscany/sca/contribution/resource/impl/ArtifactModelResolver.java | 3 |
1 files changed, 2 insertions, 1 deletions
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()) { |