Author: gerdogdu
Date: Tue Aug 17 09:28:14 2010
New Revision: 986250
URL: http://svn.apache.org/viewvc?rev=986250&view=rev
Log:
[OWB-441] migrate various openwebbeans-*.properties to the new schema
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=986250&r1=986249&r2=986250&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
Tue Aug 17 09:28:14 2010
@@ -25,17 +25,15 @@ import org.apache.webbeans.logger.WebBea
import org.apache.webbeans.util.SecurityUtil;
/**
- * This class performs a lookup of various configuration properties
- * There are 2 different configuration files
- * <ol>
- * <li><code>META-INF/openwebbeans.properties</code> contains the currently
used configuration</li>
- * <li><code>META-INF/openwebbeans-default.properties</code> contains all
default values</li>
- * </ol>
+ * Defines configuration for OpenWebBeans.
*
- * Both configuration files will be loaded via the ClassLoader.
- * The <code>META-INF/openwebbeans.properties</code> doesn't have to contain
the full set of
- * available configuration properties. If it doesn't contain a specific
property,
- * the value will be looked up in
<code>META-INF/openwebbeans-default.properties<code>
+ * The algorithm is easy:
+ * <ul>
+ * <li>Load all properties you can find with the name
(META-INF/openwebbeans/openwebbeans.properties),
+ * <li>Sort them via configuration.ordinal in ascending order,
+ * <li>Overload them as we do already,
+ * <li>Use the sorted list of properties.
+ * </ul>
*/
public class OpenWebBeansConfiguration
{
@@ -45,9 +43,6 @@ public class OpenWebBeansConfiguration
/**Default configuration files*/
private final static String DEFAULT_CONFIG_PROPERTIES_NAME =
"META-INF/openwebbeans/openwebbeans.properties";
- /**Application specified file*/
- private final static String CONFIG_PROPERTIES_NAME =
"META-INF/openwebbeans/openwebbeans.properties";
-
/**Property of application*/
private Properties configProperties = new Properties();
