diff options
| -rw-r--r-- | java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java index 7feae14ed4..514967af9c 100644 --- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java +++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java @@ -44,6 +44,7 @@ public class ModelBuilderImpl implements CompositeBuilder, DeployedCompositeBuil private ComponentReferenceBindingBuilderImpl componentReferenceBindingBuilder; private EndpointBuilderImpl endpointBuilder; private EndpointReferenceBuilderImpl endpointReferenceBuilder; + private ComponentReferencePromotionBuilderImpl componentReferencePromotionBuilder; private CompositePolicyBuilderImpl compositePolicyBuilder; /** @@ -67,6 +68,7 @@ public class ModelBuilderImpl implements CompositeBuilder, DeployedCompositeBuil componentReferenceBindingBuilder = new ComponentReferenceBindingBuilderImpl(registry); endpointBuilder = new EndpointBuilderImpl(registry); endpointReferenceBuilder = new EndpointReferenceBuilderImpl(registry); + componentReferencePromotionBuilder = new ComponentReferencePromotionBuilderImpl(registry); compositePolicyBuilder = new CompositePolicyBuilderImpl(registry); } @@ -90,6 +92,8 @@ public class ModelBuilderImpl implements CompositeBuilder, DeployedCompositeBuil // and discards the included composite compositeIncludeBuilder.build(composite, definitions, monitor); + // need to apply policy external attachment + // Expand nested composites. Clone any composite model that // is acting as a component implementation and connects the cloned // model to the component implementation in question @@ -114,11 +118,12 @@ public class ModelBuilderImpl implements CompositeBuilder, DeployedCompositeBuil // TODO - called here at the moment but we could have a separate build phase // to call these. Also we need to re-org these builders bindingURIBuilder.configureBindingURIsAndNames(composite, definitions, monitor); - componentServiceBindingBuilder.build(composite, definitions, monitor); - componentReferenceBindingBuilder.build(composite, definitions, monitor); + componentServiceBindingBuilder.build(composite, definitions, monitor); // binding specific build + componentReferenceBindingBuilder.build(composite, definitions, monitor); // binding specific build endpointBuilder.build(composite, definitions, monitor); endpointReferenceBuilder.build(composite, definitions, monitor); - compositePolicyBuilder.build(composite, definitions, monitor); + componentReferencePromotionBuilder.build(composite, definitions, monitor); // move into the static build? + compositePolicyBuilder.build(composite, definitions, monitor); // the rest of the policy processing? } catch (Exception e) { throw new CompositeBuilderException("Exception while building model " + composite.getName(), e); |