You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/08/27 19:58:55 UTC
svn commit: r808555 - in
/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl:
ComponentBuilderImpl.java ComponentTypeBuilderImpl.java ModelBuilderImpl.java
Author: slaws
Date: Thu Aug 27 17:58:54 2009
New Revision: 808555
URL: http://svn.apache.org/viewvc?rev=808555&view=rev
Log:
backing up a few minor changes. This version of the builders not in use.
Modified:
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentBuilderImpl.java
tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentTypeBuilderImpl.java
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/ComponentBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentBuilderImpl.java?rev=808555&r1=808554&r2=808555&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentBuilderImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentBuilderImpl.java Thu Aug 27 17:58:54 2009
@@ -55,11 +55,11 @@
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.policy.ExtensionType;
+import org.apache.tuscany.sca.policy.Intent;
import org.apache.tuscany.sca.policy.PolicyFactory;
import org.apache.tuscany.sca.policy.PolicySubject;
/**
- *
* @version $Rev$ $Date$
*/
public class ComponentBuilderImpl {
@@ -115,7 +115,7 @@
// properties
//configureProperties(component);
-
+
}
/**
@@ -162,11 +162,16 @@
componentService);
-
- // need to propagate
- // intents
- // policy sets
- // based on OASIS rules
+ // intents - done in CompositePolicyBuilder
+ // discuss with RF
+ //calculateIntents(componentService,
+ // componentTypeService);
+
+ // policy sets - done in CompositePolicyBuilder
+ // discuss with RF
+ // calculatePolicySets(componentService,
+ // componentTypeService);
+
}
}
@@ -352,7 +357,7 @@
} // end if
service.setCallbackReference(callbackReference);
}
- }
+ }
/**
* Create a default SCA binding in the case that no binding
Modified: tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentTypeBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentTypeBuilderImpl.java?rev=808555&r1=808554&r2=808555&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentTypeBuilderImpl.java (original)
+++ tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ComponentTypeBuilderImpl.java Thu Aug 27 17:58:54 2009
@@ -112,6 +112,8 @@
component.getName());
}
+ /* process structural hierarchy
+ * replace by structuralParent links and associated processing
// Push down the autowire flag from the composite to components
if (component.getAutowire() == null) {
component.setAutowire(composite.getAutowire());
@@ -120,6 +122,8 @@
// what else needs pushing down?
// intents
// policySets
+
+ */
// configure the component from its component type
componentBuilder.configureComponentFromComponentType(component);
@@ -144,6 +148,9 @@
// properties
//calculateProperties(composite);
+ // autowire
+ //calculateAutowire(composite);
+
}
/**
@@ -210,7 +217,7 @@
Map<String, Component> components,
Map<String, ComponentService> componentServices){
- // Connect this component types services to the
+ // Connect this component type's services to the
// services from child components which it promotes
connectPromotedServices(componentType,
components,
@@ -230,8 +237,10 @@
calculatePromotedBindings(compositeService, promotedComponentService);
// promote intents
+ // calculatePromotedIntents(compositeService, promotedComponentService);
// promote policy sets
+ // calculatePromotedPolicySets(compositeService, promotedComponentService);
}
@@ -292,7 +301,7 @@
}
/**
- * OASIS RULE: Interface contract from higher in the hierarchy takes precedence
+ * OASIS RULE: Interface contracts from higher in the implementation hierarchy takes precedence
*
* @param compositeService
* @param promotedComponentService
@@ -322,7 +331,7 @@
}
/**
- * OASIS RULE: Bindings from higher in the hierarchy take precedence
+ * OASIS RULE: Bindings from higher in the implementation hierarchy take precedence
*
* @param compositeService
* @param promotedComponentService
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=808555&r1=808554&r2=808555&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 Thu Aug 27 17:58:54 2009
@@ -136,22 +136,27 @@
// 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
+ // Process the implementation hierarchy 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
+ // callback references
+ // callback services
// Endpoints
// Endoint References
+ // runtimeBuilder.build(composite);
+
+ // Compute the policies across the model hierarchy
+ //compositePolicyBuilder.build(composite, definitions, monitor);