diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-02 10:01:25 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-02 10:01:25 +0000 |
commit | b88e412e331eeaa9658c21f37c31d4d08a149b12 (patch) | |
tree | 9358970ab6c1424c4d6bd3d3a6222c335c6c9bd4 /java/sca/modules/assembly-xml/src/main | |
parent | 8751ca0a45b9343f37161c9f762fb4c485944a5f (diff) |
TUSCANY-2801 - Create a SystemContribution to hold data from definitions.xml found in extensions and in application contributions. This change creates a system contribution on the fly in the node and installs a DefaultModelResolver for various policy elements. The default resolver not takes account of any default imports that are available. All application level contributions are linked to the system contribution via a default import that references the system contributions model resolver. Hence policy element resolution will traverse the tree to the system contribution if the element is not resolved locally. We may want to create specific policy resolvers here but this change allows for some experimentation. The next hurdle to getting this to work is to get policy set XPath applied to the assembly model again.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@739953 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/assembly-xml/src/main')
-rw-r--r-- | java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java index 476a5fe08c..f0ecd22761 100644 --- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java +++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java @@ -90,9 +90,11 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements public Composite read(URI uri, InputStream scdlStream) throws ContributionReadException { try { +/* if (scaDefnSink != null ) { fillDomainPolicySets(scaDefnSink); } +*/ Composite composite = null; @@ -172,6 +174,10 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements return Composite.class; } + /* + * TODO - remove - definitions information is now aggregated in the + * systems definitions contribution and we need to add + * applicable policy sets once all composites have been read private void fillDomainPolicySets(List scaDefnsSink) { Map<QName, PolicySet> domainPolicySetMap = null; if ( scaDefnsSink.size() > scaDefnsCount ) { @@ -196,4 +202,5 @@ public class CompositeDocumentProcessor extends BaseAssemblyProcessor implements scaDefnsCount = scaDefnsSink.size(); } } + */ } |