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

[michi at wyona.com]

Author: michi
Date: 2007-05-14 12:04:26 +0200 (Mon, 14 May 2007)
New Revision: 24433

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java
Log:
check if config is directory

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	2007-05-14 10:00:31 UTC (rev 24432)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/map/RealmManager.java	2007-05-14 10:04:26 UTC (rev 24433)
@@ -61,6 +61,8 @@
     public static final String DEFAULT_CONFIGURATION_FILE_XML = "yanel.xml";
     public static String CONFIGURATION_FILE = DEFAULT_CONFIGURATION_FILE;
 
+    public static String REALM_DEFAULT_CONFIG_NAME = "realm.xml";
+
     private URL propertiesURL;
     private File configFile;
 
@@ -204,6 +206,10 @@
                 String configSrc = configElement.getAttribute("src", null);
                 
                 File realmConfigFile = resolveFile(new File(configSrc), realmsConfigFile);
+                if (realmConfigFile.isDirectory()) {
+                    realmConfigFile = new File(realmConfigFile, REALM_DEFAULT_CONFIG_NAME);
+                }
+
                 log.debug("Reading realm config file for [" + realmId + "]: " + realmConfigFile);
                 try {
                     Realm realm = new Realm(name.getValue(), realmId, mountPoint, realmConfigFile);