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 2009/10/10 01:40:04 UTC
svn commit: r823744 - in /tuscany/java/sca/modules/node-impl/src:
main/java/org/apache/tuscany/sca/node/configuration/xml/
main/java/org/apache/tuscany/sca/node/impl/
test/resources/org/apache/tuscany/sca/node/configuration/
Author: rfeng
Date: Fri Oct 9 23:40:04 2009
New Revision: 823744
URL: http://svn.apache.org/viewvc?rev=823744&view=rev
Log:
Add capability to read domainRegistry and other options
Modified:
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
tuscany/java/sca/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
Modified: tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java?rev=823744&r1=823743&r2=823744&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java (original)
+++ tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessor.java Fri Oct 9 23:40:04 2009
@@ -103,6 +103,7 @@
node = nodeConfigurationFactory.createNodeConfiguration();
node.setURI(reader.getAttributeValue(null, "uri"));
node.setDomainURI(reader.getAttributeValue(null, "domain"));
+ node.setDomainRegistryURI(reader.getAttributeValue(null, "domainRegistry"));
} else if (CONTRIBUTION.equals(name)) {
contribution = nodeConfigurationFactory.createContributionConfiguration();
contribution.setURI(reader.getAttributeValue(null, "uri"));
@@ -146,6 +147,8 @@
XMLStreamWriter writer = helper.createXMLStreamWriter(sw);
helper.save(reader, writer);
composite.setContent(sw.toString());
+ } else {
+ node.getExtensions().add(processor.read(reader));
}
break;
@@ -181,6 +184,7 @@
NODE.getNamespaceURI(),
NODE.getLocalPart(),
new XAttr("uri", node.getURI()),
+ new XAttr("domainRegistry", node.getDomainRegistryURI()),
new XAttr("domain", node.getDomainURI()));
for (ContributionConfiguration c : node.getContributions()) {
@@ -223,6 +227,10 @@
new XAttr("baseURIs", uris.toString()));
writeEnd(writer);
}
+
+ for(Object o: node.getExtensions()) {
+ processor.write(o, writer);
+ }
writeEnd(writer);
}
Modified: tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java?rev=823744&r1=823743&r2=823744&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java (original)
+++ tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeFactoryImpl.java Fri Oct 9 23:40:04 2009
@@ -492,6 +492,7 @@
// aggregate definitions
for (Artifact artifact : contribution.getArtifacts()) {
Object model = artifact.getModel();
+ // FIXME: Should we check the artifact URI is META-INF/definitions.xml?
if (model instanceof Definitions) {
monitor.pushContext("Definitions: " + artifact.getLocation());
DefinitionsUtil.aggregate((Definitions)model, systemDefinitions, monitor);
@@ -562,7 +563,7 @@
return domainComposite;
}
- private List<Contribution> loadContributions(NodeConfiguration configuration, Monitor monitor) throws Throwable {
+ protected List<Contribution> loadContributions(NodeConfiguration configuration, Monitor monitor) throws Throwable {
List<Contribution> contributions = new ArrayList<Contribution>();
// Load the specified contributions
Modified: tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=823744&r1=823743&r2=823744&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (original)
+++ tuscany/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java Fri Oct 9 23:40:04 2009
@@ -124,7 +124,12 @@
try {
Monitor monitor = manager.monitorFactory.createMonitor();
monitor.reset();
+
+ if (contributions == null) {
+ contributions = manager.loadContributions(configuration, monitor);
+ }
domainComposite = manager.configureNode(configuration, contributions, monitor);
+
this.compositeContext = new CompositeContextImpl(manager.extensionPoints, endpointRegistry, domainComposite);
// Activate the composite
Modified: tuscany/java/sca/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml?rev=823744&r1=823743&r2=823744&view=diff
==============================================================================
--- tuscany/java/sca/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml (original)
+++ tuscany/java/sca/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml Fri Oct 9 23:40:04 2009
@@ -21,6 +21,7 @@
xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
uri="http://sample/nodes/TestNode1"
+ domainRegistry = "vm://localhost"
domain="http://domain1">
<!-- Configure the base URIs for a given binding -->
@@ -52,4 +53,6 @@
<deploymentComposite location="test/Test.composite">
</deploymentComposite>
</contribution>
+ <option name="debug" value="true"/>
+ <option name="validation">true</option>
</node>
\ No newline at end of file