You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2007/04/19 10:06:41 UTC
svn commit: r530313 -
/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java
Author: slaws
Date: Thu Apr 19 01:06:37 2007
New Revision: 530313
URL: http://svn.apache.org/viewvc?view=rev&rev=530313
Log:
In the resolve phase, resolve SCDL extensions before component implementations/services/references. This is because the latter can depend on the former, for example, when you include and SDO factory into the SCDL this needs to be registered into the SDO HelperContext before any bindings are resolved that use the SDO types.
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java?view=diff&rev=530313&r1=530312&r2=530313
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java Thu Apr 19 01:06:37 2007
@@ -460,6 +460,13 @@
include = resolver.resolve(Composite.class, include);
composite.getIncludes().set(i, include);
}
+
+ // resolve and extensions to the standard SCDL that appear in the
+ // SCDL.
+ for (int i = 0, n = composite.getExtensions().size(); i < n; i++) {
+ Object model = composite.getExtensions().get(i);
+ extensionProcessor.resolve(model, resolver);
+ }
// Resolve component implementations, services and references
for (Component component: composite.getComponents()) {
@@ -478,12 +485,6 @@
// Resolve composite services and references
resolveContracts(composite.getServices(), resolver);
resolveContracts(composite.getReferences(), resolver);
-
- for (int i = 0, n = composite.getExtensions().size(); i < n; i++) {
- Object model = composite.getExtensions().get(i);
- extensionProcessor.resolve(model, resolver);
- }
-
}
public void wire(Composite composite) throws ContributionWireException {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org