Author: jsdelfino
Date: Sat Mar 1 08:22:05 2008
New Revision: 632615
URL: http://svn.apache.org/viewvc?rev=632615&view=rev
Log:
Resolve deployable composites in the contribution processor resolve method.
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=632615&r1=632614&r2=632615&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
Sat Mar 1 08:22:05 2008
@@ -20,6 +20,8 @@
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import java.util.List;
+
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -160,5 +162,15 @@
public void resolve(Contribution model, ModelResolver resolver) throws
ContributionResolveException {
model.setUnresolved(false);
+
+ // Resolve deployable composites
+ List<Composite> deployables = model.getDeployables();
+ for (int i = 0, n = deployables.size(); i < n; i++) {
+ Composite deployable = deployables.get(i);
+ Composite resolved =
(Composite)resolver.resolveModel(Composite.class, deployable);
+ if (resolved != deployable) {
+ deployables.set(i, resolved);
+ }
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
