[Geotools-commits] svn - r31922 - in trunk/modules/unsupported/jdbc-ng/jdbc-db2/src: main/java/org/geotools/data/db2 test/java/org/geotools/data/db2

[<chr...@sv...>]

Author: christian.mueller
Date: 2008-11-27 04:34:24 -0800 (Thu, 27 Nov 2008)
New Revision: 31922

Modified:
   trunk/modules/unsupported/jdbc-ng/jdbc-db2/src/main/java/org/geotools/data/db2/DB2NGDataStoreFactory.java
   trunk/modules/unsupported/jdbc-ng/jdbc-db2/src/test/java/org/geotools/data/db2/DB2DataStoreFactoryTest.java
Log:
Assure coexistence of new and old db2 plugin

Modified: trunk/modules/unsupported/jdbc-ng/jdbc-db2/src/main/java/org/geotools/data/db2/DB2NGDataStoreFactory.java
===================================================================
--- trunk/modules/unsupported/jdbc-ng/jdbc-db2/src/main/java/org/geotools/data/db2/DB2NGDataStoreFactory.java	2008-11-26 20:29:42 UTC (rev 31921)
+++ trunk/modules/unsupported/jdbc-ng/jdbc-db2/src/main/java/org/geotools/data/db2/DB2NGDataStoreFactory.java	2008-11-27 12:34:24 UTC (rev 31922)
@@ -16,6 +16,9 @@
  */
 package org.geotools.data.db2;
 
+import java.io.IOException;
+import java.util.Map;
+
 import org.geotools.jdbc.JDBCDataStore;
 import org.geotools.jdbc.JDBCDataStoreFactory;
 import org.geotools.jdbc.SQLDialect;
@@ -37,7 +40,7 @@
     }
 
     public String getDisplayName() {
-        return "DB2";
+        return "DB2 NG";
     }
     
     protected String getDriverClassName() {
@@ -56,4 +59,26 @@
     protected String getValidationQuery() {
         return "select current date from sysibm.sysdummy1";
     }
+    
+    @Override
+    protected String getJDBCUrl(Map params) throws IOException {
+        // jdbc url
+    	String host=null;
+    	Integer port = null;
+    	try {
+    		host = (String) HOST.lookUp(params);
+    		port = (Integer) PORT.lookUp(params);
+    	} catch (IOException ex) {
+    		// do nothing
+    	}
+    	
+        String db = (String) DATABASE.lookUp(params);
+        
+        if (host==null && port== null && db !=null)
+        	return "jdbc:"+getDatabaseID()+":"+db;
+
+        return super.getJDBCUrl(params);
+    }
+    
+    
 }

Modified: trunk/modules/unsupported/jdbc-ng/jdbc-db2/src/test/java/org/geotools/data/db2/DB2DataStoreFactoryTest.java
===================================================================
--- trunk/modules/unsupported/jdbc-ng/jdbc-db2/src/test/java/org/geotools/data/db2/DB2DataStoreFactoryTest.java	2008-11-26 20:29:42 UTC (rev 31921)
+++ trunk/modules/unsupported/jdbc-ng/jdbc-db2/src/test/java/org/geotools/data/db2/DB2DataStoreFactoryTest.java	2008-11-27 12:34:24 UTC (rev 31922)
@@ -38,10 +38,14 @@
         params.put(JDBCDataStoreFactory.DATABASE.key, "geotools");
         params.put(JDBCDataStoreFactory.DBTYPE.key, "db2");
 
-        params.put(JDBCDataStoreFactory.HOST.key, "localhost");
-        params.put(JDBCDataStoreFactory.PORT.key, "50001");
         params.put(JDBCDataStoreFactory.USER.key, "db2inst1");
         params.put(JDBCDataStoreFactory.PASSWD.key, "db2inst1");
+        assertEquals("jdbc:db2:geotools",factory.getJDBCUrl(params) );
+        
+        params.put(JDBCDataStoreFactory.HOST.key, "localhost");
+        params.put(JDBCDataStoreFactory.PORT.key, "50001");                
+        assertEquals("jdbc:db2://localhost:50001/geotools",factory.getJDBCUrl(params) );
+        
         assertTrue(factory.canProcess(params));
     }
 }