removing @Override for compatibility with java 1.6

[cdmlib.git] / cdmlib-persistence / src / main / java / eu / etaxonomy / cdm / database / types / HSqlDbDatabaseType.java

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/HSqlDbDatabaseType.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/HSqlDbDatabaseType.java
index 7853345a2c9fea013c120ecddf564207e012e897..2c531a9d48c5eb3d0123a126ad7d5466f73e0419 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/HSqlDbDatabaseType.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/HSqlDbDatabaseType.java
@@ -9,7 +9,10 @@
 \r
 package eu.etaxonomy.cdm.database.types;\r
 \r
-import org.springframework.jdbc.datasource.DriverManagerDataSource;\r
+import javax.sql.DataSource;\r
+\r
+import org.hibernate.dialect.Dialect;\r
+import org.hibernate.dialect.HSQLCorrectedDialect;\r
 \r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.database.LocalHsqldb;\r
@@ -34,7 +37,7 @@ public class HSqlDbDatabaseType extends DatabaseTypeBase {
     private int defaultPort = 9001;\r
     \r
     //hibernate dialect\r
-    private String hibernateDialect = "HSQLDialect";\r
+    private Dialect hibernateDialect = new HSQLCorrectedDialect();\r
     \r
     //init method\r
     private String initMethod = "init";\r
@@ -44,7 +47,23 @@ public class HSqlDbDatabaseType extends DatabaseTypeBase {
     \r
     //connection String\r
        public String getConnectionString(ICdmDataSource ds, int port){\r
-        return urlString + ds.getServer() + ":" + port + "/" + ds.getDatabase();\r
+        return urlString + ds.getServer() + ":" + port + dbSeparator + ds.getDatabase();\r
+    }\r
+       \r
+       private static String dbSeparator = "/";\r
+       \r
+    /* (non-Javadoc)\r
+     * @see eu.etaxonomy.cdm.database.types.DatabaseTypeBase#getServerNameByConnectionString(java.lang.String)\r
+     */\r
+    public String getDatabaseNameByConnectionString(String connectionString){\r
+       String result;\r
+       result = getDatabasePartOfConnectionString(connectionString, dbSeparator);\r
+       //TODO\r
+//     int posParams = result.indexOf("?");\r
+//     if (posParams != -1){\r
+//             result = result.substring(0, posParams);\r
+//     }\r
+       return result;\r
     }\r
        \r
     \r
@@ -53,7 +72,7 @@ public class HSqlDbDatabaseType extends DatabaseTypeBase {
        }\r
 \r
        @Override\r
-       public Class<? extends DriverManagerDataSource> getDriverManagerDataSourceClass() {\r
+       public Class<? extends DataSource> getDataSourceClass() {\r
                return LocalHsqldb.class;\r
        }\r
 \r