Author: svkrish
Date: Tue Aug 21 14:04:49 2007
New Revision: 568282
URL: http://svn.apache.org/viewvc?rev=568282&view=rev
Log:
reorganized the code a bit
Added:
incubator/tuscany/java/sca/modules/policy-xml/src/main/resources/
Modified:
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java
incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
Modified:
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java?rev=568282&r1=568281&r2=568282&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
Tue Aug 21 14:04:49 2007
@@ -285,14 +285,21 @@
// policySet.setUnresolved(isUnresolved);
// }
- private void resolvePolicies(PolicySet policySet) {
- policySet.setUnresolved(false);
+ private void resolvePolicies(PolicySet policySet, ModelResolver resolver)
throws ContributionResolveException {
+ boolean unresolved = false;
+ for ( Object o : policySet.getPolicies() ) {
+ extensionProcessor.resolve(o, resolver);
+ if ( o instanceof Policy && ((Policy)o).isUnresolved() ) {
+ unresolved = true;
+ }
+ }
+ policySet.setUnresolved(unresolved);
}
public void resolve(PolicySet policySet, ModelResolver resolver) throws
ContributionResolveException {
if ( policySet.isUnresolved() ) {
//resolve the policy attachments
- resolvePolicies(policySet);
+ resolvePolicies(policySet, resolver);
if ( !policySet.isUnresolved() ) {
resolver.addModel(policySet);
Modified:
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java?rev=568282&r1=568281&r2=568282&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java
Tue Aug 21 14:04:49 2007
@@ -30,11 +30,15 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import
org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
+import org.apache.tuscany.sca.policy.PolicyFactory;
import org.apache.tuscany.sca.policy.SCADefinitions;
+import
org.apache.tuscany.sca.policy.impl.DefaultIntentAttachPointTypeFactoryImpl;
/**
* A SCA Definitions Document processor.
@@ -43,6 +47,7 @@
public class SCADefinitionsDocumentProcessor implements
URLArtifactProcessor<SCADefinitions> {
protected StAXArtifactProcessor<Object> extensionProcessor;
protected SCADefinitionsBuilder defnBuilder = null;
+ protected ModelResolver domainModelResolver;
private static final DocumentBuilderFactory domFactory =
DocumentBuilderFactory.newInstance();
static {
@@ -55,12 +60,36 @@
* @param assemblyFactory
* @param policyFactory
* @param staxProcessor
- */
+
public SCADefinitionsDocumentProcessor(StAXArtifactProcessor
staxProcessor, XMLInputFactory inputFactory) {
this.extensionProcessor = staxProcessor;
this.inputFactory = inputFactory;
defnBuilder = new SCADefinitionsBuilderImpl();
+ this.domainModelResolver = new SCADefinitionsResolver();
+ } */
+
+ public SCADefinitionsDocumentProcessor(StAXArtifactProcessorExtensionPoint
staxProcessors,
+ StAXArtifactProcessor staxProcessor,
+ XMLInputFactory inputFactory,
+ PolicyFactory policyFactory) {
+ this.extensionProcessor = (StAXArtifactProcessor<Object>)staxProcessor;
+ this.inputFactory = inputFactory;
+ defnBuilder = new SCADefinitionsBuilderImpl();
+ this.domainModelResolver = new SCADefinitionsResolver();
+
+ IntentAttachPointTypeFactory intentAttachPointFactory = new
DefaultIntentAttachPointTypeFactoryImpl();
+
+ SCADefinitionsProcessor scaDefnProcessor = new
SCADefinitionsProcessor(policyFactory, extensionProcessor, domainModelResolver);
+
+ staxProcessors.addArtifactProcessor(scaDefnProcessor);
+ staxProcessors.addArtifactProcessor(new
SimpleIntentProcessor(policyFactory, extensionProcessor));
+ staxProcessors.addArtifactProcessor(new
ProfileIntentProcessor(policyFactory, extensionProcessor));
+ staxProcessors.addArtifactProcessor(new
QualifiedIntentProcessor(policyFactory, extensionProcessor));
+ staxProcessors.addArtifactProcessor(new
PolicySetProcessor(policyFactory, extensionProcessor));
+ staxProcessors.addArtifactProcessor(new
ImplementationTypeProcessor(policyFactory, intentAttachPointFactory,
extensionProcessor));
+ staxProcessors.addArtifactProcessor(new
BindingTypeProcessor(policyFactory, intentAttachPointFactory,
extensionProcessor));
}
+
public SCADefinitions read(URL contributionURL, URI uri, URL url) throws
ContributionReadException {
InputStream urlStream = null;
@@ -90,6 +119,9 @@
public void resolve(SCADefinitions scaDefinitions, ModelResolver resolver)
throws ContributionResolveException {
try {
+ if ( resolver == null ) {
+ resolver = this.domainModelResolver;
+ }
defnBuilder.build(scaDefinitions);
extensionProcessor.resolve(scaDefinitions, resolver);
} catch (SCADefinitionsBuilderException e) {
@@ -103,5 +135,13 @@
public Class<SCADefinitions> getModelType() {
return SCADefinitions.class;
+ }
+
+ public ModelResolver getDomainModelResolver() {
+ return domainModelResolver;
+ }
+
+ public void setDomainModelResolver(ModelResolver scaDefnsModelResolver) {
+ this.domainModelResolver = scaDefnsModelResolver;
}
}
Modified:
incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java?rev=568282&r1=568281&r2=568282&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
Tue Aug 21 14:04:49 2007
@@ -63,6 +63,13 @@
public QName getSchemaName() {
return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy";,
"PolicyAttachment");
}
+
+ public boolean isUnresolved() {
+ return false;
+ }
+
+ public void setUnresolved(boolean unresolved) {
+ }
}
}
Modified:
incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java?rev=568282&r1=568281&r2=568282&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
(original)
+++
incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
Tue Aug 21 14:04:49 2007
@@ -33,7 +33,6 @@
import org.apache.tuscany.sca.contribution.DefaultModelFactoryExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.DefaultStAXArtifactProcessorExtensionPoint;
import
org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.IntentAttachPointType;
@@ -52,9 +51,8 @@
*/
public class ReadDocumentTestCase extends TestCase {
- private ModelResolver resolver;
+ //private ModelResolver resolver;
private SCADefinitionsDocumentProcessor scaDefnDocProcessor = null;
- private SCADefinitionsProcessor scaDefnProcessor = null;
private SCADefinitions scaDefinitions;
Map<QName, Intent> intentTable = new Hashtable<QName, Intent>();
Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();
@@ -80,14 +78,18 @@
XMLInputFactory inputFactory = XMLInputFactory.newInstance();
PolicyFactory policyFactory = new DefaultPolicyFactory();
IntentAttachPointTypeFactory intentAttachPointFactory = new
DefaultIntentAttachPointTypeFactoryImpl();
- this.resolver = new SCADefinitionsResolver();
// Create Stax processors
DefaultStAXArtifactProcessorExtensionPoint staxProcessors = new
DefaultStAXArtifactProcessorExtensionPoint(new
DefaultModelFactoryExtensionPoint());
ExtensibleStAXArtifactProcessor staxProcessor = new
ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(),
XMLOutputFactory.newInstance());
+ staxProcessors.addArtifactProcessor(new MockPolicyProcessor());
+
+ scaDefnDocProcessor = new
SCADefinitionsDocumentProcessor(staxProcessors,
+
staxProcessor,
+
inputFactory,
+
policyFactory);
- scaDefnDocProcessor = new
SCADefinitionsDocumentProcessor(staxProcessor, inputFactory);
- scaDefnProcessor = new SCADefinitionsProcessor(policyFactory,
staxProcessor, resolver);
+ /*scaDefnProcessor = new SCADefinitionsProcessor(policyFactory,
staxProcessor, resolver);
staxProcessors.addArtifactProcessor(scaDefnProcessor);
staxProcessors.addArtifactProcessor(new
SimpleIntentProcessor(policyFactory, staxProcessor));
@@ -97,6 +99,7 @@
staxProcessors.addArtifactProcessor(new
ImplementationTypeProcessor(policyFactory, intentAttachPointFactory,
staxProcessor));
staxProcessors.addArtifactProcessor(new
BindingTypeProcessor(policyFactory, intentAttachPointFactory, staxProcessor));
staxProcessors.addArtifactProcessor(new MockPolicyProcessor());
+ */
URL url = getClass().getResource("definitions.xml");
URI uri = URI.create("definitions.xml");
@@ -121,9 +124,7 @@
@Override
public void tearDown() throws Exception {
- resolver = null;
scaDefnDocProcessor = null;
- scaDefnProcessor = null;
}
public void testReadSCADefinitions() throws Exception {
@@ -179,7 +180,7 @@
assertNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription());
assertNull(javaImplType.getMayProvideIntents().get(0).getDescription());
- scaDefnDocProcessor.resolve(scaDefinitions, resolver);
+ scaDefnDocProcessor.resolve(scaDefinitions, null);
//builder.build(scaDefinitions);
//testing if policy intents have been linked have property been linked
up
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
