svn commit: r817707 - /tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java

[sl...@apache.org]

Author: slaws
Date: Tue Sep 22 15:55:01 2009
New Revision: 817707

URL: http://svn.apache.org/viewvc?rev=817707&view=rev
Log:
Add reference promotion builder back in. Need to decide what to do with it. Also add some other comments. 

Modified:
    tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java

Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java?rev=817707&r1=817706&r2=817707&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java Tue Sep 22 15:55:01 2009
@@ -44,6 +44,7 @@
     private ComponentReferenceBindingBuilderImpl componentReferenceBindingBuilder;
     private EndpointBuilderImpl endpointBuilder;
     private EndpointReferenceBuilderImpl endpointReferenceBuilder;
+    private ComponentReferencePromotionBuilderImpl componentReferencePromotionBuilder;
     private CompositePolicyBuilderImpl compositePolicyBuilder;
  
     /**
@@ -67,6 +68,7 @@
         componentReferenceBindingBuilder = new ComponentReferenceBindingBuilderImpl(registry);
         endpointBuilder = new EndpointBuilderImpl(registry);
         endpointReferenceBuilder = new EndpointReferenceBuilderImpl(registry);
+        componentReferencePromotionBuilder = new ComponentReferencePromotionBuilderImpl(registry);
         compositePolicyBuilder = new CompositePolicyBuilderImpl(registry);
 
     }
@@ -90,6 +92,8 @@
             // 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 @@
             // 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);