You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2007/08/17 09:35:48 UTC
svn commit: r566956 -
/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
Author: svkrish
Date: Fri Aug 17 00:35:47 2007
New Revision: 566956
URL: http://svn.apache.org/viewvc?view=rev&rev=566956
Log:
decompsing write method into smaller constituents
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java?view=diff&rev=566956&r1=566955&r2=566956
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java Fri Aug 17 00:35:47 2007
@@ -65,33 +65,36 @@
*
* @version $Rev$ $Date$
*/
-public class CompositeProcessor extends BaseArtifactProcessor implements StAXArtifactProcessor<Composite> {
-
+public class CompositeProcessor extends BaseArtifactProcessor implements
+ StAXArtifactProcessor<Composite> {
+
/**
* Construct a new composite processor
+ *
* @param contributionFactory
* @param assemblyFactory
* @param policyFactory
- * @param extensionProcessor
+ * @param extensionProcessor
*/
public CompositeProcessor(ContributionFactory contributionFactory,
- AssemblyFactory factory, PolicyFactory policyFactory,
+ AssemblyFactory factory,
+ PolicyFactory policyFactory,
InterfaceContractMapper interfaceContractMapper,
StAXArtifactProcessor extensionProcessor) {
super(contributionFactory, factory, policyFactory, extensionProcessor);
}
-
+
/**
* Construct a new composite processor
+ *
* @param assemblyFactory
* @param policyFactory
- * @param extensionProcessor
-
- public CompositeProcessor(AssemblyFactory factory, PolicyFactory policyFactory,
- InterfaceContractMapper interfaceContractMapper,
- StAXArtifactProcessor extensionProcessor) {
- super(factory, policyFactory, extensionProcessor);
- }*/
+ * @param extensionProcessor public CompositeProcessor(AssemblyFactory
+ * factory, PolicyFactory policyFactory, InterfaceContractMapper
+ * interfaceContractMapper, StAXArtifactProcessor
+ * extensionProcessor) { super(factory, policyFactory,
+ * extensionProcessor); }
+ */
public Composite read(XMLStreamReader reader) throws ContributionReadException {
Composite composite = null;
@@ -107,37 +110,38 @@
Wire wire = null;
Callback callback = null;
QName name = null;
-
+
try {
-
+
// Read the composite document
while (reader.hasNext()) {
int event = reader.getEventType();
switch (event) {
case START_ELEMENT:
name = reader.getName();
-
+
if (COMPOSITE_QNAME.equals(name)) {
-
+
// Read a <composite>
composite = assemblyFactory.createComposite();
- composite.setName(new QName(getString(reader, TARGET_NAMESPACE), getString(reader, NAME)));
+ composite.setName(new QName(getString(reader, TARGET_NAMESPACE),
+ getString(reader, NAME)));
composite.setAutowire(getBoolean(reader, AUTOWIRE));
composite.setLocal(getBoolean(reader, LOCAL));
composite.setConstrainingType(getConstrainingType(reader));
readPolicies(composite, reader);
-
+
} else if (INCLUDE_QNAME.equals(name)) {
-
+
// Read an <include>
include = assemblyFactory.createComposite();
include.setName(getQName(reader, "name"));
include.setUnresolved(true);
composite.getIncludes().add(include);
-
+
} else if (SERVICE_QNAME.equals(name)) {
if (component != null) {
-
+
// Read a <component><service>
componentService = assemblyFactory.createComponentService();
contract = componentService;
@@ -145,12 +149,12 @@
component.getServices().add(componentService);
readPolicies(contract, reader);
} else {
-
+
// Read a <composite><service>
compositeService = assemblyFactory.createCompositeService();
contract = compositeService;
compositeService.setName(getString(reader, NAME));
-
+
String promoted = getString(reader, PROMOTE);
String promotedComponentName;
String promotedServiceName;
@@ -160,23 +164,24 @@
promotedServiceName = null;
} else {
promotedComponentName = promoted.substring(0, s);
- promotedServiceName = promoted.substring(s+1);
+ promotedServiceName = promoted.substring(s + 1);
}
-
+
Component promotedComponent = assemblyFactory.createComponent();
promotedComponent.setUnresolved(true);
promotedComponent.setName(promotedComponentName);
compositeService.setPromotedComponent(promotedComponent);
- ComponentService promotedService = assemblyFactory.createComponentService();
+ ComponentService promotedService =
+ assemblyFactory.createComponentService();
promotedService.setUnresolved(true);
promotedService.setName(promotedServiceName);
compositeService.setPromotedService(promotedService);
-
+
composite.getServices().add(compositeService);
readPolicies(contract, reader);
}
-
+
} else if (REFERENCE_QNAME.equals(name)) {
if (component != null) {
// Read a <component><reference>
@@ -186,7 +191,8 @@
readMultiplicity(componentReference, reader);
componentReference.setAutowire(getBoolean(reader, AUTOWIRE));
readTargets(componentReference, reader);
- componentReference.setWiredByImpl(getBoolean(reader, WIRED_BY_IMPL));
+ componentReference
+ .setWiredByImpl(getBoolean(reader, WIRED_BY_IMPL));
component.getReferences().add(componentReference);
readPolicies(contract, reader);
} else {
@@ -198,18 +204,22 @@
readTargets(compositeReference, reader);
String promote = reader.getAttributeValue(null, Constants.PROMOTE);
if (promote != null) {
- for (StringTokenizer tokens = new StringTokenizer(promote); tokens.hasMoreTokens();) {
- ComponentReference promotedReference = assemblyFactory.createComponentReference();
+ for (StringTokenizer tokens = new StringTokenizer(promote); tokens
+ .hasMoreTokens();) {
+ ComponentReference promotedReference =
+ assemblyFactory.createComponentReference();
promotedReference.setUnresolved(true);
promotedReference.setName(tokens.nextToken());
- compositeReference.getPromotedReferences().add(promotedReference);
+ compositeReference.getPromotedReferences()
+ .add(promotedReference);
}
}
- compositeReference.setWiredByImpl(getBoolean(reader, WIRED_BY_IMPL));
+ compositeReference
+ .setWiredByImpl(getBoolean(reader, WIRED_BY_IMPL));
composite.getReferences().add(compositeReference);
readPolicies(contract, reader);
}
-
+
} else if (PROPERTY_QNAME.equals(name)) {
if (component != null) {
// Read a <component><property>
@@ -221,49 +231,49 @@
readProperty(componentProperty, reader);
component.getProperties().add(componentProperty);
} else {
-
+
// Read a <composite><property>
property = assemblyFactory.createProperty();
readPolicies(property, reader);
readProperty(property, reader);
composite.getProperties().add(property);
}
-
+
} else if (COMPONENT_QNAME.equals(name)) {
-
+
// Read a <component>
component = assemblyFactory.createComponent();
component.setName(getString(reader, NAME));
component.setConstrainingType(getConstrainingType(reader));
composite.getComponents().add(component);
readPolicies(component, reader);
-
+
} else if (WIRE_QNAME.equals(name)) {
-
+
// Read a <wire>
wire = assemblyFactory.createWire();
ComponentReference source = assemblyFactory.createComponentReference();
source.setUnresolved(true);
source.setName(getString(reader, SOURCE));
wire.setSource(source);
-
+
ComponentService target = assemblyFactory.createComponentService();
target.setUnresolved(true);
target.setName(getString(reader, TARGET));
wire.setTarget(target);
-
+
composite.getWires().add(wire);
readPolicies(wire, reader);
-
+
} else if (CALLBACK_QNAME.equals(name)) {
-
+
// Read a <callback>
callback = assemblyFactory.createCallback();
contract.setCallback(callback);
readPolicies(callback, reader);
-
+
} else if (OPERATION_QNAME.equals(name)) {
-
+
// Read an <operation>
Operation operation = assemblyFactory.createOperation();
operation.setName(getString(reader, NAME));
@@ -274,7 +284,7 @@
readPolicies(contract, operation, reader);
}
} else if (IMPLEMENTATION_COMPOSITE_QNAME.equals(name)) {
-
+
// Read an implementation.composite
Composite implementation = assemblyFactory.createComposite();
implementation.setName(getQName(reader, NAME));
@@ -282,31 +292,33 @@
component.setImplementation(implementation);
readPolicies(implementation, reader);
} else {
-
+
// Read an extension element
Object extension = extensionProcessor.read(reader);
if (extension != null) {
if (extension instanceof InterfaceContract) {
-
+
// <service><interface> and
// <reference><interface>
contract.setInterfaceContract((InterfaceContract)extension);
-
+
} else if (extension instanceof Binding) {
- // <service><binding> and <reference><binding>
+ // <service><binding> and
+ // <reference><binding>
if (callback != null) {
callback.getBindings().add((Binding)extension);
} else {
contract.getBindings().add((Binding)extension);
}
-
+
} else if (extension instanceof Implementation) {
-
+
// <component><implementation>
component.setImplementation((Implementation)extension);
} else {
-
- // Add the extension element to the current element
+
+ // Add the extension element to the current
+ // element
if (callback != null) {
callback.getExtensions().add(extension);
} else if (contract != null) {
@@ -322,13 +334,13 @@
}
}
break;
-
+
case XMLStreamConstants.CHARACTERS:
break;
-
+
case END_ELEMENT:
name = reader.getName();
-
+
// Clear current state when reading reaching end element
if (SERVICE_QNAME.equals(name)) {
componentService = null;
@@ -352,274 +364,302 @@
}
break;
}
-
+
// Read the next element
if (reader.hasNext()) {
reader.next();
}
}
return composite;
-
+
} catch (XMLStreamException e) {
throw new ContributionReadException(e);
}
}
-
- public void write(Composite composite, XMLStreamWriter writer) throws ContributionWriteException {
- try {
- writeStartDocument(writer, COMPOSITE,
- new XAttr(CONSTRAINING_TYPE, getConstrainingTypeAttr(composite)),
- new XAttr(TARGET_NAMESPACE, composite.getName().getNamespaceURI()),
- new XAttr(NAME, composite.getName().getLocalPart()));
-
- for (Service service : composite.getServices()) {
- CompositeService compositeService = (CompositeService)service;
- Component promotedComponent = compositeService.getPromotedComponent();
- ComponentService promotedService = compositeService.getPromotedService();
- String promote;
- if (promotedService != null) {
- if (promotedService.getName() != null) {
- promote = promotedComponent.getName() + '/' + promotedService.getService();
- } else {
- promote = promotedComponent.getName();
- }
- } else {
- promote = null;
- }
- writeStart(writer, SERVICE, new XAttr(NAME, service.getName()), new XAttr(PROMOTE, promote));
+ public void writeComponentReference(ComponentReference reference, XMLStreamWriter writer) throws XMLStreamException,
+ ContributionWriteException {
+ // TODO handle multivalued target attribute
+ String target =
+ reference.getTargets().isEmpty() ? null : reference.getTargets().get(0).getName();
+ writeStart(writer, REFERENCE, new XAttr(NAME, reference.getName()), new XAttr(TARGET,
+ target));
- extensionProcessor.write(service.getInterfaceContract(), writer);
-
- for (Binding binding: service.getBindings()) {
- extensionProcessor.write(binding, writer);
- }
-
- if (service.getCallback() != null) {
- Callback callback = service.getCallback();
- writeStart(writer, CALLBACK);
+ extensionProcessor.write(reference.getInterfaceContract(), writer);
- for (Binding binding: callback.getBindings()) {
- extensionProcessor.write(binding, writer);
- }
- for (Object extension: callback.getExtensions()) {
- extensionProcessor.write(extension, writer);
- }
-
- writeEnd(writer);
- }
-
- for (Object extension: service.getExtensions()) {
- extensionProcessor.write(extension, writer);
- }
-
- writeEnd(writer);
+ for (Binding binding : reference.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
+
+ if (reference.getCallback() != null) {
+ Callback callback = reference.getCallback();
+ writeStart(writer, CALLBACK);
+
+ for (Binding binding : callback.getBindings()) {
+ extensionProcessor.write(binding, writer);
}
+ for (Object extension : callback.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
+ writeEnd(writer);
+ }
+
+ for (Object extension : reference.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
+ writeEnd(writer);
+ }
- for (Component component : composite.getComponents()) {
- writeStart(writer, COMPONENT, new XAttr(NAME, component.getName()));
-
- for (ComponentService service : component.getServices()) {
- writeStart(writer, SERVICE, new XAttr(NAME, service.getName()));
+ public void writeCompositeService(Service service, XMLStreamWriter writer ) throws ContributionWriteException, XMLStreamException {
+ CompositeService compositeService = (CompositeService)service;
+ Component promotedComponent = compositeService.getPromotedComponent();
+ ComponentService promotedService = compositeService.getPromotedService();
+ String promote;
+ if (promotedService != null) {
+ if (promotedService.getName() != null) {
+ promote = promotedComponent.getName() + '/' + promotedService.getService();
+ } else {
+ promote = promotedComponent.getName();
+ }
+ } else {
+ promote = null;
+ }
+ writeStart(writer, SERVICE, new XAttr(NAME, service.getName()), new XAttr(PROMOTE,
+ promote));
- extensionProcessor.write(service.getInterfaceContract(), writer);
+ extensionProcessor.write(service.getInterfaceContract(), writer);
- for (Binding binding: service.getBindings()) {
- extensionProcessor.write(binding, writer);
- }
-
- if (service.getCallback() != null) {
- Callback callback = service.getCallback();
- writeStart(writer, CALLBACK);
+ for (Binding binding : service.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
- for (Binding binding: callback.getBindings()) {
- extensionProcessor.write(binding, writer);
- }
- for (Object extension: callback.getExtensions()) {
- extensionProcessor.write(extension, writer);
- }
-
- writeEnd(writer);
- }
+ if (service.getCallback() != null) {
+ Callback callback = service.getCallback();
+ writeStart(writer, CALLBACK);
- for (Object extension: service.getExtensions()) {
- extensionProcessor.write(extension, writer);
- }
-
- writeEnd(writer);
- }
-
- for (ComponentReference reference : component.getReferences()) {
- // TODO handle multivalued target attribute
- String target = reference.getTargets().isEmpty() ? null : reference.getTargets().get(0).getName();
- writeStart(writer, REFERENCE,
- new XAttr(NAME, reference.getName()),
- new XAttr(TARGET,target));
-
- extensionProcessor.write(reference.getInterfaceContract(), writer);
-
- for (Binding binding: reference.getBindings()) {
- extensionProcessor.write(binding, writer);
- }
-
- if (reference.getCallback() != null) {
- Callback callback = reference.getCallback();
- writeStart(writer, CALLBACK);
+ for (Binding binding : callback.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
+ for (Object extension : callback.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
- for (Binding binding: callback.getBindings()) {
- extensionProcessor.write(binding, writer);
- }
- for (Object extension: callback.getExtensions()) {
- extensionProcessor.write(extension, writer);
- }
-
- writeEnd(writer);
- }
+ writeEnd(writer);
+ }
- for (Object extension: reference.getExtensions()) {
- extensionProcessor.write(extension, writer);
- }
-
- writeEnd(writer);
- }
-
- for (ComponentProperty property : component.getProperties()) {
- writeStart(writer, PROPERTY, new XAttr(NAME, property.getName()));
- for (Object extension: property.getExtensions()) {
- extensionProcessor.write(extension, writer);
- }
- writeEnd(writer);
- }
+ for (Object extension : service.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
- // Write the component implementation
- Implementation implementation = component.getImplementation();
- if (implementation instanceof Composite) {
- writeStart(writer, IMPLEMENTATION_COMPOSITE,
- new XAttr(NAME, composite.getName()));
- writeEnd(writer);
- } else {
- extensionProcessor.write(component.getImplementation(), writer);
- }
+ writeEnd(writer);
+ }
- writeEnd(writer);
+ public void writeComponentService(ComponentService service, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+ writeStart(writer, SERVICE, new XAttr(NAME, service.getName()));
+
+ extensionProcessor.write(service.getInterfaceContract(), writer);
+
+ for (Binding binding : service.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
+
+ if (service.getCallback() != null) {
+ Callback callback = service.getCallback();
+ writeStart(writer, CALLBACK);
+
+ for (Binding binding : callback.getBindings()) {
+ extensionProcessor.write(binding, writer);
}
+ for (Object extension : callback.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
+ writeEnd(writer);
+ }
+
+ for (Object extension : service.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
+ writeEnd(writer);
+ }
- for (Reference reference : composite.getReferences()) {
- // TODO handle multivalued promote attribute
- CompositeReference compositeReference = (CompositeReference)reference;
- String promote;
- if (!compositeReference.getPromotedReferences().isEmpty())
- promote = compositeReference.getPromotedReferences().get(0).getName();
- else
- promote = null;
- writeStart(writer, REFERENCE,
- new XAttr(NAME, reference.getName()),
- new XAttr(PROMOTE, promote));
-
- extensionProcessor.write(reference.getInterfaceContract(), writer);
-
- for (Binding binding: reference.getBindings()) {
- extensionProcessor.write(binding, writer);
- }
-
- if (reference.getCallback() != null) {
- Callback callback = reference.getCallback();
- writeStart(writer, CALLBACK);
+ public void writeComponent(Composite composite, Component component, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+ writeStart(writer, COMPONENT, new XAttr(NAME, component.getName()));
- for (Binding binding: callback.getBindings()) {
- extensionProcessor.write(binding, writer);
- }
- for (Object extension: callback.getExtensions()) {
- extensionProcessor.write(extension, writer);
- }
-
- writeEnd(writer);
- }
+ for (ComponentService service : component.getServices()) {
+ writeComponentService(service, writer);
+ }
- for (Object extension: reference.getExtensions()) {
- extensionProcessor.write(extension, writer);
- }
-
- writeEnd(writer);
+ for (ComponentReference reference : component.getReferences()) {
+ writeComponentReference(reference, writer);
+ }
+
+ for (ComponentProperty property : component.getProperties()) {
+ writeStart(writer, PROPERTY, new XAttr(NAME, property.getName()));
+ for (Object extension : property.getExtensions()) {
+ extensionProcessor.write(extension, writer);
}
+ writeEnd(writer);
+ }
+
+ // Write the component implementation
+ Implementation implementation = component.getImplementation();
+ if (implementation instanceof Composite) {
+ writeStart(writer, IMPLEMENTATION_COMPOSITE, new XAttr(NAME, composite
+ .getName()));
+ writeEnd(writer);
+ } else {
+ extensionProcessor.write(component.getImplementation(), writer);
+ }
+
+ writeEnd(writer);
+ }
+
+ public void writeCompositeReference(Reference reference, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+ //TODO handle multivalued promote attribute
+ CompositeReference compositeReference = (CompositeReference)reference;
+ String promote;
+ if (!compositeReference.getPromotedReferences().isEmpty())
+ promote = compositeReference.getPromotedReferences().get(0).getName();
+ else
+ promote = null;
+ writeStart(writer,
+ REFERENCE,
+ new XAttr(NAME, reference.getName()),
+ new XAttr(PROMOTE, promote));
+
+ extensionProcessor.write(reference.getInterfaceContract(), writer);
+
+ for (Binding binding : reference.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
+
+ if (reference.getCallback() != null) {
+ Callback callback = reference.getCallback();
+ writeStart(writer, CALLBACK);
+
+ for (Binding binding : callback.getBindings()) {
+ extensionProcessor.write(binding, writer);
+ }
+ for (Object extension : callback.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
+ writeEnd(writer);
+ }
+
+ for (Object extension : reference.getExtensions()) {
+ extensionProcessor.write(extension, writer);
+ }
+
+ writeEnd(writer);
+ }
+ public void write(Composite composite, XMLStreamWriter writer) throws ContributionWriteException {
+
+ try {
+ writeStartDocument(writer,
+ COMPOSITE,
+ new XAttr(CONSTRAINING_TYPE, getConstrainingTypeAttr(composite)),
+ new XAttr(TARGET_NAMESPACE, composite.getName().getNamespaceURI()),
+ new XAttr(NAME, composite.getName().getLocalPart()));
+
+ for (Service service : composite.getServices()) {
+ writeCompositeService(service, writer);
+ }
+
+ for (Component component : composite.getComponents()) {
+ writeComponent(composite, component, writer);
+ }
+
+ for (Reference reference : composite.getReferences()) {
+ writeCompositeReference(reference, writer);
+ }
+
for (Property property : composite.getProperties()) {
writeStart(writer, PROPERTY, new XAttr(NAME, property.getName()));
- for (Object extension: property.getExtensions()) {
+ for (Object extension : property.getExtensions()) {
extensionProcessor.write(extension, writer);
}
-
+
writeEnd(writer);
}
-
+
for (Wire wire : composite.getWires()) {
- writeStart(writer, WIRE, new XAttr(SOURCE, wire.getSource().getName()), new XAttr(TARGET, wire
- .getTarget().getName()));
+ writeStart(writer,
+ WIRE,
+ new XAttr(SOURCE, wire.getSource().getName()),
+ new XAttr(TARGET, wire.getTarget().getName()));
for (Object extension : wire.getExtensions()) {
extensionProcessor.write(extension, writer);
}
writeEnd(writer);
}
-
- for (Object extension: composite.getExtensions()) {
+
+ for (Object extension : composite.getExtensions()) {
extensionProcessor.write(extension, writer);
}
-
+
writeEndDocument(writer);
-
+
} catch (XMLStreamException e) {
throw new ContributionWriteException(e);
}
}
-
+
public void resolve(Composite composite, ModelResolver resolver) throws ContributionResolveException {
-
+
// Resolve constraining type
- ConstrainingType constrainingType = composite.getConstrainingType();
- if (constrainingType != null ) {
- constrainingType = resolver.resolveModel(ConstrainingType.class, constrainingType);
+ ConstrainingType constrainingType = composite.getConstrainingType();
+ if (constrainingType != null) {
+ constrainingType = resolver.resolveModel(ConstrainingType.class, constrainingType);
composite.setConstrainingType(constrainingType);
}
-
+
// Resolve includes in the composite
for (int i = 0, n = composite.getIncludes().size(); i < n; i++) {
Composite include = composite.getIncludes().get(i);
if (include != null) {
include = resolver.resolveModel(Composite.class, include);
- composite.getIncludes().set(i, include);
+ composite.getIncludes().set(i, include);
}
}
- // resolve and extensions to the standard SCDL that appear in the
- // SCDL.
+ // resolve and extensions to the standard SCDL that appear in the
+ // SCDL.
for (int i = 0, n = composite.getExtensions().size(); i < n; i++) {
Object model = composite.getExtensions().get(i);
if (model != null) {
- extensionProcessor.resolve(model, resolver);
+ extensionProcessor.resolve(model, resolver);
}
}
-
- // Resolve component implementations, services and references
- for (Component component: composite.getComponents()) {
- constrainingType = component.getConstrainingType();
+
+ // Resolve component implementations, services and references
+ for (Component component : composite.getComponents()) {
+ constrainingType = component.getConstrainingType();
if (constrainingType != null) {
- constrainingType = resolver.resolveModel(ConstrainingType.class, constrainingType);
- component.setConstrainingType(constrainingType);
+ constrainingType = resolver.resolveModel(ConstrainingType.class, constrainingType);
+ component.setConstrainingType(constrainingType);
}
Implementation implementation = component.getImplementation();
if (implementation != null) {
implementation = resolveImplementation(implementation, resolver);
- component.setImplementation(implementation);
+ component.setImplementation(implementation);
}
-
+
for (ComponentProperty componentProperty : component.getProperties()) {
- if ( componentProperty.getFile() != null ) {
- DeployedArtifact deployedArtifact = contributionFactory.createDeployedArtifact();
+ if (componentProperty.getFile() != null) {
+ DeployedArtifact deployedArtifact =
+ contributionFactory.createDeployedArtifact();
deployedArtifact.setURI(componentProperty.getFile());
- deployedArtifact = resolver.resolveModel(DeployedArtifact.class, deployedArtifact);
- if ( deployedArtifact.getLocation() != null ) {
+ deployedArtifact =
+ resolver.resolveModel(DeployedArtifact.class, deployedArtifact);
+ if (deployedArtifact.getLocation() != null) {
componentProperty.setFile(deployedArtifact.getLocation());
}
}
@@ -629,11 +669,11 @@
resolveContracts(component.getServices(), resolver);
resolveContracts(component.getReferences(), resolver);
}
-
+
// Resolve composite services and references
resolveContracts(composite.getServices(), resolver);
resolveContracts(composite.getReferences(), resolver);
- if ( composite instanceof PolicySetAttachPoint ) {
+ if (composite instanceof PolicySetAttachPoint) {
resolveIntents(((PolicySetAttachPoint)composite).getRequiredIntents(), resolver);
resolvePolicySets(((PolicySetAttachPoint)composite).getPolicySets(), resolver);
}
@@ -642,7 +682,7 @@
public QName getArtifactType() {
return COMPOSITE_QNAME;
}
-
+
public Class<Composite> getModelType() {
return Composite.class;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org