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

[michi at wyona.com]

Author: michi
Date: 2007-05-14 11:30:40 +0200 (Mon, 14 May 2007)
New Revision: 24425

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java
Log:
check if directory

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java	2007-05-14 08:49:45 UTC (rev 24424)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java	2007-05-14 09:30:40 UTC (rev 24425)
@@ -45,6 +45,8 @@
     public static final String DEFAULT_CONFIGURATION_FILE_XML = "yanel.xml";
     public static String CONFIGURATION_FILE = DEFAULT_CONFIGURATION_FILE;
 
+    public static String RESOURCE_DEFAULT_CONFIG_NAME = "resource.xml";
+
     private URL propertiesURL;
     private File configFile;
     private File resourceTypeConfigFile; 
@@ -109,17 +111,20 @@
                     for (int i = 0; i < tokens.length; i++) {
                         File resConfigFile = new File(tokens[i]);
                         if (!resConfigFile.isAbsolute()) {
-                            resConfigFile = FileUtil.file(propsFile.getParentFile()
-                                    .getAbsolutePath(), tokens[i]);
+                            resConfigFile = FileUtil.file(propsFile.getParentFile().getAbsolutePath(), tokens[i]);
                         }
 
+                        if (resConfigFile.isDirectory()) {
+                            resConfigFile = new File(resConfigFile, RESOURCE_DEFAULT_CONFIG_NAME);
+                        }
+
                         if (resConfigFile.isFile()) {
                             ResourceTypeDefinition rtd = new ResourceTypeDefinition(resConfigFile);
                             log.debug("Universal Name: " + rtd.getResourceTypeUniversalName());
                             log.debug("Classname: " + rtd.getResourceTypeClassname());
                             hm.put(rtd.getResourceTypeUniversalName(), rtd);
                         } else {
-                            log.error("No such file: " + resConfigFile);
+                            log.error("No such file or directory: " + resConfigFile);
                         }
                     }
                 } catch (Exception e) {
@@ -150,13 +155,17 @@
                     resConfigFile = FileUtil.file(resourceTypeConfigFile.getParentFile().getAbsolutePath(), resourceTypes[i].getAttribute("src"));
                 }
 
+                if (resConfigFile.isDirectory()) {
+                    resConfigFile = new File(resConfigFile, RESOURCE_DEFAULT_CONFIG_NAME);
+                }
+
                 if (resConfigFile.isFile()) {
                     ResourceTypeDefinition rtd = new ResourceTypeDefinition(resConfigFile);
                     log.debug("Universal Name: " + rtd.getResourceTypeUniversalName());
                     log.debug("Classname: " + rtd.getResourceTypeClassname());
                     hm.put(rtd.getResourceTypeUniversalName(), rtd);
                 } else {
-                    log.error("No such file: " + resConfigFile);
+                    log.error("No such file or directory: " + resConfigFile);
                 }
             }    
         } catch (Exception e) {