[Yanel-commits] rev 55376 - public/yanel/trunk/src/core/java/org/wyona/yanel/core/map

[michi at wyona.com]

Author: michi
Date: 2010-12-09 22:43:35 +0100 (Thu, 09 Dec 2010)
New Revision: 55376

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java
Log:
getting realms.xml location from environment entry

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java	2010-12-09 17:18:18 UTC (rev 55375)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java	2010-12-09 21:43:35 UTC (rev 55376)
@@ -116,7 +116,22 @@
         }
 
 
-        // 3.) Getting realms.xml from yanel.xml
+        // 3.) Getting realms.xml from http://tomcat.apache.org/tomcat-5.5-doc/config/context.html#Environment_Entries
+        String envEntryPath = "java:comp/env/yanel/realms-config-file";
+        try {
+            javax.naming.InitialContext ic = new javax.naming.InitialContext();
+            if (ic.lookup(envEntryPath) != null) {
+                log.warn("realms.xml set as environment entry: " + (String) ic.lookup(envEntryPath));
+                return new File((String) ic.lookup(envEntryPath));
+            } else {
+                log.info("No enviroment entry '" + envEntryPath + "' set.");
+            }
+        } catch (Exception e) {
+            log.info("No enviroment entry '" + envEntryPath + "' set.");
+        }
+
+
+        // 4.) Getting realms.xml from yanel.xml
         YANEL_CONFIGURATION_FILE = yanelConfigurationFilename;
 
         if (RealmManager.class.getClassLoader().getResource(YANEL_CONFIGURATION_FILE) == null) {
@@ -413,6 +428,7 @@
      * Inherit properties of root realm to other realms
      */
     private void inheritRootRealmProperties() {
+        // TODO: Use entrySet
         java.util.Iterator keyIterator = _realms.keySet().iterator();
         while(keyIterator.hasNext()) {
             String key = (String)keyIterator.next();