Template for reorganization of the builders.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@801592 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 449 insertions, 17 deletions

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentBuilderImpl.java
new file mode 100644
index 0000000000..2be900d3b5
--- /dev/null
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentBuilderImpl.java
@@ -0,0 +1,118 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.assembly.builder.impl;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.TransformerFactory;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.assembly.SCABindingFactory;
+import org.apache.tuscany.sca.assembly.Service;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderTmp;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.definitions.Definitions;
+import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+
+/**
+ * 
+ * @version $Rev$ $Date$
+ */
+public class ComponentBuilderImpl {
+    private static final Logger logger = Logger.getLogger(ComponentBuilderImpl.class.getName());
+
+    private ComponentTypeBuilderImpl componentTypeBuilder;
+    private Monitor monitor;
+    
+    public ComponentBuilderImpl(Monitor monitor) {
+        this.monitor = monitor;
+    }
+    
+    public void setComponentTypeBuilder(ComponentTypeBuilderImpl componentTypeBuilder){
+        this.componentTypeBuilder = componentTypeBuilder;
+    }
+
+    public void configureComponentFromComponentType(Component component){
+        ComponentType componentType = createComponentType(component);
+        
+        // services
+        configureServices(component, componentType);
+        
+        // references
+        //configureReferences(component, componentType);
+        
+        // properties
+        //configureProperties(component, componentType);
+        
+    }
+       
+    private ComponentType createComponentType(Component component){
+        Implementation implementation = component.getImplementation();
+        ComponentType componentType = (ComponentType)implementation;
+        if (implementation instanceof Composite) {
+            componentType = componentTypeBuilder.createComponentType((Composite)implementation);
+        }
+        return componentType;
+    }
+    
+    private void configureServices(Component component, ComponentType componentType){
+        for (ComponentService componentService : component.getServices()) {
+            if (componentService.getService() != null || componentService.isForCallback()) {
+                continue;
+            }
+            
+            Service service = componentType.getService(componentService.getName());
+            
+            if (service != null) {
+                componentService.setService(service);
+            } else {
+                Monitor.error(monitor, 
+                              this, 
+                              "assembly-validation-messages", 
+                              "ServiceNotFoundForComponentService",
+                              component.getName(),
+                              componentService.getName());
+            }
+            
+            // need to propagate
+            //   bindings
+            //   interface contracts
+            //   intents
+            //   policy sets
+            // based on OASIS rules
+        }
+    }
+    
+    // etc.
+
+} //end class
diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentTypeBuilderImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentTypeBuilderImpl.java
new file mode 100644
index 0000000000..1f6a1bf792
--- /dev/null
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentTypeBuilderImpl.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.assembly.builder.impl;
+
+import java.util.logging.Logger;
+
+import org.apache.tuscany.sca.assembly.Component;
+import org.apache.tuscany.sca.assembly.ComponentService;
+import org.apache.tuscany.sca.assembly.ComponentType;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.Implementation;
+import org.apache.tuscany.sca.assembly.builder.ComponentPreProcessor;
+import org.apache.tuscany.sca.monitor.Monitor;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ComponentTypeBuilderImpl {
+    private static final Logger logger = Logger.getLogger(ComponentTypeBuilderImpl.class.getName());
+    
+    private ComponentBuilderImpl componentBuilder;
+    private Monitor monitor;
+
+    public ComponentTypeBuilderImpl(Monitor monitor) {
+        this.monitor = monitor;
+    }
+    
+    public void setComponentBuilder(ComponentBuilderImpl componentBuilder){
+        this.componentBuilder = componentBuilder;
+    }
+
+    public ComponentType createComponentType(Implementation implementation){
+        if (!(implementation instanceof Composite)){
+            // component type will have been calculated at resolve time
+            return implementation;
+        }
+        
+        // create the composite component type as this was not
+        // calculated at resolve time
+        Composite composite = (Composite)implementation;
+        
+        // make sure that the component has been properly configured based
+        // on its component type
+        for (Component component : composite.getComponents()) {
+            
+            // Check for duplicate component names
+            if (composite.getComponent(component.getName()) == null) {
+                Monitor.error(monitor, 
+                              this, 
+                              "assembly-validation-messages", 
+                              "DuplicateComponentName", 
+                              composite.getName().toString(),
+                              component.getName());
+            } 
+            
+            // Propagate the autowire flag from the composite to components
+            // Should this be later?
+            if (component.getAutowire() == null) {
+                component.setAutowire(composite.getAutowire());
+            }
+            
+            // do any require pre-processing on the implementation
+            // what does this do?
+            if (component.getImplementation() instanceof ComponentPreProcessor) {
+                ((ComponentPreProcessor)component.getImplementation()).preProcess(component);
+            }
+            
+            // services
+            calculateServices(composite, component);
+            
+            // references
+            //calculateReferences(composite, component);
+            
+            // properties
+            //calculateProperties(composite, component);
+        }
+        
+        // create the composite component type based on the promoted artifacts
+        // from the components that it contains
+        
+        return composite;
+    }
+    
+    private void calculateServices(ComponentType componentType, Component component){
+        for (ComponentService componentService : component.getServices()) {
+            // need to propagate
+            //   bindings
+            //   interface contracts
+            //   intents
+            //   policy sets
+            // based on OASIS rules
+        }
+    }
+
+} //end class
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
new file mode 100644
index 0000000000..70b74d6642
--- /dev/null
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ModelBuilderImpl.java
@@ -0,0 +1,219 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.assembly.builder.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Logger;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Composite;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderException;
+import org.apache.tuscany.sca.assembly.builder.CompositeBuilderTmp;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.core.UtilityExtensionPoint;
+import org.apache.tuscany.sca.definitions.Definitions;
+import org.apache.tuscany.sca.monitor.Monitor;
+import org.apache.tuscany.sca.monitor.MonitorFactory;
+
+public class ModelBuilderImpl implements CompositeBuilder, CompositeBuilderTmp {
+    private static final Logger logger = Logger.getLogger(ModelBuilderImpl.class.getName());
+    private CompositeBuilder compositeIncludeBuilder;
+    private CompositeBuilder compositeCloneBuilder;
+    private ComponentTypeBuilderImpl componentTypeBuilder;
+    private ComponentBuilderImpl componentBuilder;
+
+/*    
+    private CompositeBuilder componentConfigurationBuilder;
+    private CompositeBuilder compositePromotionBuilder;
+    private CompositeBuilder componentReferenceWireBuilder;
+    private CompositeBuilder componentReferencePromotionBuilder;
+    private CompositeBuilder compositeServiceConfigurationBuilder;
+    private CompositeBuilder compositeReferenceConfigurationBuilder;
+    private CompositeBuilder compositeBindingURIBuilder;
+    private CompositeBuilder compositePolicyBuilder;
+    private CompositeBuilder componentServiceBindingBuilder;
+    private CompositeBuilder componentReferenceBindingBuilder;
+    private CompositeBuilder componentReferenceEndpointReferenceBuilder;
+    private CompositeBuilder componentServiceEndpointBuilder;
+*/    
+
+
+
+    /**
+     * Constructs a new composite builder.
+     * 
+     * @param assemblyFactory
+     * @param scaBindingFactory
+     * @param endpointFactory
+     * @param intentAttachPointTypeFactory
+     * @param interfaceContractMapper
+     * @param policyDefinitions
+     * @param monitor
+     */
+    public ModelBuilderImpl(ExtensionPointRegistry registry) {
+        
+        FactoryExtensionPoint modelFactories = registry.getExtensionPoint(FactoryExtensionPoint.class);
+        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
+        
+        UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
+        MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
+        Monitor monitor = monitorFactory.createMonitor();
+        
+        compositeIncludeBuilder = new CompositeIncludeBuilderImpl(assemblyFactory);
+        compositeCloneBuilder = new CompositeCloneBuilderImpl();
+        
+        componentTypeBuilder = new ComponentTypeBuilderImpl(monitor);
+        componentBuilder = new ComponentBuilderImpl(monitor);
+        
+        componentTypeBuilder.setComponentBuilder(componentBuilder);
+        componentBuilder.setComponentTypeBuilder(componentTypeBuilder);
+        
+        
+/*        
+        compositePromotionBuilder = new CompositePromotionBuilderImpl(assemblyFactory, interfaceContractMapper);
+        componentConfigurationBuilder =
+            new ComponentConfigurationBuilderImpl(assemblyFactory, scaBindingFactory, documentBuilderFactory,
+                                                  transformerFactory, interfaceContractMapper);  
+        componentReferenceWireBuilder = new ComponentReferenceWireBuilderImpl(assemblyFactory, interfaceContractMapper);
+        componentReferencePromotionBuilder = new ComponentReferencePromotionBuilderImpl(assemblyFactory);
+       
+        compositeServiceConfigurationBuilder = new CompositeServiceConfigurationBuilderImpl(assemblyFactory);
+        compositeReferenceConfigurationBuilder = new CompositeReferenceConfigurationBuilderImpl(assemblyFactory);
+        compositeBindingURIBuilder =
+            new CompositeBindingURIBuilderImpl(assemblyFactory, scaBindingFactory, documentBuilderFactory,
+                                               transformerFactory, interfaceContractMapper);
+
+        compositePolicyBuilder = new CompositePolicyBuilderImpl(assemblyFactory, interfaceContractMapper);
+        componentServiceBindingBuilder = new ComponentServiceBindingBuilderImpl();
+        componentReferenceBindingBuilder = new ComponentReferenceBindingBuilderImpl();
+
+        componentReferenceEndpointReferenceBuilder =
+            new ComponentReferenceEndpointReferenceBuilderImpl(assemblyFactory, interfaceContractMapper);
+        componentServiceEndpointBuilder = new ComponentServiceEndpointBuilderImpl(assemblyFactory);
+*/
+    }
+
+    public String getID() {
+        return "org.apache.tuscany.sca.assembly.builder.CompositeBuilder";
+    }
+
+    public void build(Composite composite, Definitions definitions, Monitor monitor) throws CompositeBuilderException {
+        build(composite, definitions, null, monitor);
+    }
+
+    public void build(Composite composite,
+                      Definitions definitions,
+                      Map<QName, List<String>> bindingBaseURIs,
+                      Monitor monitor) throws CompositeBuilderException {
+
+        try {
+            // Collect and fuse includes. Copy all of the components
+            // out of the included composite into the including composite
+            // and discards the included composite
+            compositeIncludeBuilder.build(composite, definitions, monitor);
+            
+            // 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
+            // TODO - could this be deferred to after the static pass through
+            //        the model is complete
+            compositeCloneBuilder.build(composite, definitions, monitor);
+            
+            // create the static model by calculating the component type for the
+            // top level implementation (composite). This has the effect of
+            // recursively calculating component types and configuring the 
+            // components that depend on them
+            componentTypeBuilder.createComponentType(composite);
+
+            // create the runtime model by updating the static model we have just 
+            // created. This involves things like creating
+            //  component URIs
+            //  binding URIs
+            //  Endpoints
+            //  Endoint References
+            
+            
+
+/*            
+            // Configure all components. Created any derived model elements that
+            // are required. Specifically
+            //  Component name
+            //  autowire flags
+            //  callback references
+            //  callback services
+            //  default bindings
+            componentConfigurationBuilder.build(composite, definitions, monitor);
+            
+            // Connect composite services/references to promoted services/references
+            // so that subsequent processing can navigate down the hierarchy
+            compositePromotionBuilder.build(composite, definitions, monitor);
+
+            // calculate the component type for the composite that was passed in
+            // this involves 
+            
+
+            // Configure composite services by copying bindings up the promotion
+            // hierarchy overwriting automatic bindings with those added manually
+            compositeServiceConfigurationBuilder.build(composite, definitions, monitor);
+
+            // Configure composite references by copying bindings down promotion
+            // hierarchy overwriting automatic bindings with those added manually
+            compositeReferenceConfigurationBuilder.build(composite, definitions, monitor);
+
+            // Configure service binding URIs and names. Creates an SCA defined URI based
+            // on the scheme base URI, the component name and the binding name
+            ((CompositeBuilderTmp)compositeBindingURIBuilder).build(composite, definitions, bindingBaseURIs, monitor);
+
+            // Perform and service binding related build activities. The binding
+            // will provide the builder. 
+            componentServiceBindingBuilder.build(composite, definitions, monitor);
+
+            // create endpoints on component services. 
+            componentServiceEndpointBuilder.build(composite, definitions, monitor);
+
+            // Apply any wires in the composite to create new component reference targets
+            componentReferenceWireBuilder.build(composite, definitions, monitor);
+
+            // create reference endpoint reference models
+            componentReferenceEndpointReferenceBuilder.build(composite, definitions, monitor);
+
+            // Push down configuration from promoted references to the 
+            // references they promote
+            componentReferencePromotionBuilder.build(composite, definitions, monitor);
+
+
+            // Perform and reference binding related build activities. The binding
+            // will provide the builder.
+            componentReferenceBindingBuilder.build(composite, definitions, monitor);
+
+            // Compute the policies across the model hierarchy
+            compositePolicyBuilder.build(composite, definitions, monitor);
+*/            
+        } catch (Exception e) {
+            throw new CompositeBuilderException("Exception while building model " + composite.getName(), e);
+        } // end try
+
+    } // end method build
+
+} //end class
diff --git a/java/sca/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder b/java/sca/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
index b7ba756879..ded09d4b23 100644
--- a/java/sca/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
+++ b/java/sca/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.CompositeBuilder
@@ -15,21 +15,5 @@
 # specific language governing permissions and limitations

 # under the License. 

 

-org.apache.tuscany.sca.assembly.builder.impl.ComponentConfigurationBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.ComponentConfigurationBuilder

-org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceBindingBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.ComponentReferenceBindingBuilder

-org.apache.tuscany.sca.assembly.builder.impl.ComponentReferencePromotionWireBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.ComponentReferencePromotionWireBuilder

-org.apache.tuscany.sca.assembly.builder.impl.ComponentReferenceWireBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.ComponentReferenceWireBuilder

-org.apache.tuscany.sca.assembly.builder.impl.ComponentServiceBindingBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.ComponentServiceBindingBuilder

-org.apache.tuscany.sca.assembly.builder.impl.ComponentServicePromotionBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.ComponentServicePromotionBuilder

-org.apache.tuscany.sca.assembly.builder.impl.CompositeBindingURIBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositeBindingURIBuilder

+#org.apache.tuscany.sca.assembly.builder.impl.ModelBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositeBuilder

 org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositeBuilder

-org.apache.tuscany.sca.assembly.builder.impl.CompositeCloneBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositeCloneBuilder

-org.apache.tuscany.sca.assembly.builder.impl.CompositeIncludeBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositeIncludeBuilder

-org.apache.tuscany.sca.assembly.builder.impl.CompositePolicyBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositePolicyBuilder

-org.apache.tuscany.sca.assembly.builder.impl.CompositePromotionBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositePromotionBuilder

-org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceConfigurationBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositeReferenceConfigurationBuilder

-org.apache.tuscany.sca.assembly.builder.impl.CompositeReferenceWireBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositeReferenceWireBuilder

-org.apache.tuscany.sca.assembly.builder.impl.CompositeServiceBindingBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositeServiceBindingBuilder

-org.apache.tuscany.sca.assembly.builder.impl.CompositeServiceConfigurationBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositeServiceConfigurationBuilder

-org.apache.tuscany.sca.assembly.builder.impl.CompositeServicePromotionBuilderImpl;id=org.apache.tuscany.sca.assembly.builder.CompositeServicePromotionBuilder

-org.apache.tuscany.sca.assembly.builder.impl.CompositeBindingConfigurationBuilderImpl;id=org.apache.tuscany.assembly.builder.CompositeBindingConfigurationBuilder