Displaying differences for changeset
 
display as  

src/java/m/gis/Database.java

@@ -18,9 +18,11 @@
 public class Database {
 
     protected Connection conn;
+    protected Logger LOG;
 
-    public Database(String hostname, String port, String dbName, String username, String password) {
+    public Database(String hostname, String port, String dbName, String username, String password, Logger log) {
         conn = getConnection(hostname, port, dbName, username, password);
+        LOG = log;
     }
 
     public static Connection getConnection(String hostname, String port, String dbName, String username, String password) {

src/java/m/gis/DatabaseBuilder.java

@@ -9,6 +9,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 /**
  *
@@ -22,6 +26,7 @@
     public static enum DB { POSTGRES };
 
     private DB type;
+    private Logger log;
     private String port;
     private String dbName;
     private String hostname;
@@ -32,22 +37,15 @@
         
     }
 
-    public DatabaseBuilder setAll(String filename) throws IOException {
-        Properties prop = new Properties();
-        InputStream inputStream = getClass().getClassLoader().getResourceAsStream(filename);
- 
-        if (inputStream != null) {
-            prop.load(inputStream);
-        } else {
-            throw new FileNotFoundException("property file '" + filename + "' not found in the classpath");
-        }
+    public DatabaseBuilder setAll(Logger log) {
 
         setType(DB.POSTGRES)
-            .setHostname(prop.getProperty("hostname"))
-            .setPort(prop.getProperty("port"))
-            .setDbName(prop.getProperty("dbName"))
-            .setUsername(prop.getProperty("username"))
-            .setPassword(prop.getProperty("password"));
+                .setLogger(log)
+                .setHostname("localhost")
+                .setPort("5432")
+                .setDbName("erams")
+                .setUsername("erams")
+                .setPassword("ids12_foTT");
         
         return this;
     }
@@ -57,6 +55,11 @@
         return this;
     }
 
+    public DatabaseBuilder setLogger(Logger log) {
+        this.log = log;
+        return this;
+    }
+
     public DatabaseBuilder setHostname(String hostname) {
         this.hostname = hostname;
         return this;
@@ -85,9 +88,9 @@
     public Database create() {
         switch (type) {
             case POSTGRES:
-                return new PostgresqlDatabase(hostname, port, dbName, username, password);
+                return new PostgresqlDatabase(hostname, port, dbName, username, password, log);
             default:
-                return new PostgresqlDatabase(hostname, port, dbName, username, password);
+                return new PostgresqlDatabase(hostname, port, dbName, username, password, log);
         }
     }
     

src/java/m/gis/PostgresqlDatabase.java

@@ -5,14 +5,16 @@
  */
 package m.gis;
 
+import java.util.logging.Logger;
+
 /**
  *
  * @author ktraff
  */
 public class PostgresqlDatabase extends Database {
 
-    public PostgresqlDatabase(String hostname, String port, String dbName, String username, String password) {
-        super(hostname, port, dbName, username, password);
+    public PostgresqlDatabase(String hostname, String port, String dbName, String username, String password, Logger log) {
+        super(hostname, port, dbName, username, password, log);
     }
     
 }

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

@@ -34,13 +34,14 @@
         geoms = getJSONArrayParam("geometries");
         LOG.info("received geometries: " + geoms.toString());  
         db = new DatabaseBuilder()
-                .setAll(System.getProperty("user.home") + "/.csip-gis.properties")
+                .setAll(LOG)
                 .create();
     }
 
     @Override
     protected String process() throws Exception {
         result = new JSONObject();
+        result.put("test", "test");
         return EXEC_OK;
     }
 

web/META-INF/csip-conf.json

@@ -1,5 +1,5 @@
 { 
-  "csip.archive.enabled"  : true,
-  "csip.logging.enabled"  : true,
+  "csip.archive.enabled"  : false,
+  "csip.logging.enabled"  : false,
   "csip.hazelcast.server" : true
 }