geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r559773 - in /geronimo/sandbox/tuscany-integration/geronimo-tuscany: configs/src/plan/ modules/src/main/java/org/apache/geronimo/tuscany/
Date Thu, 26 Jul 2007 09:56:42 GMT
Author: vamsic007
Date: Thu Jul 26 02:56:40 2007
New Revision: 559773

URL: http://svn.apache.org/viewvc?view=rev&rev=559773
Log:
Enabled "startOtherComponents"

Modified:
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
    geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml?view=diff&rev=559773&r1=559772&r2=559773
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml (original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/configs/src/plan/plan.xml Thu Jul
26 02:56:40 2007
@@ -588,7 +588,7 @@
         <attribute name="serverInfoQuery">?name=ServerInfo</attribute>
         <attribute name="embeddedSCADomainQuery">?name=GeronimoSCADomain</attribute>
         <attribute name="useEmbeddedDomain">true</attribute>
-        <attribute name="startOtherComponents">false</attribute>
+        <attribute name="startOtherComponents">true</attribute>
         <xml-attribute name="defaultEnvironment">
             <environment>
                 <dependencies>

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java?view=diff&rev=559773&r1=559772&r2=559773
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
(original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedRuntimeGBean.java
Thu Jul 26 02:56:40 2007
@@ -116,6 +116,7 @@
                         for(Component component: composite.getComponents()) {
                             eScaDomain.getDomainCompositeHelper().startComponent(eScaDomain.getDomainCompositeHelper().getComponent(component.getName()));
                             startedComponents.add(component.getName());
+                            embeddedSCADomainRef.getAllComponentNames().add(component.getName());
                         }
                     }
                 }
@@ -123,7 +124,7 @@
                 // Start other components
                 // TODO: Eliminate this when EmbeddedSCADomain is fixed.  This is added as
a hack as adding a new contribution is rendering the already existing services in the domain
unusable
                 if(startOtherComponents) {
-                    for(String componentName: eScaDomain.getDomainCompositeHelper().getComponentNames())
{
+                    for(String componentName: embeddedSCADomainRef.getAllComponentNames())
{
                         if(startedComponents.contains(componentName)) {
                             continue;
                         }
@@ -162,6 +163,7 @@
                         Composite composite = (Composite)artifact.getModel();
                         for(Component component: composite.getComponents()) {
                             eScaDomain.getDomainCompositeHelper().stopComponent(eScaDomain.getDomainCompositeHelper().getComponent(component.getName()));
+                            embeddedSCADomainRef.getAllComponentNames().remove(component.getName());
                         }
                     }
                 }

Modified: geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java?view=diff&rev=559773&r1=559772&r2=559773
==============================================================================
--- geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java
(original)
+++ geronimo/sandbox/tuscany-integration/geronimo-tuscany/modules/src/main/java/org/apache/geronimo/tuscany/EmbeddedSCADomainGBean.java
Thu Jul 26 02:56:40 2007
@@ -1,5 +1,8 @@
 package org.apache.geronimo.tuscany;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -14,6 +17,7 @@
     private EmbeddedSCADomain scaDomain;
     private String domainUri;
     private ClassLoader runtimeClassLoader;
+    private List<String> allComponentNames; // TODO: Remove when EmbeddedSCADomain
can return all component names in the domain
     
     public EmbeddedSCADomainGBean(AbstractName abstractName, ClassLoader runtimeClassLoader,
String domainUri) {
         this.abstractName = abstractName;
@@ -33,13 +37,14 @@
         // TODO Auto-generated method stub
         scaDomain = new EmbeddedSCADomain(runtimeClassLoader, domainUri);
         scaDomain.start();
+        allComponentNames = new ArrayList<String>();
     }
 
     public void doStop() throws Exception {
         // TODO Auto-generated method stub
         scaDomain.stop();
         scaDomain = null;
-        
+        allComponentNames = null;
     }
     
     public SCADomain getScaDomain() {
@@ -60,5 +65,9 @@
     
     public static GBeanInfo getGBeanInfo() {
         return GBEAN_INFO;
+    }
+    
+    public List<String> getAllComponentNames() {
+        return allComponentNames;
     }
 }



Mime
View raw message