Changeset 377 for trunk/geowebcache/src/main/java/org/geowebcache/GeoWebCacheDispatcher.java

Timestamp:

09/03/08 21:45:23 (4 months ago)

Author:

arneke

Message:

Minor tweak for servletPrefix, add slash in front if necessary

Files:

• trunk/geowebcache/src/main/java/org/geowebcache/GeoWebCacheDispatcher.java (modified) (4 diffs)

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

@@ -61 +61 @@
     
     private byte[] blankPNG8 = null; 
+    
+    private String servletPrefix = null;
 
     public GeoWebCacheDispatcher() {
@@ -85 +87 @@
      */
     public void setServletPrefix(String servletPrefix) {
-        //this.servletPrefix = servletPrefix;
-        log.warn("Ignored setServletPrefix("+servletPrefix+")");
+        if(! servletPrefix.startsWith("/")) {
+            this.servletPrefix = "/" + servletPrefix; 
+        } else {
+            this.servletPrefix = servletPrefix;
+        }
+        
+        log.info("Invoked setServletPrefix("+servletPrefix+")");
     }
 
@@ -140 +147 @@
         try {
             String normalizedURI = request.getRequestURI().replaceFirst(request.getContextPath(), "");
-            requestComps = parseRequest(normalizedURI);
+            
+            if(servletPrefix != null) {
+                normalizedURI =  normalizedURI.replaceFirst(servletPrefix, ""); //getRequestURI().replaceFirst(request.getContextPath()+, "");
+            }
+             requestComps = parseRequest(normalizedURI);
             //requestComps = parseRequest(request.getRequestURI());
         } catch (GeoWebCacheException gwce) {
@@ -283 +294 @@
         if (service == null) {
             if(serviceStr == null || serviceStr.length() == 0) {
-                serviceStr = ", try service/<name of service>";
+                serviceStr = ", try service/&lt;name of service&gt;";
             } else {
                 serviceStr = " \""+ serviceStr + "\"";