You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/04/15 22:04:58 UTC
svn commit: r529061 - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java
databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOProcessor.java
Author: rfeng
Date: Sun Apr 15 13:04:57 2007
New Revision: 529061
URL: http://svn.apache.org/viewvc?view=rev&rev=529061
Log:
Add support to resolve extensibility elements in composite
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java
incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOProcessor.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=529061&r1=529060&r2=529061
==============================================================================
--- 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 Sun Apr 15 13:04:57 2007
@@ -269,6 +269,10 @@
// <component><implementation>
component.setImplementation((Implementation)extension);
+ } else {
+
+ // FIXME: We need to decide where to host the extensions
+ composite.getExtensions().add(extension);
}
}
}
@@ -474,6 +478,12 @@
// 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 {
Modified: incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOProcessor.java?view=diff&rev=529061&r1=529060&r2=529061
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/ImportSDOProcessor.java Sun Apr 15 13:04:57 2007
@@ -66,7 +66,7 @@
assert IMPORT_SDO.equals(reader.getName());
HelperContext helperContext = null;
-
+
// FIXME: [rfeng] How to get the enclosing composite?
int id = System.identityHashCode(reader);
// FIXME: [rfeng] How to associate the TypeHelper with deployment
@@ -85,7 +85,7 @@
importSDO.setFactoryClassName(factoryName);
}
String location = reader.getAttributeValue(null, "location");
- if (location == null) {
+ if (location != null) {
importSDO.setSchemaLocation(location);
}
@@ -112,6 +112,7 @@
} catch (Exception e) {
throw new ContributionResolveException(e);
}
+ importSDO.setUnresolved(false);
}
}
@@ -164,6 +165,7 @@
} catch (IOException e) {
throw new ContributionResolveException(e);
}
+ importSDO.setUnresolved(false);
}
}
@@ -183,6 +185,9 @@
public void resolve(ImportSDO importSDO, ArtifactResolver resolver) throws ContributionResolveException {
importFactory(importSDO);
importWSDL(importSDO);
+ if (!importSDO.isUnresolved()) {
+ resolver.add(importSDO);
+ }
}
public void wire(ImportSDO model) throws ContributionWireException {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org