You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2007/06/24 05:48:40 UTC
svn commit: r550164 - in
/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main:
Daemon.java EmbeddedDaemon.java
Author: djencks
Date: Sat Jun 23 20:48:40 2007
New Revision: 550164
URL: http://svn.apache.org/viewvc?view=rev&rev=550164
Log:
GERONIMO-3071 use monitor to log configuration startup during server startup, so you can tell what happened.
Modified:
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java
geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java?view=diff&rev=550164&r1=550163&r2=550164
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java Sat Jun 23 20:48:40 2007
@@ -32,15 +32,12 @@
public class Daemon extends EmbeddedDaemon {
private Daemon() {
- super(null);
+ super(KernelFactory.newInstance().createKernel("geronimo"));
}
@Override
protected int initializeKernel() throws Exception {
ClassLoader classLoader = EmbeddedDaemon.class.getClassLoader();
-
- // create the kernel
- kernel = KernelFactory.newInstance().createKernel("geronimo");
// boot the kernel
try {
Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java?view=diff&rev=550164&r1=550163&r2=550164
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java (original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/EmbeddedDaemon.java Sat Jun 23 20:48:40 2007
@@ -20,10 +20,11 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.cli.daemon.DaemonCLParser;
import org.apache.geronimo.common.GeronimoEnvironment;
import org.apache.geronimo.gbean.AbstractName;
@@ -33,6 +34,8 @@
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.DebugLoggingLifecycleMonitor;
+import org.apache.geronimo.kernel.config.LifecycleMonitor;
import org.apache.geronimo.kernel.config.PersistentConfigurationList;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.util.Main;
@@ -43,9 +46,12 @@
* @version $Rev:385659 $ $Date: 2007-03-07 14:40:07 +1100 (Wed, 07 Mar 2007) $
*/
public class EmbeddedDaemon implements Main {
- protected Kernel kernel;
+ private static final Log log = LogFactory.getLog(EmbeddedDaemon.class);
+
+ protected final Kernel kernel;
private StartupMonitor monitor;
- private List configs = new ArrayList();
+ private LifecycleMonitor lifecycleMonitor;
+ private List<Artifact> configs = new ArrayList<Artifact>();
public EmbeddedDaemon(Kernel kernel) {
this.kernel = kernel;
@@ -74,8 +80,8 @@
protected void initializeOverride(DaemonCLParser parser) {
String[] override = parser.getOverride();
if (null != override) {
- for (int i = 0; i < override.length; i++) {
- configs.add(Artifact.create(override[i]));
+ for (String anOverride : override) {
+ configs.add(Artifact.create(anOverride));
}
}
}
@@ -90,6 +96,7 @@
monitor = new ProgressBarStartupMonitor();
}
}
+ lifecycleMonitor = new DebugLoggingLifecycleMonitor(log);
}
protected int doStartup() {
@@ -121,11 +128,10 @@
if (configs.isEmpty()) {
// --override wasn't used (nothing explicit), see what was running before
- Set configLists = kernel.listGBeans(query);
- for (Iterator i = configLists.iterator(); i.hasNext();) {
- AbstractName configListName = (AbstractName) i.next();
+ Set<AbstractName> configLists = kernel.listGBeans(query);
+ for (AbstractName configListName : configLists) {
try {
- configs.addAll((List) kernel.invoke(configListName, "restore"));
+ configs.addAll((List<Artifact>) kernel.invoke(configListName, "restore"));
} catch (IOException e) {
System.err.println("Unable to restore last known configurations");
e.printStackTrace();
@@ -135,19 +141,18 @@
}
}
- monitor.foundModules((Artifact[]) configs.toArray(new Artifact[configs.size()]));
+ monitor.foundModules(configs.toArray(new Artifact[configs.size()]));
// load the rest of the configurations
try {
ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
try {
- for (Iterator i = configs.iterator(); i.hasNext();) {
- Artifact configID = (Artifact) i.next();
+ for (Artifact configID : configs) {
monitor.moduleLoading(configID);
- configurationManager.loadConfiguration(configID);
+ configurationManager.loadConfiguration(configID, lifecycleMonitor);
monitor.moduleLoaded(configID);
monitor.moduleStarting(configID);
- configurationManager.startConfiguration(configID);
+ configurationManager.startConfiguration(configID, lifecycleMonitor);
monitor.moduleStarted(configID);
}
} finally {
@@ -161,9 +166,8 @@
}
// Tell every persistent configuration list that the kernel is now fully started
- Set configLists = kernel.listGBeans(query);
- for (Iterator i = configLists.iterator(); i.hasNext();) {
- AbstractName configListName = (AbstractName) i.next();
+ Set<AbstractName> configLists = kernel.listGBeans(query);
+ for (AbstractName configListName : configLists) {
kernel.setAttribute(configListName, "kernelFullyStarted", Boolean.TRUE);
}