Changeset 417

Timestamp:

11/11/08 09:07:39 (2 months ago)

Author:

arneke

Message:

Added ability to grab configuration from geoserver data directory

Location:

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

Files:

• cache/file/FileCache.java (modified) (1 diff)
• util/XMLConfiguration.java (modified) (6 diffs)

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

@@ -35 +35 @@
 import org.geowebcache.cache.CacheException;
 import org.geowebcache.cache.CacheKey;
-import org.geowebcache.layer.wms.WMSLayer;
 import org.geowebcache.tile.Tile;
 import org.geowebcache.util.GWCVars;

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

@@ -36 +36 @@
 import org.apache.commons.logging.LogFactory;
 import org.geowebcache.GeoWebCacheException;
+import org.geowebcache.cache.CacheException;
 import org.geowebcache.cache.CacheFactory;
+import org.geowebcache.cache.file.FileCache;
+import org.geowebcache.cache.file.FilePathKey2;
 import org.geowebcache.layer.Grid;
 import org.geowebcache.layer.TileLayer;
@@ -72 +75 @@
     private File configH = null;
 
+    private FileCache fileCache = null;
+    
     /**
      * XMLConfiguration class responsible for reading/writing layer
@@ -320 +325 @@
         /*
          * Try 
-         * 1) absolute path 
-         * 2) relative path 
-         * 3) standard paths
+         * 1) absolute path (specified in bean defn)
+         * 2) relative path (specified in bean defn)
+         * 3) environment variables
+         * 4) standard paths
          */
         if (absPath != null) {
@@ -331 +337 @@
                     + configH.getAbsolutePath());
         } else if (relPath == null) {
-            for (int i = 0; i < CONFIGURATION_REL_PATHS.length; i++) {
-                relPath = CONFIGURATION_REL_PATHS[i];
-                if (File.separator.equals("\\")) {
-                    relPath = relPath.replace("/", "\\");
+            // Try env variables
+            File tmpPath = null;
+
+            if (fileCache != null) {
+                try {
+                    // Careful, this appends a separator
+                    tmpPath = new File(fileCache.getDefaultPrefix(CONFIGURATION_FILE_NAME));
+
+                    if (tmpPath.exists() && tmpPath.canRead()) {
+                        String filePath = tmpPath.getAbsolutePath();
+                        configH = new File(filePath.substring(0, 
+                                filePath.length()
+                                - CONFIGURATION_FILE_NAME.length() - 1));
+                    }
+                } catch (CacheException ce) {
+                    // Ignore
                 }
-
-                File tmpPath = new File(baseDir + relPath + File.separator
-                        + CONFIGURATION_FILE_NAME);
-
-                if (tmpPath.exists()) {
-                    log.info("No configuration directory was specified, using "
-                            + tmpPath.getAbsolutePath());
-                    configH = new File(baseDir + relPath);
+            }
+
+            // Finally, try "standard" paths if we have to.
+            if (configH == null) {
+                for (int i = 0; i < CONFIGURATION_REL_PATHS.length; i++) {
+                    relPath = CONFIGURATION_REL_PATHS[i];
+                    if (File.separator.equals("\\")) {
+                        relPath = relPath.replace("/", "\\");
+                    }
+
+                    tmpPath = new File(baseDir + relPath + File.separator
+                            + CONFIGURATION_FILE_NAME);
+
+                    if (tmpPath.exists() && tmpPath.canRead()) {
+                        log.info("No configuration directory was specified, using "
+                                        + tmpPath.getAbsolutePath());
+                        configH = new File(baseDir + relPath);
+                    }
                 }
             }
@@ -349 +377 @@
        
         if(configH == null) {
-            log.error("Failed to find geowebcache.xml, please specify an absolute path "
-                    +"in geowebcache-servlet.xml!");
+            log.error("Failed to find geowebcache.xml");
         } else {
             log.info("Configuration directory set to: "+ configH.getAbsolutePath());
@@ -370 +397 @@
     public void setAbsolutePath(String absPath) {
         this.absPath = absPath;
+    }
+    
+    public void setFileCache(FileCache fileCache) {
+        this.fileCache = fileCache;
     }