You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/04/27 11:31:34 UTC
svn commit: r533033 - in /incubator/tuscany/java/sca/modules:
assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java
assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java
Author: jsdelfino
Date: Fri Apr 27 02:31:33 2007
New Revision: 533033
URL: http://svn.apache.org/viewvc?view=rev&rev=533033
Log:
Removed CompositeUtil.configure() and changed CompositeProcessor to call the individual configuration methods directly.
Modified:
incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java
Modified: incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java?view=diff&rev=533033&r1=533032&r2=533033
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/assembly/xml/CompositeProcessor.java Fri Apr 27 02:31:33 2007
@@ -518,7 +518,16 @@
}
};
- compositeUtil.configure(problems);
+
+ // Collect and fuse includes
+ compositeUtil.fuseIncludes(problems);
+
+ // Configure all components
+ compositeUtil.configureComponents(problems);
+
+ //FIXME this should be done only on top level deployable composites
+ // Wire references
+ compositeUtil.wireReferences(problems);
// Uncommenting the following three lines can be useful to detect
// and troubleshoot SCA assembly XML composite configuration
Modified: incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java?view=diff&rev=533033&r1=533032&r2=533033
==============================================================================
--- incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java (original)
+++ incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/assembly/util/CompositeUtil.java Fri Apr 27 02:31:33 2007
@@ -81,22 +81,6 @@
}
/**
- * Configure a composite.
- * @param problems
- */
- public void configure(List<Base> problems) {
-
- // Collect and fuse includes
- fuseIncludes(problems);
-
- // Configure all components
- configureComponents(problems);
-
- // Wire all references
- wireReferences(problems);
- }
-
- /**
* Collect all includes in a graph of includes
* @param composite
* @param includes
@@ -113,7 +97,7 @@
* @param composite
* @param includes
*/
- private void fuseIncludes(List<Base> problems) {
+ public void fuseIncludes(List<Base> problems) {
// First collect all includes
List<Composite> includes = new ArrayList<Composite>();
@@ -362,7 +346,7 @@
* Configure components in the composite.
* @param problems
*/
- private void configureComponents(List<Base> problems) {
+ public void configureComponents(List<Base> problems) {
// Initialize all component services and references
Map<String, Component> components = new HashMap<String, Component>();
@@ -722,7 +706,7 @@
*
* @param problems
*/
- private void wireReferences(List<Base> problems) {
+ public void wireReferences(List<Base> problems) {
// Index and bind all component services and references
Map<String, ComponentService> componentServices = new HashMap<String, ComponentService>();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org