archive/apache-tuscany
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Read composite content after contributions have been loaded (TUSCANY-3569)

Browse source 
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@952186 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nash 2010-06-07 11:28:41 +00:00
parent be76589532
commit f8303b2ad6
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
sca-java-1.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
View file

@ -140,7 +140,7 @@ public class NodeImpl implements SCANode, SCAClient {
configuration.getComposite().setURI(compositeURL.toString());
// Configure the node
configureNode(configuration);
configureNode(configuration, null);
} catch (ServiceRuntimeException e) {
throw e;
@ -162,7 +162,7 @@ public class NodeImpl implements SCANode, SCAClient {
initRuntime();
ConfiguredNodeImplementation config = findNodeConfiguration(null, null);
configureNode(config);
configureNode(config, null);
} catch (ServiceRuntimeException e) {
throw e;
} catch (Throwable e) {
@ -197,7 +197,7 @@ public class NodeImpl implements SCANode, SCAClient {
initRuntime();
ConfiguredNodeImplementation config = findNodeConfiguration(compositeURI, classLoader);
configureNode(config);
configureNode(config, null);
} catch (ServiceRuntimeException e) {
throw e;
} catch (Throwable e) {
@ -378,7 +378,7 @@ public class NodeImpl implements SCANode, SCAClient {
}
// Configure the node
configureNode(configuration);
configureNode(configuration, null);
} catch (ServiceRuntimeException e) {
throw e;
@ -420,20 +420,7 @@ public class NodeImpl implements SCANode, SCAClient {
modelFactories.getFactory(NodeImplementationFactory.class);
configuration = nodeImplementationFactory.createConfiguredNodeImplementation();
// Read the composite model
StAXArtifactProcessor<Composite> compositeProcessor = artifactProcessors.getProcessor(Composite.class);
// URL compositeURL = new URL(compositeURI);
logger.log(Level.INFO, "Loading composite: " + compositeURI);
CompositeDocumentProcessor compositeDocProcessor =
(CompositeDocumentProcessor)documentProcessors.getProcessor(Composite.class);
composite =
compositeDocProcessor.read(URI.create(compositeURI), new ByteArrayInputStream(compositeContent
.getBytes("UTF-8")));
analyzeProblems();
configuration.setComposite(composite);
// Defer reading the composite content until the contributions have been loaded (TUSCANY-3569)
// Create contribution models
ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
@ -444,7 +431,7 @@ public class NodeImpl implements SCANode, SCAClient {
}
// Configure the node
configureNode(configuration);
configureNode(configuration, compositeContent);
} catch (ServiceRuntimeException e) {
throw e;
@ -503,7 +490,7 @@ public class NodeImpl implements SCANode, SCAClient {
return URI.create(uri);
}
private void configureNode(ConfiguredNodeImplementation configuration) throws Exception {
private void configureNode(ConfiguredNodeImplementation configuration, String compositeContent) throws Exception {
// Find if any contribution JARs already available locally on the classpath
Map<String, URL> localContributions = localContributions();
@ -539,7 +526,20 @@ public class NodeImpl implements SCANode, SCAClient {
}
composite = configuration.getComposite();
// Read the composite content after the contributions have been loaded, so that the
// policySet definitions provided by the contributions are available (TUSCANY-3569)
if (composite == null && compositeContent != null) {
logger.log(Level.INFO, "Loading composite: " + configurationName);
CompositeDocumentProcessor compositeDocProcessor =
(CompositeDocumentProcessor)documentProcessors.getProcessor(Composite.class);
composite =
compositeDocProcessor.read(URI.create(configurationName), new ByteArrayInputStream(compositeContent
.getBytes("UTF-8")));
analyzeProblems();
configuration.setComposite(composite);
}
if(composite != null && composite.isUnresolved()) {
ContributionFactory contributionFactory = modelFactories.getFactory(ContributionFactory.class);
Artifact compositeFile = contributionFactory.createArtifact();