You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by va...@apache.org on 2008/11/05 13:05:46 UTC
svn commit: r711556 -
/geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
Author: vamsic007
Date: Wed Nov 5 04:05:46 2008
New Revision: 711556
URL: http://svn.apache.org/viewvc?rev=711556&view=rev
Log:
Build, activate and start the domainComposite with each new contribution to allow wiring between contributions. This change affects "clean" stop of individual contributions.
Modified:
geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
Modified: geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java?rev=711556&r1=711555&r2=711556&view=diff
==============================================================================
--- geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java (original)
+++ geronimo/plugins/tuscany/trunk/geronimo-tuscany/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java Wed Nov 5 04:05:46 2008
@@ -94,21 +94,26 @@
}
}
+ // Build, activate and start the domainComposite with each new contribution to allow wiring between
+ // contributions. This change affects "clean" stop of individual contributions.
// Add the composites
for(Composite composite: composites) {
eScaDomain.getDomainComposite().getIncludes().add(composite);
- eScaDomain.buildComposite(composite);
+ //eScaDomain.buildComposite(composite);
}
+ eScaDomain.buildComposite(eScaDomain.getDomainComposite());
// Activate the composites
- for(Composite composite: composites) {
- eScaDomain.getCompositeActivator().activate(composite);
- }
+ //for(Composite composite: composites) {
+ // eScaDomain.getCompositeActivator().activate(composite);
+ //}
+ eScaDomain.getCompositeActivator().activate(eScaDomain.getDomainComposite());
// Start the composites
- for(Composite composite: composites) {
- eScaDomain.getCompositeActivator().start(composite);
- }
+ //for(Composite composite: composites) {
+ // eScaDomain.getCompositeActivator().start(composite);
+ //}
+ eScaDomain.getCompositeActivator().start(eScaDomain.getDomainComposite());
scaDomain = eScaDomain;
log.debug("EmbeddedRuntimeGBean started. Name=" + abstractName);
@@ -126,6 +131,8 @@
}
}
+ // FIXME: Building, activating and starting domainComposite to allow wiring between contributions
+ // has broken "clean" stop of individual contributions.
// Stop the composites
for(Composite composite: composites) {
eScaDomain.getCompositeActivator().stop(composite);