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/16 07:42:38 UTC
svn commit: r825773 [3/15] - in /tuscany/java/sca:
itest/builder/src/test/java/org/apache/tuscany/sca/itest/builder/
modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/
modules/assembly-xml/src/main/java/org/apache/tuscany/sca/defin...
Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ExtensionTypeProcessor.java Fri Oct 16 05:42:26 2009
@@ -32,6 +32,7 @@
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -52,16 +53,14 @@
StAXArtifactProcessor<ExtensionType>, PolicyConstants {
private PolicyFactory policyFactory;
- private Monitor monitor;
+
- protected abstract ExtensionType resolveExtensionType(ExtensionType extnType, ModelResolver resolver)
+ protected abstract ExtensionType resolveExtensionType(ExtensionType extnType, ModelResolver resolver, ProcessorContext context)
throws ContributionResolveException;
public ExtensionTypeProcessor(PolicyFactory policyFactory,
- StAXArtifactProcessor<Object> extensionProcessor,
- Monitor monitor) {
+ StAXArtifactProcessor<Object> extensionProcessor) {
this.policyFactory = policyFactory;
- this.monitor = monitor;
}
/**
@@ -71,7 +70,7 @@
* @param message
* @param model
*/
- private void error(String message, Object model, Object... messageParameters) {
+ private void error(Monitor monitor, String message, Object model, Object... messageParameters) {
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
@@ -84,7 +83,7 @@
}
}
- public ExtensionType read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+ public ExtensionType read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
QName extType = getArtifactType();
QName type = getQName(reader, "type");
@@ -95,7 +94,7 @@
} else if (IMPLEMENTATION_TYPE_QNAME.equals(extType)) {
extensionType = policyFactory.createImplementationType();
} else {
- error("UnrecognizedExtensionType", reader, type);
+ error(context.getMonitor(), "UnrecognizedExtensionType", reader, type);
return null;
//throw new ContributionReadException("Unrecognized ExtensionType - " + type);
}
@@ -107,7 +106,7 @@
return extensionType;
} else {
- error("RequiredAttributeMissing", reader, extType);
+ error(context.getMonitor(), "RequiredAttributeMissing", reader, extType);
//throw new ContributionReadException("Required attribute '" + TYPE +
//"' missing from BindingType Definition");
}
@@ -140,7 +139,7 @@
}
}
- public void write(ExtensionType extnType, XMLStreamWriter writer) throws ContributionWriteException,
+ public void write(ExtensionType extnType, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException,
XMLStreamException {
// Write an <sca:bindingType or sca:implementationType>
@@ -185,28 +184,28 @@
}
}
- public void resolve(ExtensionType extnType, ModelResolver resolver) throws ContributionResolveException {
+ public void resolve(ExtensionType extnType, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
if (extnType != null && extnType.isUnresolved()) {
- resolveAlwaysProvidedIntents(extnType, resolver);
- resolveMayProvideIntents(extnType, resolver);
+ resolveAlwaysProvidedIntents(extnType, resolver, context);
+ resolveMayProvideIntents(extnType, resolver, context);
extnType.setUnresolved(false);
//resolveExtensionType(extnType, resolver);
}
}
- private void resolveAlwaysProvidedIntents(ExtensionType extensionType, ModelResolver resolver)
+ private void resolveAlwaysProvidedIntents(ExtensionType extensionType, ModelResolver resolver, ProcessorContext context)
throws ContributionResolveException {
if (extensionType != null) {
// resolve all provided intents
List<Intent> alwaysProvided = new ArrayList<Intent>();
for (Intent providedIntent : extensionType.getAlwaysProvidedIntents()) {
if (providedIntent.isUnresolved()) {
- providedIntent = resolver.resolveModel(Intent.class, providedIntent);
+ providedIntent = resolver.resolveModel(Intent.class, providedIntent, context);
if (!providedIntent.isUnresolved()) {
alwaysProvided.add(providedIntent);
} else {
- error("AlwaysProvidedIntentNotFound", resolver, providedIntent, extensionType);
+ error(context.getMonitor(), "AlwaysProvidedIntentNotFound", resolver, providedIntent, extensionType);
//throw new ContributionResolveException("Always Provided Intent - " + providedIntent
//+ " not found for ExtensionType "
//+ extensionType);
@@ -220,18 +219,18 @@
}
}
- private void resolveMayProvideIntents(ExtensionType extensionType, ModelResolver resolver)
+ private void resolveMayProvideIntents(ExtensionType extensionType, ModelResolver resolver, ProcessorContext context)
throws ContributionResolveException {
if (extensionType != null) {
// resolve all provided intents
List<Intent> mayProvide = new ArrayList<Intent>();
for (Intent providedIntent : extensionType.getMayProvidedIntents()) {
if (providedIntent.isUnresolved()) {
- providedIntent = resolver.resolveModel(Intent.class, providedIntent);
+ providedIntent = resolver.resolveModel(Intent.class, providedIntent, context);
if (!providedIntent.isUnresolved()) {
mayProvide.add(providedIntent);
} else {
- error("MayProvideIntentNotFound", resolver, providedIntent, extensionType);
+ error(context.getMonitor(), "MayProvideIntentNotFound", resolver, providedIntent, extensionType);
//throw new ContributionResolveException("May Provide Intent - " + providedIntent
//+ " not found for ExtensionType "
//+ extensionType);
Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java Fri Oct 16 05:42:26 2009
@@ -22,10 +22,10 @@
import javax.xml.namespace.QName;
import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.policy.ExtensionType;
import org.apache.tuscany.sca.policy.ImplementationType;
import org.apache.tuscany.sca.policy.PolicyFactory;
@@ -38,15 +38,13 @@
public class ImplementationTypeProcessor extends ExtensionTypeProcessor {
public ImplementationTypeProcessor(PolicyFactory policyFactory,
- StAXArtifactProcessor<Object> extensionProcessor,
- Monitor monitor) {
- super(policyFactory, extensionProcessor, monitor);
+ StAXArtifactProcessor<Object> extensionProcessor) {
+ super(policyFactory, extensionProcessor);
}
public ImplementationTypeProcessor(FactoryExtensionPoint modelFactories,
- StAXArtifactProcessor<Object> extensionProcessor,
- Monitor monitor) {
- super(modelFactories.getFactory(PolicyFactory.class), extensionProcessor, monitor);
+ StAXArtifactProcessor<Object> extensionProcessor) {
+ super(modelFactories.getFactory(PolicyFactory.class), extensionProcessor);
}
public QName getArtifactType() {
@@ -54,11 +52,11 @@
}
@Override
- protected ExtensionType resolveExtensionType(ExtensionType extnType, ModelResolver resolver)
+ protected ExtensionType resolveExtensionType(ExtensionType extnType, ModelResolver resolver, ProcessorContext context)
throws ContributionResolveException {
if (extnType instanceof ImplementationType) {
ImplementationType implType = (ImplementationType)extnType;
- return resolver.resolveModel(ImplementationType.class, implType);
+ return resolver.resolveModel(ImplementationType.class, implType, context);
} else {
return extnType;
}
Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java Fri Oct 16 05:42:26 2009
@@ -37,6 +37,7 @@
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
@@ -57,16 +58,14 @@
PolicyConstants {
private PolicyFactory policyFactory;
- private Monitor monitor;
+
- public IntentProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
+ public IntentProcessor(FactoryExtensionPoint modelFactories) {
this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
- this.monitor = monitor;
}
- public IntentProcessor(PolicyFactory policyFactory, Monitor monitor) {
+ public IntentProcessor(PolicyFactory policyFactory) {
this.policyFactory = policyFactory;
- this.monitor = monitor;
}
/**
@@ -76,7 +75,7 @@
* @param message
* @param model
*/
- private void error(String message, Object model, Object... messageParameters) {
+ private void error(Monitor monitor, String message, Object model, Object... messageParameters) {
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
@@ -89,7 +88,7 @@
}
}
- private void warn(String message, Object model, Object... messageParameters) {
+ private void warn(Monitor monitor, String message, Object model, Object... messageParameters) {
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
@@ -102,11 +101,11 @@
}
}
- public Intent read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+ public Intent read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
Intent intent = null;
String intentLocalName = reader.getAttributeValue(null, NAME);
if (intentLocalName == null) {
- error("IntentNameMissing", reader);
+ error(context.getMonitor(), "IntentNameMissing", reader);
return null;
}
@@ -182,7 +181,7 @@
return intent;
}
- public void write(Intent intent, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+ public void write(Intent intent, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
// Write an <sca:intent>
writer.writeStartElement(PolicyConstants.SCA11_NS, INTENT);
writer.writeNamespace(intent.getName().getPrefix(), intent.getName().getNamespaceURI());
@@ -225,7 +224,7 @@
writer.writeEndElement();
}
- private void resolveContrainedTypes(Intent intent, ModelResolver resolver) throws ContributionResolveException {
+ private void resolveContrainedTypes(Intent intent, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
Collection<ExtensionType> resolvedTypes = new HashSet<ExtensionType>();
for (ExtensionType extensionType : intent.getConstrainedTypes()) {
if (ExtensionType.BINDING_BASE.equals(extensionType.getType()) || ExtensionType.IMPLEMENTATION_BASE
@@ -234,11 +233,11 @@
extensionType.setUnresolved(false);
resolvedTypes.add(extensionType);
} else {
- ExtensionType resolved = resolver.resolveModel(ExtensionType.class, extensionType);
+ ExtensionType resolved = resolver.resolveModel(ExtensionType.class, extensionType, context);
if (!resolved.isUnresolved() || resolved != extensionType) {
resolvedTypes.add(resolved);
} else {
- warn("ConstrainedTypeNotFound", intent, extensionType, intent);
+ warn(context.getMonitor(), "ConstrainedTypeNotFound", intent, extensionType, intent);
}
}
}
@@ -246,7 +245,8 @@
intent.getConstrainedTypes().addAll(resolvedTypes);
}
- private void resolveProfileIntent(Intent intent, ModelResolver resolver) throws ContributionResolveException {
+ private void resolveProfileIntent(Intent intent, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
+ Monitor monitor = context.getMonitor();
// FIXME: Need to check for cyclic references first i.e an A requiring B
// and then B requiring A...
if (intent != null && !intent.getRequiredIntents().isEmpty()) {
@@ -254,13 +254,13 @@
List<Intent> requiredIntents = new ArrayList<Intent>();
for (Intent required : intent.getRequiredIntents()) {
if (required.isUnresolved()) {
- Intent resolved = resolver.resolveModel(Intent.class, required);
+ Intent resolved = resolver.resolveModel(Intent.class, required, context);
// At this point, when the required intent is not resolved, it does not mean
// its undeclared, chances are that their dependency are not resolved yet.
// Lets try to resolve them first.
if (resolved.isUnresolved()) {
if (((resolved).getRequiredIntents()).contains(intent)) {
- error("CyclicReferenceFound", resolver, required, intent);
+ error(monitor, "CyclicReferenceFound", resolver, required, intent);
return;
}
}
@@ -268,7 +268,7 @@
if (!resolved.isUnresolved() || resolved != required) {
requiredIntents.add(resolved);
} else {
- error("RequiredIntentNotFound", resolver, required, intent);
+ error(monitor, "RequiredIntentNotFound", resolver, required, intent);
return;
//throw new ContributionResolveException("Required Intent - " + requiredIntent
//+ " not found for Intent " + policyIntent);
@@ -282,7 +282,7 @@
}
}
- private void resolveQualifiedIntent(Intent qualifed, ModelResolver resolver) throws ContributionResolveException {
+ private void resolveQualifiedIntent(Intent qualifed, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
if (qualifed != null) {
//resolve the qualifiable intent
Intent parent = qualifed.getQualifiableIntent();
@@ -290,7 +290,7 @@
return;
}
if (parent.isUnresolved()) {
- Intent resolved = resolver.resolveModel(Intent.class, parent);
+ Intent resolved = resolver.resolveModel(Intent.class, parent, context);
// At this point, when the qualifiable intent is not resolved, it does not mean
// its undeclared, chances are that their dependency are not resolved yet.
// Lets try to resolve them first.
@@ -298,7 +298,7 @@
if (!resolved.isUnresolved() || resolved != qualifed) {
qualifed.setQualifiableIntent(resolved);
} else {
- error("QualifiableIntentNotFound", resolver, parent, qualifed);
+ error(context.getMonitor(), "QualifiableIntentNotFound", resolver, parent, qualifed);
//throw new ContributionResolveException("Qualifiable Intent - " + qualifiableIntent
//+ " not found for Intent " + policyIntent);
}
@@ -306,11 +306,12 @@
}
}
- public void resolve(Intent intent, ModelResolver resolver) throws ContributionResolveException {
- resolveProfileIntent(intent, resolver);
- resolveExcludedIntents(intent, resolver);
- resolveQualifiedIntent(intent, resolver);
- resolveContrainedTypes(intent, resolver);
+ public void resolve(Intent intent, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
+ Monitor monitor = context.getMonitor();
+ resolveProfileIntent(intent, resolver, context);
+ resolveExcludedIntents(intent, resolver, context);
+ resolveQualifiedIntent(intent, resolver, context);
+ resolveContrainedTypes(intent, resolver, context);
intent.setUnresolved(false);
}
@@ -359,18 +360,18 @@
}
}
- private void resolveExcludedIntents(Intent policyIntent, ModelResolver resolver)
+ private void resolveExcludedIntents(Intent policyIntent, ModelResolver resolver, ProcessorContext context)
throws ContributionResolveException {
if (policyIntent != null) {
// resolve all excluded intents
List<Intent> excludedIntents = new ArrayList<Intent>();
for (Intent excludedIntent : policyIntent.getExcludedIntents()) {
if (excludedIntent.isUnresolved()) {
- Intent resolvedExcludedIntent = resolver.resolveModel(Intent.class, excludedIntent);
+ Intent resolvedExcludedIntent = resolver.resolveModel(Intent.class, excludedIntent, context);
if (!resolvedExcludedIntent.isUnresolved() || resolvedExcludedIntent != excludedIntent) {
excludedIntents.add(resolvedExcludedIntent);
} else {
- error("ExcludedIntentNotFound", resolver, excludedIntent, policyIntent);
+ error(context.getMonitor(), "ExcludedIntentNotFound", resolver, excludedIntent, policyIntent);
return;
//throw new ContributionResolveException("Excluded Intent " + excludedIntent
//+ " not found for intent " + policyIntent);
Modified: tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java Fri Oct 16 05:42:26 2009
@@ -40,6 +40,7 @@
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
@@ -66,28 +67,16 @@
private StAXArtifactProcessor<Object> extensionProcessor;
private XPathHelper xpathHelper;
// private XPathFactory xpathFactory;
- private Monitor monitor;
+
public PolicySetProcessor(ExtensionPointRegistry registry,
- StAXArtifactProcessor<Object> extensionProcessor,
- Monitor monitor) {
+ StAXArtifactProcessor<Object> extensionProcessor) {
FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
this.extensionProcessor = extensionProcessor;
- this.monitor = monitor;
this.xpathHelper = XPathHelper.getInstance(registry);
- // this.xpathFactory = modelFactories.getFactory(XPathFactory.class);
}
- /*
- public PolicySetProcessor(PolicyFactory policyFactory,
- StAXArtifactProcessor<Object> extensionProcessor,
- Monitor monitor) {
- this.policyFactory = policyFactory;
- this.extensionProcessor = extensionProcessor;
- this.monitor = monitor;
- }
- */
/**
* Report a exception.
@@ -96,7 +85,7 @@
* @param message
* @param model
*/
- private void error(String message, Object model, Exception ex) {
+ private void error(Monitor monitor, String message, Object model, Exception ex) {
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
@@ -116,7 +105,7 @@
* @param message
* @param model
*/
- private void error(String message, Object model, Object... messageParameters) {
+ private void error(Monitor monitor, String message, Object model, Object... messageParameters) {
if (monitor != null) {
Problem problem =
monitor.createProblem(this.getClass().getName(),
@@ -129,16 +118,16 @@
}
}
- public PolicySet read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+ public PolicySet read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
PolicySet policySet = null;
-
+ Monitor monitor = context.getMonitor();
String policySetName = reader.getAttributeValue(null, NAME);
String appliesTo = reader.getAttributeValue(null, APPLIES_TO);
if (policySetName == null || appliesTo == null) {
if (policySetName == null)
- error("PolicySetNameMissing", reader);
+ error(monitor, "PolicySetNameMissing", reader);
if (appliesTo == null)
- error("PolicySetAppliesToMissing", reader);
+ error(monitor, "PolicySetAppliesToMissing", reader);
return policySet;
}
@@ -158,13 +147,13 @@
if (appliesTo != null) {
try {
XPath path = xpathHelper.newXPath();
- NamespaceContext context = xpathHelper.getNamespaceContext(appliesTo, reader.getNamespaceContext());
+ NamespaceContext nsContext = xpathHelper.getNamespaceContext(appliesTo, reader.getNamespaceContext());
// path.setXPathFunctionResolver(new PolicyXPathFunctionResolver(context));
- XPathExpression expression = xpathHelper.compile(path, context, appliesTo);
+ XPathExpression expression = xpathHelper.compile(path, nsContext, appliesTo);
policySet.setAppliesToXPathExpression(expression);
} catch (XPathExpressionException e) {
ContributionReadException ce = new ContributionReadException(e);
- error("ContributionReadException", policySet, ce);
+ error(monitor, "ContributionReadException", policySet, ce);
//throw ce;
}
}
@@ -173,14 +162,14 @@
if (attachTo != null) {
try {
XPath path = xpathHelper.newXPath();
- NamespaceContext context = xpathHelper.getNamespaceContext(attachTo, reader.getNamespaceContext());
- path.setXPathFunctionResolver(new PolicyXPathFunctionResolver(context));
- XPathExpression expression = xpathHelper.compile(path, context, attachTo);
+ NamespaceContext nsContext = xpathHelper.getNamespaceContext(attachTo, reader.getNamespaceContext());
+ path.setXPathFunctionResolver(new PolicyXPathFunctionResolver(nsContext));
+ XPathExpression expression = xpathHelper.compile(path, nsContext, attachTo);
policySet.setAttachTo(attachTo);
policySet.setAttachToXPathExpression(expression);
} catch (XPathExpressionException e) {
ContributionReadException ce = new ContributionReadException(e);
- error("ContributionReadException", policySet, ce);
+ error(monitor, "ContributionReadException", policySet, ce);
//throw ce;
}
@@ -202,13 +191,13 @@
if (provides != null) {
mappedIntent.setName(getQName(reader, PROVIDES));
if (policySet.getProvidedIntents().contains(mappedIntent)) {
- readIntentMap(reader, policySet, mappedIntent);
+ readIntentMap(reader, policySet, mappedIntent, context);
} else {
- error("IntentNotSpecified", policySet, policySetName);
+ error(monitor, "IntentNotSpecified", policySet, policySetName);
//throw new ContributionReadException("Intent Map provides for Intent not specified as provided by parent PolicySet - " + policySetName);
}
} else {
- error("IntentMapProvidesMissing", reader, policySetName);
+ error(monitor, "IntentMapProvidesMissing", reader, policySetName);
}
} else if (POLICY_SET_REFERENCE_QNAME.equals(name)) {
PolicySet referredPolicySet = policyFactory.createPolicySet();
@@ -217,14 +206,14 @@
referredPolicySet.setName(getQName(reader, NAME));
policySet.getReferencedPolicySets().add(referredPolicySet);
} else {
- error("PolicySetReferenceNameMissing", reader, policySetName);
+ error(monitor, "PolicySetReferenceNameMissing", reader, policySetName);
}
} /*else if ( WS_POLICY_QNAME.equals(name) ) {
OMElement policyElement = loadElement(reader);
org.apache.neethi.Policy wsPolicy = PolicyEngine.getPolicy(policyElement);
policySet.getPolicies().add(wsPolicy);
} */else {
- Object extension = extensionProcessor.read(reader);
+ Object extension = extensionProcessor.read(reader, context);
if (extension != null) {
PolicyExpression exp = policyFactory.createPolicyExpression();
exp.setName(name);
@@ -249,8 +238,9 @@
return policySet;
}
- public void readIntentMap(XMLStreamReader reader, PolicySet policySet, Intent mappedIntent)
+ public void readIntentMap(XMLStreamReader reader, PolicySet policySet, Intent mappedIntent, ProcessorContext context)
throws ContributionReadException {
+ Monitor monitor = context.getMonitor();
QName name = reader.getName();
if (POLICY_INTENT_MAP_QNAME.equals(name)) {
@@ -287,14 +277,14 @@
intentMap.getQualifiers().add(qualifier);
} else {
- error("QualifierNameMissing", reader, policySet.getName());
+ error(monitor, "QualifierNameMissing", reader, policySet.getName());
}
} else if (POLICY_INTENT_MAP_QNAME.equals(name)) {
QName providedIntent = getQName(reader, PROVIDES);
if (qualifierName.equals(providedIntent.getLocalPart())) {
- readIntentMap(reader, policySet, qualifiedIntent);
+ readIntentMap(reader, policySet, qualifiedIntent, context);
} else {
- error("IntentMapDoesNotMatch",
+ error(monitor, "IntentMapDoesNotMatch",
providedIntent,
providedIntent,
qualifierName,
@@ -304,7 +294,7 @@
//" in policyset - " + policySet);
}
} else {
- Object extension = extensionProcessor.read(reader);
+ Object extension = extensionProcessor.read(reader, context);
if (extension != null && qualifier != null) {
PolicyExpression exp = policyFactory.createPolicyExpression();
exp.setName(name);
@@ -325,13 +315,13 @@
}
} catch (XMLStreamException e) {
ContributionReadException ce = new ContributionReadException(e);
- error("ContributionReadException", reader, ce);
+ error(monitor, "ContributionReadException", reader, ce);
throw ce;
}
}
}
- public void write(PolicySet policySet, XMLStreamWriter writer) throws ContributionWriteException,
+ public void write(PolicySet policySet, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException,
XMLStreamException {
// Write an <sca:policySet>
@@ -382,11 +372,11 @@
}
}
- private void resolvePolicies(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
+ private void resolvePolicies(PolicySet policySet, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
boolean unresolved = false;
if (policySet != null) {
for (Object o : policySet.getPolicies()) {
- extensionProcessor.resolve(o, resolver);
+ extensionProcessor.resolve(o, resolver, context);
/*if ( o instanceof Policy && ((Policy)o).isUnresolved() ) {
unresolved = true;
}*/
@@ -403,18 +393,18 @@
return PolicySet.class;
}
- private void resolveProvidedIntents(PolicySet policySet, ModelResolver resolver)
+ private void resolveProvidedIntents(PolicySet policySet, ModelResolver resolver, ProcessorContext context)
throws ContributionResolveException {
if (policySet != null) {
//resolve all provided intents
List<Intent> providedIntents = new ArrayList<Intent>();
for (Intent providedIntent : policySet.getProvidedIntents()) {
if (providedIntent.isUnresolved()) {
- Intent resolved = resolver.resolveModel(Intent.class, providedIntent);
+ Intent resolved = resolver.resolveModel(Intent.class, providedIntent, context);
if (!resolved.isUnresolved() || resolved != providedIntent) {
providedIntents.add(resolved);
} else {
- error("ProvidedIntentNotFound", policySet, providedIntent, policySet);
+ error(context.getMonitor(), "ProvidedIntentNotFound", policySet, providedIntent, policySet);
return;
//throw new ContributionResolveException("Provided Intent - " + providedIntent
//+ " not found for PolicySet " + policySet);
@@ -428,16 +418,17 @@
}
}
- private void resolveIntentsInMappedPolicies(PolicySet policySet, ModelResolver resolver)
+ private void resolveIntentsInMappedPolicies(PolicySet policySet, ModelResolver resolver, ProcessorContext context)
throws ContributionResolveException {
+ Monitor monitor = context.getMonitor();
for (IntentMap intentMap : policySet.getIntentMaps()) {
Intent intent = intentMap.getProvidedIntent();
if (intent.isUnresolved()) {
- Intent resolved = resolver.resolveModel(Intent.class, intent);
+ Intent resolved = resolver.resolveModel(Intent.class, intent, context);
if (!resolved.isUnresolved() || resolved != intent) {
intentMap.setProvidedIntent(resolved);
} else {
- error("MappedIntentNotFound", policySet, intent, policySet);
+ error(monitor, "MappedIntentNotFound", policySet, intent, policySet);
return;
//throw new ContributionResolveException("Mapped Intent - " + mappedIntent
//+ " not found for PolicySet " + policySet);
@@ -446,11 +437,11 @@
for (Qualifier qualifier : intentMap.getQualifiers()) {
intent = qualifier.getIntent();
if (intent.isUnresolved()) {
- Intent resolved = resolver.resolveModel(Intent.class, intent);
+ Intent resolved = resolver.resolveModel(Intent.class, intent, context);
if (!resolved.isUnresolved() || resolved != intent) {
qualifier.setIntent(resolved);
} else {
- error("MappedIntentNotFound", policySet, intent, policySet);
+ error(monitor, "MappedIntentNotFound", policySet, intent, policySet);
return;
//throw new ContributionResolveException("Mapped Intent - " + mappedIntent
//+ " not found for PolicySet " + policySet);
@@ -464,17 +455,17 @@
}
- private void resolveReferredPolicySets(PolicySet policySet, ModelResolver resolver)
+ private void resolveReferredPolicySets(PolicySet policySet, ModelResolver resolver, ProcessorContext context)
throws ContributionResolveException {
List<PolicySet> referredPolicySets = new ArrayList<PolicySet>();
for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {
if (referredPolicySet.isUnresolved()) {
- PolicySet resolved = resolver.resolveModel(PolicySet.class, referredPolicySet);
+ PolicySet resolved = resolver.resolveModel(PolicySet.class, referredPolicySet, context);
if (!resolved.isUnresolved() || resolved != referredPolicySet) {
referredPolicySets.add(resolved);
} else {
- error("ReferredPolicySetNotFound", policySet, referredPolicySet, policySet);
+ error(context.getMonitor(), "ReferredPolicySetNotFound", policySet, referredPolicySet, policySet);
return;
//throw new ContributionResolveException("Referred PolicySet - " + referredPolicySet
//+ "not found for PolicySet - " + policySet);
@@ -495,10 +486,11 @@
policySet.getIntentMaps().addAll(referredPolicySet.getIntentMaps());
}
- public void resolve(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
- resolveProvidedIntents(policySet, resolver);
- resolveIntentsInMappedPolicies(policySet, resolver);
- resolveReferredPolicySets(policySet, resolver);
+ public void resolve(PolicySet policySet, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
+ Monitor monitor = context.getMonitor();
+ resolveProvidedIntents(policySet, resolver, context);
+ resolveIntentsInMappedPolicies(policySet, resolver, context);
+ resolveReferredPolicySets(policySet, resolver, context);
for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {
includeReferredPolicySets(policySet, referredPolicySet);
@@ -506,7 +498,7 @@
if (policySet.isUnresolved()) {
//resolve the policy attachments
- resolvePolicies(policySet, resolver);
+ resolvePolicies(policySet, resolver, context);
/*if ( !policySet.isUnresolved() ) {
resolver.addModel(policySet);
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MultiplicityReadWriteTestCase.java Fri Oct 16 05:42:26 2009
@@ -31,6 +31,7 @@
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.Multiplicity;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
import org.junit.Before;
@@ -47,31 +48,32 @@
private XMLInputFactory inputFactory;
private XMLOutputFactory outputFactory;
private ExtensibleStAXArtifactProcessor staxProcessor;
-
+ private ProcessorContext context;
@Before
public void setUp() throws Exception {
DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+ context = new ProcessorContext(extensionPoints);
inputFactory = XMLInputFactory.newInstance();
outputFactory = XMLOutputFactory.newInstance();
StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
- staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory, null);
+ staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory);
}
@Test
public void testReadWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("Multiplicity.composite");
- Composite composite = staxProcessor.read(is, Composite.class);
+ Composite composite = staxProcessor.read(is, Composite.class, context);
verifyComposite(composite);
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- staxProcessor.write(composite, bos);
+ staxProcessor.write(composite, bos, context);
bos.close();
ByteArrayInputStream bis = new ByteArrayInputStream(bos.toByteArray());
- composite = staxProcessor.read(bis, Composite.class);
+ composite = staxProcessor.read(bis, Composite.class, context);
verifyComposite(composite);
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java Fri Oct 16 05:42:26 2009
@@ -38,6 +38,7 @@
import org.apache.tuscany.sca.assembly.CompositeService;
import org.apache.tuscany.sca.assembly.Property;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
@@ -55,19 +56,21 @@
public class ReadAllTestCase {
private static StAXArtifactProcessor<Object> staxProcessor;
private static XMLInputFactory inputFactory;
-
+ private static ProcessorContext context;
+
@BeforeClass
public static void setUp() throws Exception {
DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+ context = new ProcessorContext(extensionPoints);
StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
inputFactory = XMLInputFactory.newInstance();
- staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
+ staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null);
}
@Test
public void testReadComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("TestAllCalculator.composite");
- Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is));
+ Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is), context);
assertNotNull(composite);
assertEquals(composite.getName(), new QName("http://calc", "TestAllCalculator"));
assertEquals(composite.getConstrainingType().getName(), new QName("http://calc", "CalculatorComponent"));
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java Fri Oct 16 05:42:26 2009
@@ -38,6 +38,7 @@
import org.apache.tuscany.sca.contribution.processor.DefaultValidationSchemaExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
@@ -66,18 +67,20 @@
private static XMLInputFactory inputFactory;
private static StAXArtifactProcessor<Object> staxProcessor;
private static ValidatorHandler handler;
+ private static ProcessorContext context;
@BeforeClass
public static void setUp() throws Exception {
DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+ context = new ProcessorContext(extensionPoints);
URLArtifactProcessorExtensionPoint documentProcessors =
extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
- documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
+ documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors);
StAXArtifactProcessorExtensionPoint staxProcessors =
extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
inputFactory = XMLInputFactory.newInstance();
- staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
+ staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null);
resolver = new DefaultModelResolver();
handler = getValidationHandler();
@@ -132,11 +135,11 @@
factories.addFactory(validatingInputFactory);
CompositeDocumentProcessor compositeDocumentProcessor =
- new CompositeDocumentProcessor(factories, staxProcessor, null);
+ new CompositeDocumentProcessor(factories, staxProcessor);
URL url = getClass().getResource("Calculator.composite");
URI uri = URI.create("Calculator.composite");
- Composite composite = (Composite)compositeDocumentProcessor.read(null, uri, url);
+ Composite composite = (Composite)compositeDocumentProcessor.read(null, uri, url, context);
assertNotNull(composite);
}
@@ -159,11 +162,11 @@
DefaultFactoryExtensionPoint factories = new DefaultFactoryExtensionPoint(new DefaultExtensionPointRegistry());
factories.addFactory(validatingInputFactory);
CompositeDocumentProcessor compositeDocumentProcessor =
- new CompositeDocumentProcessor(factories, staxProcessor, null);
+ new CompositeDocumentProcessor(factories, staxProcessor);
URL url = getClass().getResource("RMIBindingTest.composite");
URI uri = URI.create("RMIBindingTest.composite");
- Composite composite = (Composite)compositeDocumentProcessor.read(null, uri, url);
+ Composite composite = (Composite)compositeDocumentProcessor.read(null, uri, url, context);
assertNotNull(composite);
}
@@ -172,16 +175,16 @@
URL url = getClass().getResource("CalculatorComponent.constrainingType");
URI uri = URI.create("CalculatorComponent.constrainingType");
- ConstrainingType constrainingType = (ConstrainingType)documentProcessor.read(null, uri, url);
+ ConstrainingType constrainingType = (ConstrainingType)documentProcessor.read(null, uri, url, context);
assertNotNull(constrainingType);
- resolver.addModel(constrainingType);
+ resolver.addModel(constrainingType, context);
url = getClass().getResource("TestAllCalculator.composite");
uri = URI.create("TestAllCalculator.composite");
- Composite composite = (Composite)documentProcessor.read(null, uri, url);
+ Composite composite = (Composite)documentProcessor.read(null, uri, url, context);
assertNotNull(composite);
- documentProcessor.resolve(composite, resolver);
+ documentProcessor.resolve(composite, resolver, context);
assertEquals(composite.getConstrainingType(), constrainingType);
assertEquals(composite.getComponents().get(0).getConstrainingType(), constrainingType);
@@ -191,15 +194,15 @@
public void testResolveComposite() throws Exception {
URL url = getClass().getResource("Calculator.composite");
URI uri = URI.create("Calculator.composite");
- Composite nestedComposite = (Composite)documentProcessor.read(null, uri, url);
+ Composite nestedComposite = (Composite)documentProcessor.read(null, uri, url, context);
assertNotNull(nestedComposite);
- resolver.addModel(nestedComposite);
+ resolver.addModel(nestedComposite, context);
url = getClass().getResource("TestAllCalculator.composite");
uri = URI.create("TestAllCalculator.composite");
- Composite composite = (Composite)documentProcessor.read(null, uri, url);
+ Composite composite = (Composite)documentProcessor.read(null, uri, url, context);
- documentProcessor.resolve(composite, resolver);
+ documentProcessor.resolve(composite, resolver, context);
assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
}
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java Fri Oct 16 05:42:26 2009
@@ -28,6 +28,7 @@
import javax.xml.stream.XMLStreamReader;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
@@ -44,13 +45,15 @@
private static XMLInputFactory inputFactory;
private static StAXArtifactProcessor<Object> staxProcessor;
-
+ private static ProcessorContext context;
+
@BeforeClass
public static void setUp() throws Exception {
ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+ context = new ProcessorContext(extensionPoints);
inputFactory = XMLInputFactory.newInstance();
StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
- staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance(), null);
+ staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
}
@@ -58,7 +61,7 @@
public void testReadComponentType() throws Exception {
InputStream is = getClass().getResourceAsStream("CalculatorImpl.componentType");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- assertNotNull(staxProcessor.read(reader));
+ assertNotNull(staxProcessor.read(reader, context));
is.close();
}
@@ -66,7 +69,7 @@
public void testReadConstrainingType() throws Exception {
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- assertNotNull(staxProcessor.read(reader));
+ assertNotNull(staxProcessor.read(reader, context));
is.close();
}
@@ -75,7 +78,7 @@
public void testReadComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("Calculator.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- assertNotNull(staxProcessor.read(reader));
+ assertNotNull(staxProcessor.read(reader, context));
is.close();
}
@@ -84,7 +87,7 @@
public void testReadCompositeAndWireIt() throws Exception {
InputStream is = getClass().getResourceAsStream("Calculator.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- assertNotNull(staxProcessor.read(reader));
+ assertNotNull(staxProcessor.read(reader, context));
is.close();
}
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyAttributeTestCase.java Fri Oct 16 05:42:26 2009
@@ -31,6 +31,7 @@
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint;
@@ -56,7 +57,7 @@
private XMLInputFactory inputFactory;
private ExtensibleStAXArtifactProcessor staxProcessor;
-
+ private ProcessorContext context;
/**
* Initialize the test environment
@@ -67,6 +68,7 @@
*/
private void init(StAXAttributeProcessor<?> attributeProcessor) throws Exception {
ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+ context = new ProcessorContext(extensionPoints);
inputFactory = XMLInputFactory.newInstance();
StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
@@ -75,7 +77,7 @@
staxAttributeProcessors.addArtifactProcessor(attributeProcessor);
}
- staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance(), null);
+ staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
}
/**
@@ -88,12 +90,12 @@
init(new TestAttributeProcessor());
XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML));
- Composite composite = (Composite) staxProcessor.read(reader);
+ Composite composite = (Composite) staxProcessor.read(reader, context);
assertNotNull(composite);
reader.close();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- staxProcessor.write(composite, bos);
+ staxProcessor.write(composite, bos, context);
// used for debug comparison
// System.out.println(XML);
@@ -112,12 +114,12 @@
init(null);
XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML));
- Composite composite = (Composite) staxProcessor.read(reader);
+ Composite composite = (Composite) staxProcessor.read(reader, context);
assertNotNull(composite);
reader.close();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- staxProcessor.write(composite, bos);
+ staxProcessor.write(composite, bos, context);
// used for debug comparison
// System.out.println(XML);
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteAnyElementTestCase.java Fri Oct 16 05:42:26 2009
@@ -30,6 +30,7 @@
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
@@ -75,15 +76,18 @@
private XMLInputFactory inputFactory;
private ExtensibleStAXArtifactProcessor staxProcessor;
+ private ProcessorContext context;
@Before
public void setUp() throws Exception {
ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+ context = new ProcessorContext(extensionPoints);
+
FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class);
StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
- staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, XMLOutputFactory.newInstance(), null);
+ staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, XMLOutputFactory.newInstance());
}
@After
@@ -93,12 +97,12 @@
@Test
public void testReadWriteExtendedRecursiveElement() throws Exception {
XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML_RECURSIVE_EXTENDED_ELEMENT));
- Composite composite = (Composite)staxProcessor.read(reader);
+ Composite composite = (Composite)staxProcessor.read(reader, context);
assertNotNull(composite);
reader.close();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- staxProcessor.write(composite, bos);
+ staxProcessor.write(composite, bos, context);
// used for debug comparison
// System.out.println(XML_RECURSIVE_EXTENDED_ELEMENT);
@@ -111,12 +115,12 @@
@Test
public void testReadWriteUnknwonImpl() throws Exception {
XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML_UNKNOWN_IMPL));
- Composite composite = (Composite)staxProcessor.read(reader);
+ Composite composite = (Composite)staxProcessor.read(reader, context);
assertNotNull(composite);
reader.close();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- staxProcessor.write(composite, bos);
+ staxProcessor.write(composite, bos, context);
// used for debug comparison
// System.out.println(XML_UNKNOWN_IMPL);
@@ -130,12 +134,12 @@
@Ignore()
public void testReadWriteInvalidAttribute() throws Exception {
XMLStreamReader reader = inputFactory.createXMLStreamReader(new StringReader(XML_UNKNOWN_IMPL_WITH_INVALID_ATTRIBUTE));
- Composite composite = (Composite)staxProcessor.read(reader);
+ Composite composite = (Composite)staxProcessor.read(reader, context);
assertNotNull(composite);
reader.close();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- staxProcessor.write(composite, bos);
+ staxProcessor.write(composite, bos, context);
// used for debug comparison
// System.out.println(XML_UNKNOWN_IMPL);
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadWriteLocalCompositeTestCase.java Fri Oct 16 05:42:26 2009
@@ -32,6 +32,7 @@
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessorExtensionPoint;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
@@ -50,7 +51,8 @@
private XMLInputFactory inputFactory;
private ExtensibleStAXArtifactProcessor staxProcessor;
-
+ private ProcessorContext context;
+
private static final String LOCAL_COMPOSITE_XML = "<?xml version='1.0' encoding='UTF-8'?>"+
"<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200903\" targetNamespace=\"http://localcalc\" name=\"LocalCalculator\" local=\"true\">"+
"</composite>";
@@ -58,13 +60,14 @@
@Before
public void setUp() throws Exception {
ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+ context = new ProcessorContext(extensionPoints);
inputFactory = XMLInputFactory.newInstance();
StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
StAXAttributeProcessorExtensionPoint staxAttributeProcessors = extensionPoints.getExtensionPoint(StAXAttributeProcessorExtensionPoint.class);
staxAttributeProcessors.addArtifactProcessor(new TestAttributeProcessor());
- staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance(), null);
+ staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, XMLInputFactory.newInstance(), XMLOutputFactory.newInstance());
}
@After
@@ -76,7 +79,7 @@
public void testReadComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("local.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- Composite composite = (Composite) staxProcessor.read(reader);
+ Composite composite = (Composite) staxProcessor.read(reader, context);
assertNotNull(composite);
assertTrue(composite.isLocal());
is.close();
@@ -86,13 +89,13 @@
public void testWriteComposite() throws Exception {
InputStream is = getClass().getResourceAsStream("local.composite");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- Composite composite = (Composite) staxProcessor.read(reader);
+ Composite composite = (Composite) staxProcessor.read(reader, context);
assertNotNull(composite);
assertTrue(composite.isLocal());
is.close();
ByteArrayOutputStream bos = new ByteArrayOutputStream();
- staxProcessor.write(composite, bos);
+ staxProcessor.write(composite, bos, context);
System.out.println(bos.toString());
assertEquals(LOCAL_COMPOSITE_XML, bos.toString());
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java Fri Oct 16 05:42:26 2009
@@ -31,6 +31,7 @@
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
import org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
@@ -52,14 +53,16 @@
private static URLArtifactProcessor<Object> documentProcessor;
private static ModelResolver resolver;
private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor;
+ private static ProcessorContext context;
@BeforeClass
public static void setUp() throws Exception {
DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+ context = new ProcessorContext(extensionPoints);
resolver = new DefaultModelResolver();
URLArtifactProcessorExtensionPoint documentProcessors = extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
- documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors, null);
+ documentProcessor = new ExtensibleURLArtifactProcessor(documentProcessors);
policyDefinitionsProcessor = documentProcessors.getProcessor(Definitions.class);
// Create StAX processors
@@ -72,23 +75,23 @@
URL url = getClass().getResource("CalculatorComponent.constrainingType");
URI uri = URI.create("CalculatorComponent.constrainingType");
- ConstrainingType constrainingType = (ConstrainingType)documentProcessor.read(null, uri, url);
+ ConstrainingType constrainingType = (ConstrainingType)documentProcessor.read(null, uri, url, context);
assertNotNull(constrainingType);
- resolver.addModel(constrainingType);
+ resolver.addModel(constrainingType, context);
url = getClass().getResource("TestAllCalculator.composite");
uri = URI.create("TestAllCalculator.composite");
- Composite composite = (Composite)documentProcessor.read(null, uri, url);
+ Composite composite = (Composite)documentProcessor.read(null, uri, url, context);
assertNotNull(composite);
url = getClass().getResource("test_definitions.xml");
uri = URI.create("test_definitions.xml");
- Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
+ Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url, context);
assertNotNull(scaDefns);
preResolvePolicyTests(composite);
- documentProcessor.resolve(scaDefns, resolver);
- documentProcessor.resolve(composite, resolver);
+ documentProcessor.resolve(scaDefns, resolver, context);
+ documentProcessor.resolve(composite, resolver, context);
// Comment out the post resolving test
// postResolvePolicyTests(composite);
@@ -155,15 +158,15 @@
public void testResolveComposite() throws Exception {
URL url = getClass().getResource("Calculator.composite");
URI uri = URI.create("Calculator.composite");
- Composite nestedComposite = (Composite)documentProcessor.read(null, uri, url);
+ Composite nestedComposite = (Composite)documentProcessor.read(null, uri, url, context);
assertNotNull(nestedComposite);
- resolver.addModel(nestedComposite);
+ resolver.addModel(nestedComposite, context);
url = getClass().getResource("TestAllCalculator.composite");
uri = URI.create("TestAllCalculator.composite");
- Composite composite = (Composite)documentProcessor.read(null, uri, url);
+ Composite composite = (Composite)documentProcessor.read(null, uri, url, context);
- documentProcessor.resolve(composite, resolver);
+ documentProcessor.resolve(composite, resolver, context);
assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
}
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java Fri Oct 16 05:42:26 2009
@@ -29,6 +29,7 @@
import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.ConstrainingType;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
@@ -48,10 +49,12 @@
private static XMLInputFactory inputFactory;
private static StAXArtifactProcessorExtensionPoint staxProcessors;
private static ModelResolver resolver;
-
+ private static ProcessorContext context;
+
@BeforeClass
public static void setUp() throws Exception {
DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+ context = new ProcessorContext(extensionPoints);
inputFactory = XMLInputFactory.newInstance();
staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
resolver = new DefaultModelResolver();
@@ -62,19 +65,19 @@
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
StAXArtifactProcessor<ConstrainingType> constrainingTypeReader = staxProcessors.getProcessor(ConstrainingType.class);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- ConstrainingType constrainingType = constrainingTypeReader.read(reader);
+ ConstrainingType constrainingType = constrainingTypeReader.read(reader, context);
is.close();
assertNotNull(constrainingType);
- resolver.addModel(constrainingType);
+ resolver.addModel(constrainingType, context);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
StAXArtifactProcessor<Composite> compositeReader = staxProcessors.getProcessor(Composite.class);
reader = inputFactory.createXMLStreamReader(is);
- Composite composite = compositeReader.read(reader);
+ Composite composite = compositeReader.read(reader, context);
is.close();
assertNotNull(composite);
- compositeReader.resolve(composite, resolver);
+ compositeReader.resolve(composite, resolver, context);
assertEquals(composite.getConstrainingType(), constrainingType);
assertEquals(composite.getComponents().get(0).getConstrainingType(), constrainingType);
@@ -85,17 +88,17 @@
InputStream is = getClass().getResourceAsStream("Calculator.composite");
StAXArtifactProcessor<Composite> compositeReader = staxProcessors.getProcessor(Composite.class);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- Composite nestedComposite = compositeReader.read(reader);
+ Composite nestedComposite = compositeReader.read(reader, context);
is.close();
assertNotNull(nestedComposite);
- resolver.addModel(nestedComposite);
+ resolver.addModel(nestedComposite, context);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
reader = inputFactory.createXMLStreamReader(is);
- Composite composite = compositeReader.read(reader);
+ Composite composite = compositeReader.read(reader, context);
is.close();
- compositeReader.resolve(composite, resolver);
+ compositeReader.resolve(composite, resolver, context);
assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
}
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestAttributeProcessor.java Fri Oct 16 05:42:26 2009
@@ -27,6 +27,7 @@
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
@@ -42,11 +43,11 @@
return ATTRIBUTE;
}
- public String read(QName attributeName, XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+ public String read(QName attributeName, XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
return reader.getAttributeValue(attributeName.getNamespaceURI(), attributeName.getLocalPart());
}
- public void write(String value, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+ public void write(String value, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
writer.setPrefix(ATTRIBUTE.getPrefix(), ATTRIBUTE.getNamespaceURI());
writer.writeAttribute(ATTRIBUTE.getLocalPart(), value);
}
@@ -55,7 +56,7 @@
return String.class;
}
- public void resolve(String arg0, ModelResolver arg1) throws ContributionResolveException {
+ public void resolve(String arg0, ModelResolver arg1, ProcessorContext context) throws ContributionResolveException {
}
}
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestPolicyProcessor.java Fri Oct 16 05:42:26 2009
@@ -26,6 +26,7 @@
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.policy.PolicyExpression;
@@ -41,11 +42,11 @@
return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
}
- public PolicyExpression read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {
+ public PolicyExpression read(XMLStreamReader arg0, ProcessorContext context) throws ContributionReadException, XMLStreamException {
return new MockPolicyImplOne();
}
- public void write(PolicyExpression arg0, XMLStreamWriter arg1) throws ContributionWriteException,
+ public void write(PolicyExpression arg0, XMLStreamWriter arg1, ProcessorContext context) throws ContributionWriteException,
XMLStreamException {
}
@@ -53,7 +54,7 @@
return PolicyExpression.class;
}
- public void resolve(PolicyExpression arg0, ModelResolver arg1) throws ContributionResolveException {
+ public void resolve(PolicyExpression arg0, ModelResolver arg1, ProcessorContext context) throws ContributionResolveException {
}
public class MockPolicyImplOne implements PolicyExpression {
Modified: tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java?rev=825773&r1=825772&r2=825773&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java (original)
+++ tuscany/java/sca/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java Fri Oct 16 05:42:26 2009
@@ -36,6 +36,7 @@
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
@@ -59,13 +60,15 @@
private static StAXArtifactProcessor<Object> staxProcessor;
private static ModelResolver resolver;
private static URLArtifactProcessor<Definitions> policyDefinitionsProcessor;
-
+ private static ProcessorContext context;
+
@BeforeClass
public static void setUp() throws Exception {
DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+ context = new ProcessorContext(extensionPoints);
inputFactory = XMLInputFactory.newInstance();
StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
- staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
+ staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null);
resolver = new DefaultModelResolver();
FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
@@ -80,25 +83,25 @@
public void testResolveConstrainingType() throws Exception {
InputStream is = getClass().getResourceAsStream("CalculatorComponent.constrainingType");
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(reader);
+ ConstrainingType constrainingType = (ConstrainingType)staxProcessor.read(reader, context);
is.close();
assertNotNull(constrainingType);
- resolver.addModel(constrainingType);
+ resolver.addModel(constrainingType, context);
is = getClass().getResourceAsStream("TestAllCalculator.composite");
reader = inputFactory.createXMLStreamReader(is);
- Composite composite = (Composite)staxProcessor.read(reader);
+ Composite composite = (Composite)staxProcessor.read(reader, context);
is.close();
assertNotNull(composite);
URL url = getClass().getResource("test_definitions.xml");
URI uri = URI.create("test_definitions.xml");
- Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
+ Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url, context);
assertNotNull(scaDefns);
- policyDefinitionsProcessor.resolve(scaDefns, resolver);
+ policyDefinitionsProcessor.resolve(scaDefns, resolver, context);
- staxProcessor.resolve(composite, resolver);
+ staxProcessor.resolve(composite, resolver, context);
assertEquals(composite.getConstrainingType(), constrainingType);
assertEquals(composite.getComponents().get(0).getConstrainingType(), constrainingType);
@@ -108,18 +111,18 @@
public void testResolveComposite() throws Exception {
Composite nestedComposite = readComposite("Calculator.composite");
assertNotNull(nestedComposite);
- resolver.addModel(nestedComposite);
+ resolver.addModel(nestedComposite, context);
Composite composite = readComposite("TestAllCalculator.composite");
URL url = getClass().getResource("test_definitions.xml");
URI uri = URI.create("test_definitions.xml");
- Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url);
+ Definitions scaDefns = (Definitions)policyDefinitionsProcessor.read(null, uri, url, context);
assertNotNull(scaDefns);
- policyDefinitionsProcessor.resolve(scaDefns, resolver);
+ policyDefinitionsProcessor.resolve(scaDefns, resolver, context);
- staxProcessor.resolve(composite, resolver);
+ staxProcessor.resolve(composite, resolver, context);
assertEquals(composite.getComponents().get(2).getImplementation(), nestedComposite);
}
@@ -127,7 +130,7 @@
private Composite readComposite(String resource) throws XMLStreamException, ContributionReadException, IOException {
InputStream is = getClass().getResourceAsStream(resource);
XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
- Composite composite = (Composite)staxProcessor.read(reader);
+ Composite composite = (Composite)staxProcessor.read(reader, context);
is.close();
return composite;
}