You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by lg...@apache.org on 2006/08/23 14:38:30 UTC
svn commit: r434031 - in
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration:
SettingsDefaults.java impl/SettingsHelper.java
Author: lgawron
Date: Wed Aug 23 05:38:29 2006
New Revision: 434031
URL: http://svn.apache.org/viewvc?rev=434031&view=rev
Log:
running mode name not constrained to prod, dev, test
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/SettingsDefaults.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/SettingsDefaults.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/SettingsDefaults.java?rev=434031&r1=434030&r2=434031&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/SettingsDefaults.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/SettingsDefaults.java Wed Aug 23 05:38:29 2006
@@ -30,7 +30,7 @@
public static final String DEFAULT_RUNNING_MODE = "prod";
/** This is the list of predefined running modes. */
- public static final String[] RUNNING_MODES = {"prod", "dev", "test"};
+ // public static final String[] RUNNING_MODES = {"prod", "dev", "test"};
/** The default configuration location. */
public static final String DEFAULT_CONFIGURATION = "/WEB-INF/cocoon/cocoon.xconf";
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java?rev=434031&r1=434030&r2=434031&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java Wed Aug 23 05:38:29 2006
@@ -79,12 +79,16 @@
final PropertyProvider externalPropertyProvider) {
// get the running mode
final String mode = SettingsHelper.getSystemProperty(Settings.PROPERTY_RUNNING_MODE, SettingsDefaults.DEFAULT_RUNNING_MODE);
+
+ /*
if ( !Arrays.asList(SettingsDefaults.RUNNING_MODES).contains(mode) ) {
final String msg =
"Invalid running mode: " + mode + " - Use one of: " + Arrays.asList(SettingsDefaults.RUNNING_MODES);
logger.info(msg);
throw new IllegalArgumentException(msg);
}
+ */
+
logger.info("Running in mode: " + mode);
// create an empty settings objects