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

michi at wyona.com michi at wyona.com
Tue Nov 20 10:37:37 CET 2007


Author: michi
Date: 2007-11-20 10:37:37 +0100 (Tue, 20 Nov 2007)
New Revision: 29062

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java
Log:
check package first

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-11-20 09:05:55 UTC (rev 29061)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/core/ResourceTypeRegistry.java	2007-11-20 09:37:37 UTC (rev 29062)
@@ -159,33 +159,6 @@
             
             for (int i = 0; i < resourceTypes.length; i++) {
                 try {
-                    File resConfigFile = new File(resourceTypes[i].getAttribute("src"));
-                    if (!resConfigFile.isAbsolute()) {
-                        resConfigFile = FileUtil.file(resourceTypeConfigFile.getParentFile().getAbsolutePath(), resourceTypes[i].getAttribute("src"));
-                    }
-
-                if (resConfigFile.isDirectory()) {
-                    File resDir = resConfigFile;
-                    
-                    Iterator iter = FileUtils.listFiles(resDir, new WildcardFilter("resource*.xml"), null).iterator();
-                    while (iter.hasNext()) {
-                        resConfigFile = (File)iter.next();
-                        log.debug("found resource config: " + resConfigFile);
-                        ResourceTypeDefinition rtd = new ResourceTypeDefinition(resConfigFile);
-                        log.debug("Universal Name: " + rtd.getResourceTypeUniversalName());
-                        log.debug("Classname: " + rtd.getResourceTypeClassname());
-                        hm.put(rtd.getResourceTypeUniversalName(), rtd);
-                    }
-
-                    } else 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 or directory: " + resConfigFile);
-                    }
-                } catch (Exception e) {
                     String packageName = resourceTypes[i].getAttribute("package");
                     log.debug("Package: " + packageName);
                     // TODO: Wildcard: resource*.xml !?
@@ -201,6 +174,36 @@
                         log.error("Exception re registring resource with package: " + packageName);
                         log.error(exception.getMessage(), exception);
                     }
+                } catch (Exception e) {
+                    File resConfigFile = new File(resourceTypes[i].getAttribute("src"));
+                    if (!resConfigFile.isAbsolute()) {
+                        resConfigFile = FileUtil.file(resourceTypeConfigFile.getParentFile().getAbsolutePath(), resourceTypes[i].getAttribute("src"));
+                    }
+
+                    if (resConfigFile.isDirectory()) {
+                        File resDir = resConfigFile;
+                    
+                        Iterator iter = FileUtils.listFiles(resDir, new WildcardFilter("resource*.xml"), null).iterator();
+                        while (iter.hasNext()) {
+                            resConfigFile = (File)iter.next();
+                            log.debug("found resource config: " + resConfigFile);
+                            ResourceTypeDefinition rtd = new ResourceTypeDefinition(resConfigFile);
+                            if (log.isDebugEnabled()) {
+                                log.debug("Universal Name: " + rtd.getResourceTypeUniversalName());
+                                log.debug("Classname: " + rtd.getResourceTypeClassname());
+                            }
+                            hm.put(rtd.getResourceTypeUniversalName(), rtd);
+                        }
+                    } else if (resConfigFile.isFile()) {
+                        ResourceTypeDefinition rtd = new ResourceTypeDefinition(resConfigFile);
+                        if (log.isDebugEnabled()) {
+                            log.debug("Universal Name: " + rtd.getResourceTypeUniversalName());
+                            log.debug("Classname: " + rtd.getResourceTypeClassname());
+                        }
+                        hm.put(rtd.getResourceTypeUniversalName(), rtd);
+                    } else {
+                        log.error("No such file or directory: " + resConfigFile);
+                    }
                 }
             }    
         } catch (Exception e) {



More information about the Yanel-commits mailing list