You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/05/19 17:59:05 UTC
svn commit: r776371 -
/labs/magma/trunk/foundation-basics/src/main/java/org/apache/magma/settings/Settings.java
Author: simoneg
Date: Tue May 19 15:59:05 2009
New Revision: 776371
URL: http://svn.apache.org/viewvc?rev=776371&view=rev
Log:
LABS-364 : parse magma.env.properties
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=776371&r1=776370&r2=776371&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 Tue May 19 15:59:05 2009
@@ -139,6 +139,8 @@
}
holder.overrideWith(loader.getResource("META-INF/magma.properties"));
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"));
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"));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org