Author: lresende
Date: Thu Jan 29 00:54:14 2009
New Revision: 738684
URL: http://svn.apache.org/viewvc?rev=738684&view=rev
Log:
Refactoring common code to simplify processing extended attributes
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java?rev=738684&r1=738683&r2=738684&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
Thu Jan 29 00:54:14 2009
@@ -98,6 +98,7 @@
protected ExtensionFactory extensionFactory;
protected PolicyFactory policyFactory;
protected StAXArtifactProcessor<Object> extensionProcessor;
+ protected StAXAttributeProcessor<Object> extensionAttributeProcessor;
protected PolicyAttachPointProcessor policyProcessor;
private DocumentBuilderFactory documentBuilderFactory;
protected IntentAttachPointTypeFactory intentAttachPointTypeFactory;
@@ -119,12 +120,14 @@
ExtensionFactory extensionFactory,
PolicyFactory policyFactory,
StAXArtifactProcessor extensionProcessor,
+ StAXAttributeProcessor
extensionAttributeProcessor,
Monitor monitor) {
this.contributionFactory = contribFactory;
this.assemblyFactory = assemblyFactory;
this.extensionFactory = extensionFactory;
this.policyFactory = policyFactory;
this.extensionProcessor =
(StAXArtifactProcessor<Object>)extensionProcessor;
+ this.extensionAttributeProcessor = extensionAttributeProcessor;
this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
this.intentAttachPointTypeFactory = new
IntentAttachPointTypeFactoryImpl();
this.monitor = monitor;
@@ -143,11 +146,13 @@
ExtensionFactory extensionFactory,
PolicyFactory policyFactory,
StAXArtifactProcessor extensionProcessor,
+ StAXAttributeProcessor
extensionAttributeProcessor,
Monitor monitor) {
this.assemblyFactory = assemblyfactory;
this.extensionFactory = extensionFactory;
this.policyFactory = policyFactory;
this.extensionProcessor =
(StAXArtifactProcessor<Object>)extensionProcessor;
+ this.extensionAttributeProcessor = extensionAttributeProcessor;
this.policyProcessor = new PolicyAttachPointProcessor(policyFactory);
this.monitor = monitor;
}
@@ -877,7 +882,8 @@
* @throws ContributionReadException
* @throws XMLStreamException
*/
- protected void readExtendedAttributes(XMLStreamReader reader, QName
elementName, Extensible estensibleElement, StAXAttributeProcessor
extensionAttributeProcessor) throws ContributionReadException,
XMLStreamException {
+ protected void readExtendedAttributes(XMLStreamReader reader, Extensible
estensibleElement) throws ContributionReadException, XMLStreamException {
+ QName elementName = reader.getName();
for (int a = 0; a < reader.getAttributeCount(); a++) {
QName attributeName = reader.getAttributeName(a);
if( attributeName.getNamespaceURI() != null &&
attributeName.getNamespaceURI().length() > 0) {
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java?rev=738684&r1=738683&r2=738684&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
Thu Jan 29 00:54:14 2009
@@ -56,7 +56,7 @@
public ComponentTypeDocumentProcessor(StAXArtifactProcessor staxProcessor,
XMLInputFactory inputFactory,
Monitor monitor) {
- super(null, null, null, staxProcessor, monitor);
+ super(null, null, null, staxProcessor, null, monitor);
this.inputFactory = inputFactory;
}
@@ -68,7 +68,7 @@
public ComponentTypeDocumentProcessor(ModelFactoryExtensionPoint
modelFactories,
StAXArtifactProcessor staxProcessor,
Monitor monitor) {
- super(null, null, null, staxProcessor, monitor);
+ super(null, null, null, staxProcessor, null, monitor);
this.inputFactory =
modelFactories.getFactory(ValidatingXMLInputFactory.class);
}
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java?rev=738684&r1=738683&r2=738684&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
Thu Jan 29 00:54:14 2009
@@ -69,8 +69,10 @@
public ComponentTypeProcessor(AssemblyFactory assemblyFactory,
ExtensionFactory extensionFactory,
PolicyFactory policyFactory,
- StAXArtifactProcessor
extensionProcessor, StAXAttributeProcessor extensionAttributeProcessor, Monitor
monitor) {
- super(assemblyFactory, extensionFactory, policyFactory,
extensionProcessor, monitor);
+ StAXArtifactProcessor extensionProcessor,
+ StAXAttributeProcessor
extensionAttributeProcessor,
+ Monitor monitor) {
+ super(assemblyFactory, extensionFactory, policyFactory,
extensionProcessor, extensionAttributeProcessor, monitor);
}
/**
@@ -80,13 +82,14 @@
* @param extensionProcessor
*/
public ComponentTypeProcessor(ModelFactoryExtensionPoint modelFactories,
- StAXArtifactProcessor
extensionProcessor,
-
StAXAttributeProcessor extensionAttributeProcessor,
- Monitor monitor) {
+ StAXArtifactProcessor extensionProcessor,
+ StAXAttributeProcessor
extensionAttributeProcessor,
+ Monitor monitor) {
super(modelFactories.getFactory(AssemblyFactory.class),
modelFactories.getFactory(ExtensionFactory.class),
modelFactories.getFactory(PolicyFactory.class),
- extensionProcessor,
+ extensionProcessor,
+ extensionAttributeProcessor,
monitor);
}
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java?rev=738684&r1=738683&r2=738684&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
Thu Jan 29 00:54:14 2009
@@ -73,7 +73,7 @@
XMLInputFactory inputFactory,
List scaDefnsSink,
Monitor monitor) {
- super(null, null, null, staxProcessor, monitor);
+ super(null, null, null, staxProcessor, null, monitor);
this.inputFactory = inputFactory;
this.scaDefnSink = scaDefnsSink;
}
@@ -92,7 +92,7 @@
DocumentBuilderFactory
documentBuilderFactory,
List scaDefnsSink,
Monitor monitor) {
- super(null, null, null, staxProcessor, monitor);
+ super(null, null, null, staxProcessor, null, monitor);
this.documentBuilderFactory = documentBuilderFactory;
this.inputFactory = inputFactory;
this.scaDefnSink = scaDefnsSink;
@@ -108,7 +108,7 @@
public CompositeDocumentProcessor(ModelFactoryExtensionPoint
modelFactories,
StAXArtifactProcessor staxProcessor,
Monitor monitor) {
- super(null, null, null, staxProcessor, monitor);
+ super(null, null, null, staxProcessor, null, monitor);
this.inputFactory =
modelFactories.getFactory(ValidatingXMLInputFactory.class);
this.documentBuilderFactory =
modelFactories.getFactory(DocumentBuilderFactory.class);
}
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java?rev=738684&r1=738683&r2=738684&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
Thu Jan 29 00:54:14 2009
@@ -90,8 +90,6 @@
// FIXME: to be refactored
private XPathFactory xPathFactory = XPathFactory.newInstance();
- protected StAXAttributeProcessor<Object> extensionAttributeProcessor;
-
/**
* Construct a new composite processor
*
@@ -128,6 +126,7 @@
modelFactories.getFactory(ExtensionFactory.class),
modelFactories.getFactory(PolicyFactory.class),
extensionProcessor,
+ extensionAttributeProcessor,
monitor);
this.extensionAttributeProcessor = extensionAttributeProcessor;
@@ -149,7 +148,7 @@
StAXArtifactProcessor extensionProcessor,
StAXAttributeProcessor extensionAttributeProcessor,
Monitor monitor) {
- super(contributionFactory, assemblyFactory, extensionFactory,
policyFactory, extensionProcessor, monitor);
+ super(contributionFactory, assemblyFactory, extensionFactory,
policyFactory, extensionProcessor, extensionAttributeProcessor, monitor);
}
public Composite read(XMLStreamReader reader) throws
ContributionReadException {
@@ -192,7 +191,7 @@
}
//handle extension attributes
- this.readExtendedAttributes(reader, name,
composite, extensionAttributeProcessor);
+ this.readExtendedAttributes(reader, composite);
composite.setLocal(getBoolean(reader, LOCAL));
composite.setConstrainingType(readConstrainingType(reader));
@@ -216,7 +215,7 @@
componentService.setName(getString(reader,
NAME));
//handle extension attributes
- this.readExtendedAttributes(reader, name,
componentService, extensionAttributeProcessor);
+ this.readExtendedAttributes(reader,
componentService);
component.getServices().add(componentService);
policyProcessor.readPolicies(contract, reader);
@@ -252,7 +251,7 @@
}
//handle extension attributes
- this.readExtendedAttributes(reader, name,
compositeService, extensionAttributeProcessor);
+ this.readExtendedAttributes(reader,
compositeService);
composite.getServices().add(compositeService);
policyProcessor.readPolicies(contract, reader);
@@ -272,7 +271,7 @@
componentReference.setWiredByImpl(getBoolean(reader, WIRED_BY_IMPL));
//handle extension attributes
- this.readExtendedAttributes(reader, name,
componentReference, extensionAttributeProcessor);
+ this.readExtendedAttributes(reader,
componentReference);
component.getReferences().add(componentReference);
policyProcessor.readPolicies(contract, reader);
@@ -296,7 +295,7 @@
compositeReference.setWiredByImpl(getBoolean(reader, WIRED_BY_IMPL));
//handle extension attributes
- this.readExtendedAttributes(reader, name,
compositeReference, extensionAttributeProcessor);
+ this.readExtendedAttributes(reader,
compositeReference);
composite.getReferences().add(compositeReference);
policyProcessor.readPolicies(contract, reader);
@@ -340,7 +339,7 @@
componentProperty.setFile(getString(reader,
FILE));
//handle extension attributes
- this.readExtendedAttributes(reader, name,
componentProperty, extensionAttributeProcessor);
+ this.readExtendedAttributes(reader,
componentProperty);
policyProcessor.readPolicies(property, reader);
readAbstractProperty(componentProperty,
reader);
@@ -384,7 +383,7 @@
}
//handle extension attributes
- this.readExtendedAttributes(reader, name,
component, extensionAttributeProcessor);
+ this.readExtendedAttributes(reader, component);
component.setConstrainingType(readConstrainingType(reader));
composite.getComponents().add(component);
@@ -405,7 +404,7 @@
wire.setTarget(target);
//handle extension attributes
- this.readExtendedAttributes(reader, name, wire,
extensionAttributeProcessor);
+ this.readExtendedAttributes(reader, wire);
composite.getWires().add(wire);
policyProcessor.readPolicies(wire, reader);
@@ -417,7 +416,7 @@
contract.setCallback(callback);
//handle extension attributes
- this.readExtendedAttributes(reader, name,
callback, extensionAttributeProcessor);
+ this.readExtendedAttributes(reader, callback);
policyProcessor.readPolicies(callback, reader);
@@ -453,7 +452,7 @@
implementation.setUnresolved(true);
//handle extension attributes
- this.readExtendedAttributes(reader, name,
implementation, extensionAttributeProcessor);
+ this.readExtendedAttributes(reader,
implementation);
component.setImplementation(implementation);
policyProcessor.readPolicies(implementation,
reader);
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java?rev=738684&r1=738683&r2=738684&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
Thu Jan 29 00:54:14 2009
@@ -58,7 +58,7 @@
public ConstrainingTypeDocumentProcessor(StAXArtifactProcessor
staxProcessor,
XMLInputFactory inputFactory,
Monitor monitor) {
- super(null, null, null, staxProcessor, monitor);
+ super(null, null, null, staxProcessor, null, monitor);
this.inputFactory = inputFactory;
}
@@ -72,7 +72,7 @@
public ConstrainingTypeDocumentProcessor(ModelFactoryExtensionPoint
modelFactories,
StAXArtifactProcessor
staxProcessor,
Monitor monitor) {
- super(null, null, null, staxProcessor, monitor);
+ super(null, null, null, staxProcessor, null, monitor);
this.inputFactory =
modelFactories.getFactory(ValidatingXMLInputFactory.class);
}
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java?rev=738684&r1=738683&r2=738684&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
Thu Jan 29 00:54:14 2009
@@ -36,6 +36,7 @@
import org.apache.tuscany.sca.assembly.ExtensionFactory;
import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
import
org.apache.tuscany.sca.contribution.service.ContributionResolveException;
@@ -63,9 +64,10 @@
public ConstrainingTypeProcessor(AssemblyFactory assemblyFactory,
ExtensionFactory extensionFactory,
PolicyFactory policyFactory,
- StAXArtifactProcessor extensionProcessor,
+ StAXArtifactProcessor extensionProcessor,
+ StAXAttributeProcessor
extensionAttributeProcessor,
Monitor monitor) {
- super(assemblyFactory, extensionFactory, policyFactory,
extensionProcessor, monitor);
+ super(assemblyFactory, extensionFactory, policyFactory,
extensionProcessor, extensionAttributeProcessor, monitor);
}
/**
@@ -76,11 +78,13 @@
*/
public ConstrainingTypeProcessor(ModelFactoryExtensionPoint
modelFactories,
StAXArtifactProcessor extensionProcessor,
+ StAXAttributeProcessor
extensionAttributeProcessor,
Monitor monitor) {
super(modelFactories.getFactory(AssemblyFactory.class),
modelFactories.getFactory(ExtensionFactory.class),
modelFactories.getFactory(PolicyFactory.class),
extensionProcessor,
+ extensionAttributeProcessor,
monitor);
}
Modified:
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java?rev=738684&r1=738683&r2=738684&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
(original)
+++
tuscany/branches/sca-java-1.x/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
Thu Jan 29 00:54:14 2009
@@ -67,7 +67,7 @@
Class<Implementation> modelClass,
Object modelFactory,
Monitor monitor) {
- super(assemblyFactory, extensionFactory, policyFactory, null, monitor);
+ super(assemblyFactory, extensionFactory, policyFactory, null, null,
monitor);
this.artifactType = artifactType;
this.modelClass = modelClass;
this.modelFactory = modelFactory;
