Author: simoneg
Date: Sun Jan 24 17:08:16 2010
New Revision: 902603
URL: http://svn.apache.org/viewvc?rev=902603&view=rev
Log:
Support for sub environments
Modified:
labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/Settings.java
Modified:
labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/Settings.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/Settings.java?rev=902603&r1=902602&r2=902603&view=diff
==============================================================================
---
labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/Settings.java
(original)
+++
labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/Settings.java
Sun Jan 24 17:08:16 2010
@@ -107,6 +107,11 @@
holder.initing();
if (holder.isInited()) return;
if (env == null) env = "";
+ String subenv = "";
+ if (env.indexOf('.') != -1) {
+ subenv = env.substring(env.indexOf('.'));
+ env = env.substring(0, env.indexOf('.'));
+ }
if (env.length() > 0) env = "." + env;
if (prefix == null) prefix = "";
if (prefix.length() > 0) prefix += ".";
@@ -148,6 +153,10 @@
holder.overrideWith(loader.getResource("META-INF/magma.properties.xml"));
holder.overrideWith(loader.getResource("META-INF/magma" + env +
".properties"));
holder.overrideWith(loader.getResource("META-INF/magma" + env +
".properties.xml"));
+ if (subenv.length() > 0) {
+ holder.overrideWith(loader.getResource("META-INF/magma"
+ env + subenv + ".properties"));
+ holder.overrideWith(loader.getResource("META-INF/magma"
+ env + subenv + ".properties.xml"));
+ }
holder.overrideWith(loader.getResource("META-INF/" + prefix +
"magma.properties"));
holder.overrideWith(loader.getResource("META-INF/" + prefix +
"magma.properties.xml"));
holder.overrideWith(loader.getResource("META-INF/" + prefix +
"magma" + env + ".properties"));
@@ -179,18 +188,24 @@
Settings.environment = environment;
}
+
+ private static Boolean isprod = null;
+
/**
* @return True is current environment is considered a production
environment, where optimizations are needed.
*/
public static boolean isProductionEnv() {
- return environment.equals(PRODUCTION_ENV);
+ if (isprod == null) {
+ isprod = environment.startsWith(PRODUCTION_ENV);
+ }
+ return isprod;
}
/**
* @return True if current environment is considered a developement
environment, where reloading is preferred.
*/
public static boolean isDeveloperEnv() {
- return environment.equals(DEVEL_ENV);
+ return !isProductionEnv();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
