Changeset 331

Timestamp:

08/15/08 15:06:24 (3 months ago)

Author:

masuta

Message:

gwc with seedrequest in json format - new bug: null pointer in getCoveredGridLevels in doSeed()

Location:

trunk/geowebcache/src/main

Files:

• java/org/geowebcache/layer/wms/WMSLayer.java (modified) (1 diff)
• java/org/geowebcache/seeder/SeedResource.java (modified) (2 diffs)
• java/org/geowebcache/util/XMLConfiguration.java (modified) (1 diff)
• resources/seedtest.json (modified) (1 diff)

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

@@ -744 +744 @@
                     + adjustedBounds.toString());
         }
-        return this.gridCalc[srsIdx].coveredGridLevels(adjustedBounds);
+        int[][]temp = this.gridCalc[srsIdx].coveredGridLevels(adjustedBounds);
+        return temp; 
     }
 

trunk/geowebcache/src/main/java/org/geowebcache/seeder/SeedResource.java

@@ -34 +34 @@
 
 import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.HierarchicalStreamDriver;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.copy.HierarchicalStreamCopier;
 import com.thoughtworks.xstream.io.json.JsonHierarchicalStreamDriver;
 import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver;
 import com.thoughtworks.xstream.io.xml.DomDriver;
+import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
+
 import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.util.concurrent.*;
 
@@ -92 +99 @@
         try {
             String text = entity.getText();
-            XStream xs = null;
-            if(entity.getMediaType().equals(MediaType.APPLICATION_XML))
-                xs = new XStream(new DomDriver());
-            else if(entity.getMediaType().equals(MediaType.APPLICATION_JSON)){
-                xs = new XStream(new JettisonMappedXmlDriver());
-            }
-            xs.alias("seedRequest", SeedRequest.class);
+            XStream xs = new XStream(new DomDriver());
+                xs.alias("seedRequest", SeedRequest.class);
             xs.alias("format", String.class);
+            xs.alias("bounds", BBOX.class);
             xs.alias("projection", SRS.class);
-            xs.alias("bounds", BBOX.class);
             xs.alias("zoomstart", Integer.class);
             xs.alias("zoomstop", Integer.class);
-            SeedRequest rq = (SeedRequest) xs.fromXML(text);
-
-            XStream xst = new XStream(new JettisonMappedXmlDriver());
-            xst.alias("seedRequest", SeedRequest.class);
-            xst.alias("format", String.class);
-            xst.alias("projection", SRS.class);
-            xst.alias("bounds", BBOX.class);
-            xst.alias("zoomstart", Integer.class);
-            xst.alias("zoomstop", Integer.class);
-            
-            String json = xst.toXML(rq);
-            SeedRequest rq1 = (SeedRequest) xst.fromXML(json);
-            System.out.println("json for is " + json);
-            
+            SeedRequest rq = null; 
+            if(entity.getMediaType().equals(MediaType.APPLICATION_XML)){
+                rq = (SeedRequest) xs.fromXML(text);
+            }
+            else if(entity.getMediaType().equals(MediaType.APPLICATION_JSON)){
+                HierarchicalStreamDriver driver = new JettisonMappedXmlDriver();
+                StringReader reader = new StringReader(text);
+                HierarchicalStreamReader hsr = driver.createReader(reader);
+                StringWriter writer = new StringWriter();
+                new HierarchicalStreamCopier().copy(hsr, new PrettyPrintWriter(writer));
+                writer.close();
+                String test = writer.toString();
+                
+                rq = (SeedRequest) xs.fromXML(test);
+            }
+                   
             getExecutor().submit(new MTSeeder(new SeedTask(rq)));
 

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

@@ -291 +291 @@
     }
 
+    /**
+     * 
+     * Method finds the layer configuration XML file
+     * 
+     * @param configDirH
+     * @return
+     */
+    private File findPropFile(File configDirH) {
+        FilenameFilter select = new ExtensionFileLister("geowebcache", "xml");
+        File[] f = configDirH.listFiles(select);
+
+        if (f == null) {
+            log.error("Unable to find configuration file in "
+                    + this.configDirH.getAbsolutePath() + " !! ");
+            return null;
+        } else {
+            return f[0];
+        }
+    }
+
+
     public void determineConfigDirH() {
         if (absPath != null) {

trunk/geowebcache/src/main/resources/seedtest.json

@@ -1 @@
-{"seedRequest":{"name":"topp:states","bounds":{"coords":{"double":["-124.0","22.0","66.0","72.0"]},"projection":{"number":4326},"zoomstart":1,"zoomstop":12,"format":"image\/png"}}} 
+{"seedRequest":{"name":"topp:states","bounds":{"coords":{"double":["-124.0","22.0","66.0","72.0"]}},"projection":{"number":4326},"zoomstart":1,"zoomstop":12,"format":"image\/png"}}}