You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/07/17 09:07:26 UTC
svn commit: r422645 - in
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration:
SettingsDefaults.java impl/SettingsHelper.java
Author: cziegeler
Date: Mon Jul 17 00:07:25 2006
New Revision: 422645
URL: http://svn.apache.org/viewvc?rev=422645&view=rev
Log:
Three defined running modes: prod, dev and 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=422645&r1=422644&r2=422645&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 Mon Jul 17 00:07:25 2006
@@ -29,8 +29,8 @@
/** The default running mode. */
public static final String DEFAULT_RUNNING_MODE = "prod";
- /** This is the list of predefined running modes (separated by a ,). */
- public static final String PREDEFINED_RUNNING_MODE = "prod,dev";
+ /** This is the list of predefined running modes. */
+ 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=422645&r1=422644&r2=422645&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 Mon Jul 17 00:07:25 2006
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
@@ -78,6 +79,12 @@
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