geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johnx...@apache.org
Subject svn commit: r1357585 - /geronimo/server/branches/3.0/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
Date Thu, 05 Jul 2012 13:05:02 GMT
Author: johnxiao
Date: Thu Jul  5 13:05:02 2012
New Revision: 1357585

URL: http://svn.apache.org/viewvc?rev=1357585&view=rev
Log:
GERONIMODEVTOOLS-791 the server side change

Modified:
    geronimo/server/branches/3.0/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java

Modified: geronimo/server/branches/3.0/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java?rev=1357585&r1=1357584&r2=1357585&view=diff
==============================================================================
--- geronimo/server/branches/3.0/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
(original)
+++ geronimo/server/branches/3.0/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
Thu Jul  5 13:05:02 2012
@@ -160,8 +160,15 @@ public class EmbeddedDaemon implements M
         }
     }
 
-    private Set<Artifact> getLoadOnlyConfigList() {
+    private Set<Artifact> getNoNeedStartConfigList() {
         String list = System.getProperty("geronimo.loadOnlyConfigList");
+        if(System.getProperty("geronimo.removedArtifactList") != null) {
+        	if(list == null || list.equals("")) {
+        		list = System.getProperty("geronimo.removedArtifactList");
+        	} else {
+        		list += "," + System.getProperty("geronimo.removedArtifactList");
+        	}
+        }
         Set<Artifact> artifacts = new HashSet<Artifact>();
         if (list != null) {
             for (String name : list.split("\\s*,\\s*")) {
@@ -216,7 +223,7 @@ public class EmbeddedDaemon implements M
 
             monitor.foundModules(configs.toArray(new Artifact[configs.size()]));
 
-            Set<Artifact> loadOnlyConfigs = getLoadOnlyConfigList();
+            Set<Artifact> noNeedStartConfigList = getNoNeedStartConfigList();
             
             // load the rest of the configurations
             try {
@@ -235,7 +242,7 @@ public class EmbeddedDaemon implements M
                             monitor.moduleLoaded(configID);
                             try {
                                 monitor.moduleStarting(configID);
-                                if (!loadOnlyConfigs.contains(configID)) {
+                                if (!noNeedStartConfigList.contains(configID)) {
                                     configurationManager.startConfiguration(configID, lifecycleMonitor);
                                 }
                                 monitor.moduleStarted(configID);



Mime
View raw message