You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/04/27 21:13:56 UTC

svn commit: r652002 - /incubator/tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java

Author: jsdelfino
Date: Sun Apr 27 12:13:52 2008
New Revision: 652002

URL: http://svn.apache.org/viewvc?rev=652002&view=rev
Log:
Added missing call to resolve imports and exports.

Modified:
    incubator/tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java

Modified: incubator/tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java?rev=652002&r1=652001&r2=652002&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/xml/ContributionMetadataProcessor.java Sun Apr 27 12:13:52 2008
@@ -160,11 +160,19 @@
         writeEndDocument(writer);
     }
 
-    public void resolve(Contribution model, ModelResolver resolver) throws ContributionResolveException {
-        model.setUnresolved(false);
+    public void resolve(Contribution contribution, ModelResolver resolver) throws ContributionResolveException {
+        contribution.setUnresolved(false);
+
+        // Resolve the imports and exports
+        for (Import import_: contribution.getImports()) {
+            extensionProcessor.resolve(import_, resolver);
+        }
+        for (Export export: contribution.getExports()) {
+            extensionProcessor.resolve(export, resolver);
+        }
         
         // Resolve deployable composites
-        List<Composite> deployables = model.getDeployables();
+        List<Composite> deployables = contribution.getDeployables();
         for (int i = 0, n = deployables.size(); i < n; i++) {
             Composite deployable = deployables.get(i);
             Composite resolved = (Composite)resolver.resolveModel(Composite.class, deployable);