Displaying differences for changeset
 
display as  

nbproject/build-impl.xml

@@ -1034,12 +1034,14 @@
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
         <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.csip-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.postgresql-9.3-1103.jdbc41.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
         <copyfiles files="${libs.CSIP-Jersey-2.16.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${reference.csip-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.postgresql-9.3-1103.jdbc41.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>

nbproject/genfiles.properties

@@ -3,8 +3,8 @@
 build.xml.stylesheet.CRC32=651128d4@1.65.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=5d23d747
-nbproject/build-impl.xml.script.CRC32=1a936a17
+nbproject/build-impl.xml.data.CRC32=05326df7
+nbproject/build-impl.xml.script.CRC32=c2ded384
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1
 nbproject/rest-build.xml.data.CRC32=bff4a8fe
 nbproject/rest-build.xml.script.CRC32=4734534b

nbproject/private/private.xml

@@ -25,12 +25,10 @@
         </group>
         <group>
             <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/intersect/V1_0.java</file>
-            <file>file:/Users/ktraff/NetBeansProjects/csip-gis/test/service_tests/intersect_V1_0/service.properties</file>
-            <file>file:/Users/ktraff/NetBeansProjects/csip-gis/test/service_tests/intersect_V1_0/STest.java</file>
-            <file>file:/Users/ktraff/NetBeansProjects/csip-gis/test/service_tests/intersect_V1_0/simple-req.json</file>
-            <file>file:/Users/ktraff/NetBeansProjects/csip-gis/test/service_tests/intersect_V1_0/simple-res.json</file>
+            <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/Database.java</file>
+            <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/PostgresqlDatabase.java</file>
             <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/intersect/V1_0.json</file>
-            <file>file:/Users/ktraff/NetBeansProjects/csip-gis/test/service_tests/service.properties</file>
+            <file>file:/Users/ktraff/NetBeansProjects/csip-gis/src/java/m/gis/DatabaseBuilder.java</file>
         </group>
     </open-files>
 </project-private>

nbproject/project.properties

@@ -33,6 +33,7 @@
 endorsed.classpath=\
     ${libs.javaee-endorsed-api-6.0.classpath}
 excludes=
+file.reference.postgresql-9.3-1103.jdbc41.jar=lib/postgresql-9.3/postgresql-9.3-1103.jdbc41.jar
 includes=**
 j2ee.compile.on.save=false
 j2ee.copy.static.files.on.save=false
@@ -43,7 +44,8 @@
 jar.compress=false
 javac.classpath=\
     ${libs.CSIP-Jersey-2.16.classpath}:\
-    ${reference.csip-core.jar}
+    ${reference.csip-core.jar}:\
+    ${file.reference.postgresql-9.3-1103.jdbc41.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true

nbproject/project.xml

@@ -20,6 +20,10 @@
                     <file>${reference.csip-core.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library dirs="200">
+                    <file>${file.reference.postgresql-9.3-1103.jdbc41.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>

src/java/m/gis/intersect/V1_0.java

@@ -7,6 +7,8 @@
 
 import csip.ModelDataService;
 import javax.ws.rs.Path;
+import m.gis.Database;
+import m.gis.DatabaseBuilder;
 import oms3.annotations.*;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONObject;
@@ -24,11 +26,16 @@
     JSONArray geoms;    
     JSONObject result;    
 
+    private Database db;
+
 
     // 1) parse the service input 
     @Override
     protected void preProcess() throws Exception {
         geoms = getJSONArrayParam("geometries");
+        db = new DatabaseBuilder()
+                .setAll(System.getProperty("user.home") + "/.csip-gis.properties")
+                .create();
     }
 
     // 2) convert the temperature

test/service_tests/intersect_V1_0/simple-req.json

@@ -1,10 +1,36 @@
 {
-    "metainfo": {
-    },
-    "parameter": [ 
-     {
-      "name": "temp",
-      "value": 25
-     }
-    ]
+    "metainfo": {
+    },
+    "parameter": [
+        {
+            "name": "geometries",
+            "value": [{
+                "type": "MultiPolygon",
+                "crs": {
+                    "type": "name",
+                    "properties": {
+                        "name": "EPSG:4326"
+                    }
+                },
+                "coordinates": [
+                    [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                    [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                    [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
+                ]
+            }, {
+                "type": "MultiPolygon",
+                "crs": {
+                    "type": "name",
+                    "properties": {
+                        "name": "EPSG:4326"
+                    }
+                },
+                "coordinates": [
+                    [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+                    [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+                    [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
+                ]
+            }]
+        }
+    ]
 }
\ No newline at end of file