You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2006/05/13 15:20:18 UTC
svn commit: r406091 - in /geronimo/branches/1.1:
assemblies/j2ee-jetty-server/src/var/config/
assemblies/j2ee-tomcat-server/src/var/config/
assemblies/minimal-jetty-server/src/var/config/
assemblies/minimal-tomcat-server/src/var/config/ modules/system/...
Author: jsisson
Date: Sat May 13 06:20:17 2006
New Revision: 406091
URL: http://svn.apache.org/viewcvs?rev=406091&view=rev
Log:
GERONIMO-2012 - more changes to reflect configuration -> module change in config.xml
* change the --long startup output to use the word "Module" instead of "Configuration" - also give us a bit more room on each line.
* While I'm at it.. Change method names etc relating to the StartupMonitor interface to use module instead of configuration.
* update cmd line help for --override option in Daemon to use "module" terminology.
* update the wording in the var\config\README.txt to use the "module" terminology.
Modified:
geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/README.txt
geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/README.txt
geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/config/README.txt
geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/README.txt
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/LongStartupMonitor.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/SilentStartupMonitor.java
geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitor.java
Modified: geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/README.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/README.txt?rev=406091&r1=406090&r2=406091&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/README.txt (original)
+++ geronimo/branches/1.1/assemblies/j2ee-jetty-server/src/var/config/README.txt Sat May 13 06:20:17 2006
@@ -4,20 +4,20 @@
the var/config directory) in the org.apache.geronimo.config.file system
property.
-The configuration XML file lists the serialized configurations in the
-repository to be started. For each configuration configured to be
-started in the config.xml file, Geronimo loads a serialized configuration
+The configuration XML file lists the serialized modules in the
+repository to be started. For each module configured to be
+started in the config.xml file, Geronimo loads a serialized module
from under the geronimo/repository directory.
-A configuration can be marked as not to be loaded by setting the "load" attribute
-to "false" on the "configuration" element for a configuration.
+A module can be marked as not to be loaded by setting the "load" attribute
+to "false" on the "module" element for a module.
-A configuration may contain GBeans. Individual GBeans in a configuration can be
+A module may contain GBeans. Individual GBeans in a module can be
marked as not to be loaded by setting the "load" attribute to "false" on the
"gbean" element for a GBean.
Site specific information such as port numbers can be specified in GBean
-attributes to override the values in the serialized configuration.
+attributes to override the values in the serialized module.
Do not add comments to the config.xml file as the file is regenerated by
Geronimo when changes are made to Geronimo's configuration, therefore any
Modified: geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/README.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/README.txt?rev=406091&r1=406090&r2=406091&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/README.txt (original)
+++ geronimo/branches/1.1/assemblies/j2ee-tomcat-server/src/var/config/README.txt Sat May 13 06:20:17 2006
@@ -4,20 +4,20 @@
the var/config directory) in the org.apache.geronimo.config.file system
property.
-The configuration XML file lists the serialized configurations in the
-repository to be started. For each configuration configured to be
-started in the config.xml file, Geronimo loads a serialized configuration
+The configuration XML file lists the serialized modules in the
+repository to be started. For each module configured to be
+started in the config.xml file, Geronimo loads a serialized module
from under the geronimo/repository directory.
-A configuration can be marked as not to be loaded by setting the "load" attribute
-to "false" on the "configuration" element for a configuration.
+A module can be marked as not to be loaded by setting the "load" attribute
+to "false" on the "module" element for a module.
-A configuration may contain GBeans. Individual GBeans in a configuration can be
+A module may contain GBeans. Individual GBeans in a module can be
marked as not to be loaded by setting the "load" attribute to "false" on the
"gbean" element for a GBean.
Site specific information such as port numbers can be specified in GBean
-attributes to override the values in the serialized configuration.
+attributes to override the values in the serialized module.
Do not add comments to the config.xml file as the file is regenerated by
Geronimo when changes are made to Geronimo's configuration, therefore any
Modified: geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/config/README.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/config/README.txt?rev=406091&r1=406090&r2=406091&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/config/README.txt (original)
+++ geronimo/branches/1.1/assemblies/minimal-jetty-server/src/var/config/README.txt Sat May 13 06:20:17 2006
@@ -4,22 +4,20 @@
the var/config directory) in the org.apache.geronimo.config.file system
property.
-The configuration XML file lists the serialized configurations in the
-config-store to be started. For each configuration configured to be
-started in the config.xml file, Geronimo looks up a serialized configuration
-by reading the geronimo/config-store/index.properties file that maps a
-configuration name to geronimo/config-store/n directory (where n is a
-numbered directory name).
+The configuration XML file lists the serialized modules in the
+repository to be started. For each module configured to be
+started in the config.xml file, Geronimo loads a serialized module
+from under the geronimo/repository directory.
-A configuration can be marked as not to be loaded by setting the "load" attribute
-to "false" on the "configuration" element for a configuration.
+A module can be marked as not to be loaded by setting the "load" attribute
+to "false" on the "module" element for a module.
-A configuration may contain GBeans. Individual GBeans in a configuration can be
+A module may contain GBeans. Individual GBeans in a module can be
marked as not to be loaded by setting the "load" attribute to "false" on the
"gbean" element for a GBean.
Site specific information such as port numbers can be specified in GBean
-attributes to override the values in the serialized configuration.
+attributes to override the values in the serialized module.
Do not add comments to the config.xml file as the file is regenerated by
Geronimo when changes are made to Geronimo's configuration, therefore any
Modified: geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/README.txt
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/README.txt?rev=406091&r1=406090&r2=406091&view=diff
==============================================================================
--- geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/README.txt (original)
+++ geronimo/branches/1.1/assemblies/minimal-tomcat-server/src/var/config/README.txt Sat May 13 06:20:17 2006
@@ -4,22 +4,20 @@
the var/config directory) in the org.apache.geronimo.config.file system
property.
-The configuration XML file lists the serialized configurations in the
-config-store to be started. For each configuration configured to be
-started in the config.xml file, Geronimo looks up a serialized configuration
-by reading the geronimo/config-store/index.properties file that maps a
-configuration name to geronimo/config-store/n directory (where n is a
-numbered directory name).
+The configuration XML file lists the serialized modules in the
+repository to be started. For each module configured to be
+started in the config.xml file, Geronimo loads a serialized module
+from under the geronimo/repository directory.
-A configuration can be marked as not to be loaded by setting the "load" attribute
-to "false" on the "configuration" element for a configuration.
+A module can be marked as not to be loaded by setting the "load" attribute
+to "false" on the "module" element for a module.
-A configuration may contain GBeans. Individual GBeans in a configuration can be
+A module may contain GBeans. Individual GBeans in a module can be
marked as not to be loaded by setting the "load" attribute to "false" on the
"gbean" element for a GBean.
Site specific information such as port numbers can be specified in GBean
-attributes to override the values in the serialized configuration.
+attributes to override the values in the serialized module.
Do not add comments to the config.xml file as the file is regenerated by
Geronimo when changes are made to Geronimo's configuration, therefore any
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java?rev=406091&r1=406090&r2=406091&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java Sat May 13 06:20:17 2006
@@ -50,7 +50,7 @@
private final static String ARGUMENT_VERBOSE = "--verbose";
private final static String ARGUMENT_MORE_VERBOSE_SHORTFORM = "-vv";
private final static String ARGUMENT_MORE_VERBOSE = "--veryverbose";
- private final static String ARGUMENT_CONFIG_OVERRIDE = "--override";
+ private final static String ARGUMENT_MODULE_OVERRIDE = "--override";
private static boolean started = false;
private static Log log;
private StartupMonitor monitor;
@@ -100,13 +100,13 @@
out.println(" Reduces the console log level to TRACE, resulting in still\n" +
" more console output.");
out.println();
- out.println(" "+ARGUMENT_CONFIG_OVERRIDE+" [configId] [configId] ...");
- out.println(" USE WITH CAUTION! Overrides the configurations in\n" +
- " var/config/config.xml such that only the configurations listed on\n" +
+ out.println(" "+ARGUMENT_MODULE_OVERRIDE+" [moduleId] [moduleId] ...");
+ out.println(" USE WITH CAUTION! Overrides the modules in\n" +
+ " var/config/config.xml such that only the modules listed on\n" +
" the command line will be started. Note that many J2EE\n" +
- " features depend on certain configs being started, so you\n" +
+ " features depend on certain modules being started, so you\n" +
" should be very careful what you omit. Any arguments after\n" +
- " this are assumed to be configuration names.");
+ " this are assumed to be module names.");
out.println();
out.println("In addition you may specify a replacement for var/config/config.xml using by setting the property\n" +
"-Dorg.apache.geronimo.config.file=var/config/<my-config.xml>\n" +
@@ -138,7 +138,7 @@
if (verboseArg == null) {
verboseArg = ARGUMENT_MORE_VERBOSE;
}
- } else if (args[i].equals(ARGUMENT_CONFIG_OVERRIDE)) {
+ } else if (args[i].equals(ARGUMENT_MODULE_OVERRIDE)) {
override = true;
} else if(args[i].equalsIgnoreCase("-help") || args[i].equalsIgnoreCase("--help") ||
args[i].equalsIgnoreCase("-h") || args[i].equalsIgnoreCase("/?")) {
@@ -272,7 +272,7 @@
}
}
- monitor.foundConfigurations((Artifact[]) configs.toArray(new Artifact[configs.size()]));
+ monitor.foundModules((Artifact[]) configs.toArray(new Artifact[configs.size()]));
// load the rest of the configurations
try {
@@ -280,12 +280,12 @@
try {
for (Iterator i = configs.iterator(); i.hasNext();) {
Artifact configID = (Artifact) i.next();
- monitor.configurationLoading(configID);
+ monitor.moduleLoading(configID);
configurationManager.loadConfiguration(configID);
- monitor.configurationLoaded(configID);
- monitor.configurationStarting(configID);
+ monitor.moduleLoaded(configID);
+ monitor.moduleStarting(configID);
configurationManager.startConfiguration(configID);
- monitor.configurationStarted(configID);
+ monitor.moduleStarted(configID);
}
} finally {
ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager);
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/LongStartupMonitor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/LongStartupMonitor.java?rev=406091&r1=406090&r2=406091&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/LongStartupMonitor.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/LongStartupMonitor.java Sat May 13 06:20:17 2006
@@ -11,9 +11,9 @@
/**
* A startup monitor that shows the progress of loading and starting
- * configurations, outputing a new line for each configuration started
- * showing the time taken to start the configuration along with the
- * configId.
+ * modules, outputing a new line for each module started
+ * showing the time taken to start the module along with the
+ * moduleId.
* <p/>
* This startup monitor produces more lines of output than the
* ProgressBarStartupMonitor but its output is suitable for redirection
@@ -33,24 +33,24 @@
private PrintStream out;
/**
- * Number of configurations to start
+ * Number of modules to start
*/
- private int numConfigs;
+ private int numModules;
/**
- * Number of digits in number of configurations to start
+ * Number of digits in number of modules to start
*/
- private int numConfigsDigits;
+ private int numModulesDigits;
/**
- * Number of configuration currently being started
+ * Number of modules currently being started
*/
- private int configNum;
+ private int moduleNum;
/**
- * Length of longest Configuration Name
+ * Length of longest module name
*/
- private int longestConfigNameLength;
+ private int longestModuleNameLength;
/**
* Time Geronimo was started
@@ -58,9 +58,9 @@
private long started;
/**
- * Time the current configuration being processed was started
+ * Time the current module being processed was started
*/
- private long configStarted;
+ private long moduleStarted;
/**
* The Kernel of the system being started
@@ -76,45 +76,45 @@
this.kernel = kernel;
}
- public synchronized void foundConfigurations(Artifact[] configurations) {
- numConfigs = configurations.length;
- numConfigsDigits = Integer.toString(numConfigs).length();
+ public synchronized void foundModules(Artifact[] modules) {
+ numModules = modules.length;
+ numModulesDigits = Integer.toString(numModules).length();
- for (int i = 0, len= 0; i < configurations.length; i++) {
- len = configurations[i].toString().length();
- if (len > longestConfigNameLength)
- longestConfigNameLength = len;
+ for (int i = 0, len= 0; i < modules.length; i++) {
+ len = modules[i].toString().length();
+ if (len > longestModuleNameLength)
+ longestModuleNameLength = len;
}
}
- public synchronized void configurationLoading(Artifact configuration) {
- StringBuffer buf = new StringBuffer("Configuration ");
- // pad config index
- int configIndexDigits = Integer.toString(++configNum).length();
- for (; configIndexDigits < numConfigsDigits; configIndexDigits++) {
+ public synchronized void moduleLoading(Artifact module) {
+ StringBuffer buf = new StringBuffer("Module ");
+ // pad module index
+ int configIndexDigits = Integer.toString(++moduleNum).length();
+ for (; configIndexDigits < numModulesDigits; configIndexDigits++) {
buf.append(' ');
}
- // append configuration index / total configs
- buf.append(configNum).append('/').append(numConfigs).append(' ');
- // append configuration name
- buf.append(configuration);
- // pad end of config name with spaces so trailing startup times will line up
- int len = configuration.toString().length();
- for (; len < longestConfigNameLength; len++) {
+ // append module index / total configs
+ buf.append(moduleNum).append('/').append(numModules).append(' ');
+ // append module name
+ buf.append(module);
+ // pad end of module with spaces so trailing startup times will line up
+ int len = module.toString().length();
+ for (; len < longestModuleNameLength; len++) {
buf.append(' ');
}
out.print(buf);
}
- public synchronized void configurationLoaded(Artifact configuration) {
+ public synchronized void moduleLoaded(Artifact module) {
}
- public synchronized void configurationStarting(Artifact configuration) {
- configStarted = System.currentTimeMillis();
+ public synchronized void moduleStarting(Artifact module) {
+ moduleStarted = System.currentTimeMillis();
}
- public synchronized void configurationStarted(Artifact configuration) {
- long time = System.currentTimeMillis() - configStarted;
+ public synchronized void moduleStarted(Artifact module) {
+ long time = System.currentTimeMillis() - moduleStarted;
StringBuffer buf = new StringBuffer();
buf.append(" started in ");
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java?rev=406091&r1=406090&r2=406091&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/ProgressBarStartupMonitor.java Sat May 13 06:20:17 2006
@@ -8,7 +8,7 @@
/**
* A startup monitor that shows the progress of loading and starting
- * configurations using a text based progress bar and the use of line
+ * modules using a text based progress bar and the use of line
* feeds to update the progress display, therefore minimizing the
* number of lines output to the terminal.
* <p/>
@@ -27,8 +27,8 @@
private final static int MAX_WIDTH = 70;
private PrintStream out;
private String currentOperation;
- private Artifact[] configurations;
- private char[] configStatus = new char[0];
+ private Artifact[] modules;
+ private char[] moduleStatus = new char[0];
private long started;
private int percent = 0;
private Kernel kernel;
@@ -47,15 +47,15 @@
currentOperation = "Loading";
}
- public synchronized void foundConfigurations(Artifact[] configurations) {
- this.configurations = configurations;
- configStatus = new char[configurations.length];
- for (int i = 0; i < configStatus.length; i++) {
- configStatus[i] = STATUS_NOT_READY;
+ public synchronized void foundModules(Artifact[] modules) {
+ this.modules = modules;
+ moduleStatus = new char[modules.length];
+ for (int i = 0; i < moduleStatus.length; i++) {
+ moduleStatus[i] = STATUS_NOT_READY;
}
operationLimit = MAX_WIDTH
- 5 // two brackets, start and stop tokens, space afterward
- - configurations.length // configuration tokens
+ - modules.length // module tokens
- 4 // 2 digits of percent plus % plus space afterward
- 5;// 3 digits of time plus s plus space afterward
repaint();
@@ -70,10 +70,10 @@
}
int percent = 0;
if (kernel != null) percent += 5;
- int total = configStatus.length * 2;
+ int total = moduleStatus.length * 2;
int progress = 0;
- for (int i = 0; i < configStatus.length; i++) {
- char c = configStatus[i];
+ for (int i = 0; i < moduleStatus.length; i++) {
+ char c = moduleStatus[i];
switch (c) {
case STATUS_LOADED:
progress += 1;
@@ -88,34 +88,34 @@
this.percent = percent;
}
- public synchronized void configurationLoading(Artifact configuration) {
- currentOperation = " Loading " + configuration;
- for (int i = 0; i < configurations.length; i++) {
- if (configurations[i].equals(configuration)) {
- configStatus[i] = STATUS_LOADING;
+ public synchronized void moduleLoading(Artifact module) {
+ currentOperation = " Loading " + module;
+ for (int i = 0; i < modules.length; i++) {
+ if (modules[i].equals(module)) {
+ moduleStatus[i] = STATUS_LOADING;
}
}
repaint();
}
- public synchronized void configurationLoaded(Artifact configuration) {
- for (int i = 0; i < configurations.length; i++) {
- if (configurations[i].equals(configuration)) {
- configStatus[i] = STATUS_LOADED;
+ public synchronized void moduleLoaded(Artifact module) {
+ for (int i = 0; i < modules.length; i++) {
+ if (modules[i].equals(module)) {
+ moduleStatus[i] = STATUS_LOADED;
}
}
calculatePercent();
repaint();
}
- public synchronized void configurationStarting(Artifact configuration) {
- currentOperation = "Starting " + configuration;
+ public synchronized void moduleStarting(Artifact module) {
+ currentOperation = "Starting " + module;
}
- public synchronized void configurationStarted(Artifact configuration) {
- for (int i = 0; i < configurations.length; i++) {
- if (configurations[i].equals(configuration)) {
- configStatus[i] = STATUS_STARTED;
+ public synchronized void moduleStarted(Artifact module) {
+ for (int i = 0; i < modules.length; i++) {
+ if (modules[i].equals(module)) {
+ moduleStatus[i] = STATUS_STARTED;
}
}
calculatePercent();
@@ -141,8 +141,8 @@
StringBuffer buf = new StringBuffer();
buf.append("\r[");
buf.append(kernel == null ? STATUS_NOT_READY : STATUS_STARTED);
- for (int i = 0; i < configStatus.length; i++) {
- buf.append(configStatus[i]);
+ for (int i = 0; i < moduleStatus.length; i++) {
+ buf.append(moduleStatus[i]);
}
buf.append(finished ? STATUS_STARTED : STATUS_NOT_READY);
buf.append("] ");
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/SilentStartupMonitor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/SilentStartupMonitor.java?rev=406091&r1=406090&r2=406091&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/SilentStartupMonitor.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/SilentStartupMonitor.java Sat May 13 06:20:17 2006
@@ -27,19 +27,19 @@
this.kernel = kernel;
}
- public void foundConfigurations(Artifact[] configurations) {
+ public void foundModules(Artifact[] modules) {
}
- public void configurationLoading(Artifact configuration) {
+ public void moduleLoading(Artifact module) {
}
- public void configurationLoaded(Artifact configuration) {
+ public void moduleLoaded(Artifact module) {
}
- public void configurationStarting(Artifact configuration) {
+ public void moduleStarting(Artifact module) {
}
- public void configurationStarted(Artifact configuration) {
+ public void moduleStarted(Artifact module) {
}
public void startupFinished() {
Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitor.java?rev=406091&r1=406090&r2=406091&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitor.java (original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitor.java Sat May 13 06:20:17 2006
@@ -13,11 +13,11 @@
// Normal calls, will generally occur in this order
void systemStarting(long startTime);
void systemStarted(Kernel kernel);
- void foundConfigurations(Artifact[] configurations);
- void configurationLoading(Artifact configuration);
- void configurationLoaded(Artifact configuration);
- void configurationStarting(Artifact configuration);
- void configurationStarted(Artifact configuration);
+ void foundModules(Artifact[] modules);
+ void moduleLoading(Artifact module);
+ void moduleLoaded(Artifact module);
+ void moduleStarting(Artifact module);
+ void moduleStarted(Artifact module);
void startupFinished();
// Indicate failures during load