Return-Path: X-Original-To: apmail-tuscany-commits-archive@www.apache.org Delivered-To: apmail-tuscany-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6A3D262E0 for ; Fri, 3 Jun 2011 14:16:34 +0000 (UTC) Received: (qmail 44039 invoked by uid 500); 3 Jun 2011 14:16:34 -0000 Delivered-To: apmail-tuscany-commits-archive@tuscany.apache.org Received: (qmail 44014 invoked by uid 500); 3 Jun 2011 14:16:34 -0000 Mailing-List: contact commits-help@tuscany.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tuscany.apache.org Delivered-To: mailing list commits@tuscany.apache.org Received: (qmail 44007 invoked by uid 99); 3 Jun 2011 14:16:34 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jun 2011 14:16:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jun 2011 14:16:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8AE8C23888DD; Fri, 3 Jun 2011 14:16:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1131053 - in /tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment: Deployer.java impl/DeployerImpl.java Date: Fri, 03 Jun 2011 14:16:09 -0000 To: commits@tuscany.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110603141609.8AE8C23888DD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Fri Jun 3 14:16:09 2011 New Revision: 1131053 URL: http://svn.apache.org/viewvc?rev=1131053&view=rev Log: Add a method to Deployer to get a contributions dependencies from a set of contribution metadata Modified: tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java Modified: tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java?rev=1131053&r1=1131052&r2=1131053&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java (original) +++ tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/Deployer.java Fri Jun 3 14:16:09 2011 @@ -36,6 +36,7 @@ import org.apache.tuscany.sca.assembly.b import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException; import org.apache.tuscany.sca.contribution.Artifact; import org.apache.tuscany.sca.contribution.Contribution; +import org.apache.tuscany.sca.contribution.ContributionMetadata; import org.apache.tuscany.sca.contribution.processor.ContributionReadException; import org.apache.tuscany.sca.contribution.processor.ContributionResolveException; import org.apache.tuscany.sca.contribution.processor.ContributionWriteException; @@ -220,4 +221,13 @@ public interface Deployer extends LifeCy void resolve(Contribution c, List dependentContributions, Monitor monitor) throws ContributionResolveException, CompositeBuilderException; public Contribution cloneSystemContribution(Monitor monitor); + + /** + * Get a contributions dependencies from meta data without having to load a Contribution + * @param possibles a Map with key contributionURI and value the contribution metaData + * @param targetURI the contributionURI to find the dependencies of + * @param monitor + * @return the list of contribution URIs + */ + public List getDependencies(Map possibles, String targetURI, Monitor monitor); } Modified: tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java?rev=1131053&r1=1131052&r2=1131053&view=diff ============================================================================== --- tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java (original) +++ tuscany/sca-java-2.x/trunk/modules/deployment/src/main/java/org/apache/tuscany/sca/deployment/impl/DeployerImpl.java Fri Jun 3 14:16:09 2011 @@ -26,6 +26,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -57,6 +58,7 @@ import org.apache.tuscany.sca.common.xml import org.apache.tuscany.sca.contribution.Artifact; import org.apache.tuscany.sca.contribution.Contribution; import org.apache.tuscany.sca.contribution.ContributionFactory; +import org.apache.tuscany.sca.contribution.ContributionMetadata; import org.apache.tuscany.sca.contribution.DefaultImport; import org.apache.tuscany.sca.contribution.Export; import org.apache.tuscany.sca.contribution.Import; @@ -89,9 +91,9 @@ import org.apache.tuscany.sca.monitor.Mo import org.apache.tuscany.sca.monitor.MonitorFactory; import org.apache.tuscany.sca.monitor.ValidationException; import org.apache.tuscany.sca.runtime.BaseDomainRegistry; +import org.apache.tuscany.sca.runtime.ContributionDescription; import org.apache.tuscany.sca.runtime.DomainRegistry; import org.apache.tuscany.sca.runtime.EndpointReferenceBinder; -import org.apache.tuscany.sca.runtime.ContributionDescription; import org.apache.tuscany.sca.xsd.XSDFactory; import org.apache.tuscany.sca.xsd.XSDefinition; @@ -227,7 +229,7 @@ public class DeployerImpl implements Dep // push context here as the "stack" in this case is a list of nexted contributions // through which imports have been chased which may not make much sense to the // user so just report the contribution in error - monitor.pushContext("Contribution: " + contribution.getLocation()); + monitor.pushContext("Contribution: " + contribution.getURI()); Monitor.error(monitor, this, DEPLOYER_IMPL_VALIDATION_MESSAGES, "UnresolvedImport", import_); monitor.popContext(); } @@ -249,6 +251,27 @@ public class DeployerImpl implements Dep contribution.getDependencies().addAll(dependencies); } + + public List getDependencies(Map possibles, String targetURI, Monitor monitor) { + Map contributions = new HashMap(); + for (String curi : possibles.keySet()) { + Contribution c = contributionFactory.createContribution(); + c.setURI(curi); + c.mergeMetaData(possibles.get(curi)); + contributions.put(curi, c); + } + + Contribution tc = contributions.remove(targetURI); + buildDependencies(tc, new ArrayList(contributions.values()), monitor); + + List dcuris = new ArrayList(); + for (Contribution dc : tc.getDependencies()) { + dcuris.add(dc.getURI()); + } + dcuris.remove(targetURI); + return dcuris; + } + /** * Pre-resolve phase for contributions, to set up handling of imports and exports prior to full resolution