Changeset 346

Timestamp:

08/22/08 19:27:36 (3 months ago)

Author:

arneke

Message:

Removing old cruft, started reenabling old fields on layer object

Location:

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

Files:

• GeoWebCacheDispatcher.java (modified) (2 diffs)
• RESTDispatcher.java (deleted)
• layer/TileLayerResource.java (deleted)
• layer/wms/WMSHttpHelper.java (modified) (1 diff)
• layer/wms/WMSLayer.java (modified) (8 diffs)
• seeder (deleted)
• util/GetCapabilitiesConfiguration.java (modified) (5 diffs)

trunk/geowebcache/src/main/java/org/geowebcache/GeoWebCacheDispatcher.java

@@ -50 +50 @@
     public static final String TYPE_SERVICE = "service";
 
-    public static final String TYPE_SEED = "seed";
+    //public static final String TYPE_SEED = "seed";
 
     public static final String TYPE_TRUNCATE = "truncate";
@@ -85 +85 @@
 
     /**
-     * GeoServer and other solutions that embedd this dispatcher will prepend a
+     * GeoServer and other solutions that embedded this dispatcher will prepend a
      * path, this is used to remove it.
      * 

trunk/geowebcache/src/main/java/org/geowebcache/layer/wms/WMSHttpHelper.java

@@ -104 +104 @@
 
         int backendTries = 0; // keep track of how many backends we have tried
-        while (data == null && backendTries < layer.wmsURL.length) {
+        while (data == null && backendTries < layer.getWMSurl().length) {
             Request wmsrequest = new Request(layer.nextWmsURL(), wmsparams);
             try {

trunk/geowebcache/src/main/java/org/geowebcache/layer/wms/WMSLayer.java

@@ -56 +56 @@
 public class WMSLayer extends TileLayer {
     // needed in configuration object written to xml
-    private String WMSurl = null;
-
+    
+    private String[] wmsUrl = null;
+
+    private String wmsLayers = null;
+    
+    private String wmsStyles = null;
+    
     private int[] metaWidthHeight = null;
 
@@ -88 +93 @@
     private transient String vendorParameters;
 
-    protected transient String[] wmsURL;
+    //protected transient String[] wmsURL;
 
     private transient int curWmsURL;
@@ -94 +99 @@
     //private transient String wmsLayers;
 
-    private transient String wmsStyles;
+    //private transient String wmsStyles;
 
     //private transient WMSParameters wmsparams;
@@ -138 +143 @@
     
     public WMSLayer(String layerName, CacheFactory cacheFactory,
-            String wmsURL, List<String> mimeFormats,
-            Hashtable<SRS,Grid> grids, int[] metaWidthHeight,
-            String vendorParams) {
+            String[] wmsURL, String wmsLayers, String wmsStyles,
+            List<String> mimeFormats, Hashtable<SRS,Grid> grids, 
+            int[] metaWidthHeight, String vendorParams) {
      
         name = layerName;
         initCacheFactory = cacheFactory;
-        this.WMSurl = wmsURL;
+        this.wmsUrl = wmsURL;
+        this.wmsLayers = wmsLayers;
+        this.wmsStyles = wmsStyles;
         this.mimeFormats = mimeFormats;
         this.grids = grids;
@@ -578 +585 @@
         }
         // wms urls
-        wmsURL = WMSurl.split(",");
+        //wmsUrl = wmsUrl.split(",");
 
         // mimetypes
@@ -668 +675 @@
         wmsparams.setRequest(request);
         wmsparams.setVersion(version);
-        wmsparams.setLayer(this.name);
+        if(this.wmsLayers != null && this.wmsLayers.length() > 0) {
+            wmsparams.setLayer(this.wmsLayers);
+        } else {
+            wmsparams.setLayer(this.name);
+        }
+        
         wmsparams.setErrorMime(errormime);
 
@@ -697 +709 @@
      */
     protected String nextWmsURL() {
-        curWmsURL = (curWmsURL + 1) % wmsURL.length;
-        return wmsURL[curWmsURL];
+        curWmsURL = (curWmsURL + 1) % wmsUrl.length;
+        return wmsUrl[curWmsURL];
     }
 
@@ -919 +931 @@
     }
 
-    public void setWMSurl(String wmsurl) {
-        this.WMSurl = wmsurl;
-    }
-
-    public String getWMSurl() {
-        return this.WMSurl;
+    public void setWMSurl(String[] wmsurl) {
+        this.wmsUrl = wmsurl;
+    }
+
+    public String[] getWMSurl() {
+        return this.wmsUrl;
     }
 

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

@@ -146 +146 @@
             Layer layer = layerIter.next();
             String name = layer.getName();
+            String stylesStr = "";
             
             if (name != null) {
                 List styles = layer.getStyles();
-                String stylesStr = "";
+                
                 StringBuffer buf = new StringBuffer();
                 if(styles != null) {
@@ -161 +162 @@
                         hasOne = true;
                     }
-                }    
-                //TODO styles are not currently forwarded
+                    stylesStr = buf.toString();
+                }
                 
                 double minX = layer.getLatLonBoundingBox().getMinX();
@@ -180 +181 @@
                         latToSphericalMercatorY(maxY));
                
+                String[] wmsUrls = {wmsUrl};
+                
                 WMSLayer wmsLayer = null;
                 try {
-                    wmsLayer = getLayer(name, wmsUrl, bounds4326, 
+                    wmsLayer = getLayer(name, wmsUrls, bounds4326, 
                             bounds900913, stylesStr);
                 } catch (GeoWebCacheException gwc) {
@@ -198 +201 @@
     }
 
-    private WMSLayer getLayer(String name, String wmsurl, 
+    private WMSLayer getLayer(String name, String[] wmsurl, 
             BBOX bounds4326, BBOX bounds900913, String stylesStr)
             throws GeoWebCacheException {
@@ -230 +233 @@
         // TODO We're dropping the styles now...
         return new WMSLayer(name, this.cacheFactory,
-                wmsurl, mimeFormats, grids, metaWidthHeight, this.vendorParameters);
+                wmsurl, stylesStr, name, mimeFormats, grids, 
+                metaWidthHeight, this.vendorParameters);
     }