diff options
| author | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-12 11:36:18 +0000 |
|---|---|---|
| committer | ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68> | 2009-11-12 11:36:18 +0000 |
| commit | f7a156987fd2765d48d8ce33fc1d263870ef11f7 (patch) | |
| tree | b1f65ec6788c4f3e03cfd21d0f44678b12c8ef64 /java | |
| parent | 03f43eab81d571be0c8f5b8d7bc9a4ba34debe65 (diff) | |
Fixes for resolving import.java using location attribute
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835344 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/sca/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/sca/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java b/java/sca/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java index cf4317734e..b012fd795d 100644 --- a/java/sca/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java +++ b/java/sca/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java @@ -51,6 +51,7 @@ import org.apache.tuscany.sca.contribution.DefaultImport; import org.apache.tuscany.sca.contribution.Export; import org.apache.tuscany.sca.contribution.Import; import org.apache.tuscany.sca.contribution.namespace.NamespaceImport; +import org.apache.tuscany.sca.contribution.java.JavaImport; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; @@ -164,6 +165,12 @@ public class DeployerImpl implements Deployer { if (namespaceImport.getLocation() != null) if (!namespaceImport.getLocation().equals(dependency.getURI())) continue; + } + if (import_ instanceof JavaImport) { + JavaImport javaImport = (JavaImport)import_; + if (javaImport.getLocation() != null) + if (!javaImport.getLocation().equals(dependency.getURI())) + continue; } for (Export export : dependency.getExports()) { |