Changeset 426 for trunk

Timestamp:

11/17/08 16:26:53 (7 weeks ago)

Author:

arneke

Message:

Increasing robustness to absence of geowebcache.xml, got a bit confused on Tomcat for some reason

Location:

trunk/geowebcache/src/main/java/org/geowebcache

Files:

• cache/file/FileCache.java (modified) (1 diff)
• layer/TileLayerDispatcher.java (modified) (1 diff)
• util/XMLConfiguration.java (modified) (4 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/cache/file/FileCache.java

@@ -49 +49 @@
     public final static String GS_DATA_DIR = "GEOSERVER_DATA_DIR";
 
-    private static Log log = LogFactory
-            .getLog(org.geowebcache.cache.file.FileCache.class);
+    private static Log log = LogFactory.getLog(org.geowebcache.cache.file.FileCache.class);
 
     private String defaultKeyBeanId = null;

trunk/geowebcache/src/main/java/org/geowebcache/layer/TileLayerDispatcher.java

@@ -110 +110 @@
             Configuration config = configIter.next();
 
-            try {
-                configLayers = config.getTileLayers();
-            } catch (GeoWebCacheException gwce) {
-                log.error(gwce.getMessage());
-                log.error("Failed to add layers from "
-                                + config.getIdentifier());
-            }
+            String configIdent = config.getIdentifier();
 
-            log.info("Adding layers from " + config.getIdentifier());
-            if (configLayers != null && configLayers.size() > 0) {
-                Iterator<Entry<String,TileLayer>> iter = configLayers.entrySet().iterator();
-                while (iter.hasNext()) {
-                    Entry<String,TileLayer> one = iter.next();
-                    layers.put(one.getKey(), one.getValue());
+            if (configIdent != null) {
+                try {
+                    configLayers = config.getTileLayers();
+                } catch (GeoWebCacheException gwce) {
+                    log.error(gwce.getMessage());
+                    log.error("Failed to add layers from " + configIdent);
                 }
-            } else {
-                log.error("Configuration " + config.getIdentifier()
-                        + " contained no layers.");
+
+                log.info("Adding layers from " + configIdent);
+                if (configLayers != null && configLayers.size() > 0) {
+                    Iterator<Entry<String, TileLayer>> iter = configLayers
+                            .entrySet().iterator();
+                    while (iter.hasNext()) {
+                        Entry<String, TileLayer> one = iter.next();
+                        layers.put(one.getKey(), one.getValue());
+                    }
+                } else {
+                    log.error("Configuration " + configIdent
+                            + " contained no layers.");
+                }
             }
         }

trunk/geowebcache/src/main/java/org/geowebcache/util/XMLConfiguration.java

@@ -97 +97 @@
         File xmlFile = null;
         if (configH != null) {
-            // Find the property file
             xmlFile = new File(configH.getAbsolutePath() + File.separator + CONFIGURATION_FILE_NAME);
         } else {
@@ -120 +119 @@
         
         HashMap<String, TileLayer> layers = new HashMap<String, TileLayer>();
-
+        
         // load configurations into Document
         Document docc = loadIntoDocument(xmlFile);
-        Element root = docc.getDocumentElement();
-        NodeList allLayerNodes = root.getChildNodes();
-
-        XStream xs = getConfiguredXStream(new XStream());
-
-        TileLayer result = null;
-        for (int i = 0; i < allLayerNodes.getLength(); i++) {
-            if (allLayerNodes.item(i) instanceof Element) {
-                Element e = (Element) allLayerNodes.item(i);
-                if (e.getTagName().equalsIgnoreCase("wmslayer"))
-                    result = (WMSLayer) xs.unmarshal(new DomReader(
-                            (Element) allLayerNodes.item(i)));
-                result.setCacheFactory(this.cacheFactory);
-                layers.put(result.getName(), result);
-            }
+        if(docc != null) {
+            Element root = docc.getDocumentElement();
+            NodeList allLayerNodes = root.getChildNodes();
+
+            XStream xs = getConfiguredXStream(new XStream());
+
+            TileLayer result = null;
+            for (int i = 0; i < allLayerNodes.getLength(); i++) {
+                if (allLayerNodes.item(i) instanceof Element) {
+                    Element e = (Element) allLayerNodes.item(i);
+                    if (e.getTagName().equalsIgnoreCase("wmslayer"))
+                        result = (WMSLayer) xs.unmarshal(new DomReader(
+                                (Element) allLayerNodes.item(i)));
+                    result.setCacheFactory(this.cacheFactory);
+                    layers.put(result.getName(), result);
+                }
+            }
+        } else {
+            
         }
 
@@ -382 +385 @@
         
             if (!configH.exists() || !configH.canRead()) {
-                log.error(configH.getAbsoluteFile()+ " cannot be read or does not exist!");
+                log.error("Configuration file cannot be read or does not exist!");
             }
         }
@@ -388 +391 @@
 
     public String getIdentifier() {
-        return configH.getAbsolutePath();
+        if(configH != null) {
+          return configH.getAbsolutePath();
+        } else {
+            return null;
+        }
     }