refactor and clean of the distribution view model.

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / deploy / DefaultResourceSet.java

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DefaultResourceSet.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DefaultResourceSet.java
index 1f8dbe403fb3e94c2918f437736f8ce787951d4d..abdcfeec38c4fc77197a1258c1cf5351558eeea0 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DefaultResourceSet.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DefaultResourceSet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.core.deploy;
 
 import java.io.IOException;
@@ -38,9 +53,11 @@ public class DefaultResourceSet implements ResourceLoaderAware,
        /** List the resources, identified by their relative path. */
        public Map<String, Resource> listResources() {
                try {
+                       Map<String, Resource> res = new TreeMap<String, Resource>();
+                       if (base == null)
+                               return res;
                        String baseResUrl = getResourceLoaderToUse().getResource(base)
                                        .getURL().toString();
-                       Map<String, Resource> res = new TreeMap<String, Resource>();
                        for (String includePattern : includes)
                                processInclude(res, includePattern, baseResUrl);
                        return res;
@@ -52,8 +69,8 @@ public class DefaultResourceSet implements ResourceLoaderAware,
        protected void processInclude(Map<String, Resource> res, String include,
                        String baseResUrl) throws IOException {
                String pattern = base + "/" + include;
-               if (log.isDebugEnabled())
-                       log.debug("Look for resources with pattern '" + pattern
+               if (log.isTraceEnabled())
+                       log.trace("Look for resources with pattern '" + pattern
                                        + "' in base url " + baseResUrl);
                Resource[] resources = resourcePatternResolver.getResources(pattern);
                resources: for (Resource resource : resources) {
@@ -63,7 +80,7 @@ public class DefaultResourceSet implements ResourceLoaderAware,
                        // skip dir
                        if (relPath.charAt(relPath.length() - 1) == '/') {
                                if (log.isTraceEnabled())
-                                       log.debug("Skip directory " + relPath + "=" + resource);
+                                       log.trace("Skip directory " + relPath + "=" + resource);
                                continue resources;
                        }
 
@@ -75,7 +92,7 @@ public class DefaultResourceSet implements ResourceLoaderAware,
                        for (String exclude : excludes)
                                if (excludePathMatcher.match(exclude, relPath)) {
                                        if (log.isTraceEnabled())
-                                               log.debug("Exclude " + relPath + "=" + resource);
+                                               log.trace("Exclude " + relPath + "=" + resource);
                                        continue resources;
                                }
 
@@ -86,8 +103,8 @@ public class DefaultResourceSet implements ResourceLoaderAware,
 
                        // store the marched resource
                        res.put(relPath, resource);
-                       if (log.isDebugEnabled())
-                               log.debug(relPath + "=" + resource);
+                       if (log.isTraceEnabled())
+                               log.trace(relPath + "=" + resource);
                }
 
        }