[Yanel-commits] rev 22598 - public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2007-02-12 23:11:24 +0100 (Mon, 12 Feb 2007)
New Revision: 22598

Modified:
   public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
Log:
log messages fixed

Modified: public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java	2007-02-12 20:40:05 UTC (rev 22597)
+++ public/yanel/trunk/src/contributions/resources/resource-creator/src/java/org/wyona/yanel/impl/resources/ResourceCreatorResource.java	2007-02-12 22:11:24 UTC (rev 22598)
@@ -124,6 +124,8 @@
                 Resource resource = rtr.newResource(rtds[i].getResourceTypeUniversalName());
                 if (resource != null && ResourceAttributeHelper.hasAttributeImplemented(resource, "Creatable", "2")) {
                     sb.append("<option value=\"" + rtds[i].getResourceTypeNamespace() + "::" + rtds[i].getResourceTypeLocalName() + "\">" + rtds[i].getResourceTypeLocalName() + "</option>");
+                } else {
+                    log.warn("Resource type: " + rtds[i] + " does not implement CreatableV2 interface!");
                 }
             } catch(Exception e) {
                 log.error(e);
@@ -411,20 +413,22 @@
         org.w3c.dom.Document customConfigDoc = rc.getCustomConfiguration();
         if (customConfigDoc != null) {
             Configuration config = ConfigurationUtil.toConfiguration(customConfigDoc.getDocumentElement());
-            log.error("DEBUG: Name: " + config.getName());
             Configuration resourceTypesConfig = config.getChild("resource-types", false);
             if (resourceTypesConfig != null) {
                 Configuration[] resourceTypeConfigs = resourceTypesConfig.getChildren("resource-type");
+                if (resourceTypeConfigs.length == 0) return null;
+                ResourceTypeDefinition[] rtds = new ResourceTypeDefinition[resourceTypeConfigs.length];
                 for (int i = 0; i < resourceTypeConfigs.length; i++) {
                     try {
                         String universalName = "<{"+resourceTypeConfigs[i].getAttribute("namespace")+"}"+resourceTypeConfigs[i].getAttribute("name")+"/>";
-                        rtr.getResourceTypeDefinition(universalName);
-                        log.error("DEBUG: Resource Type: " + universalName);
+                        rtds[i] = rtr.getResourceTypeDefinition(universalName);
+                        log.debug("Resource Type: " + universalName);
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);
+                        return null;
                     }
                 }
-                return null;
+                return rtds;
             }
         }
         ResourceTypeDefinition[] rtds = rtr.getResourceTypeDefinitions();