(no commit message)

diff --git a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/DatabaseServiceHibernateImpl.java b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/DatabaseServiceHibernateImpl.java
index f23d49fed46d44bb3e1b90fb19da5574745f8bb4..cc89447f3d0475a8871f68d4763fa865dfd83014 100644 (file)
--- a/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/DatabaseServiceHibernateImpl.java
+++ b/cdmlibrary/src/main/java/eu/etaxonomy/cdm/api/service/DatabaseServiceHibernateImpl.java
@@ -25,7 +25,7 @@ import org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBea
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;\r
 import org.springframework.stereotype.Service;\r
 \r
-import eu.etaxonomy.cdm.database.DatabaseEnum;\r
+import eu.etaxonomy.cdm.database.DatabaseTypeEnum;\r
 import eu.etaxonomy.cdm.database.types.MySQLDatabaseType;\r
 \r
 /**\r
@@ -46,9 +46,9 @@ public class DatabaseServiceHibernateImpl extends ServiceBase implements IDataba
        }\r
 \r
        /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.service.IDatabaseService#connectToDatabase(eu.etaxonomy.cdm.database.DatabaseEnum, java.lang.String, java.lang.String, java.lang.String, java.lang.String, int)\r
+        * @see eu.etaxonomy.cdm.api.service.IDatabaseService#connectToDatabase(eu.etaxonomy.cdm.database.DatabaseTypeEnum, java.lang.String, java.lang.String, java.lang.String, java.lang.String, int)\r
         */\r
-       public boolean connectToDatabase(DatabaseEnum databaseEnum, String server,\r
+       public boolean connectToDatabase(DatabaseTypeEnum databaseTypeEnum, String server,\r
                        String database, String username, String password, int port) {\r
                Session session;\r
                DriverManagerDataSource aDataSource = getDataSource();\r
@@ -65,15 +65,15 @@ public class DatabaseServiceHibernateImpl extends ServiceBase implements IDataba
                \r
                //set Dialect\r
                Properties props = sfb.getHibernateProperties();\r
-               props.setProperty("hibernate.dialect", databaseEnum.getHibernateDialect());\r
+               props.setProperty("hibernate.dialect", databaseTypeEnum.getHibernateDialect());\r
                System.out.println(props.propertyNames());\r
                System.out.println(props.getProperty("hibernate.dialect"));\r
                \r
                //change Datasource\r
-               aDataSource.setDriverClassName(databaseEnum.getDriverClassName());\r
+               aDataSource.setDriverClassName(databaseTypeEnum.getDriverClassName());\r
                aDataSource.setUsername(username);\r
                aDataSource.setPassword(password);\r
-               aDataSource.setUrl(databaseEnum.getConnectionString(server, database, port));\r
+               aDataSource.setUrl(databaseTypeEnum.getConnectionString(server, database, port));\r
                \r
                //update schema\r
                sfb.updateDatabaseSchema();\r
@@ -89,11 +89,11 @@ public class DatabaseServiceHibernateImpl extends ServiceBase implements IDataba
                //System.out.println(dsProp);\r
                //              cfg.setProperties(sfb.getHibernateProperties());\r
 //             \r
-               cfg.setProperty("hibernate.connection.driver_class", databaseEnum.getDriverClassName());\r
-               cfg.setProperty("hibernate.connection.url", databaseEnum.getConnectionString(server, database, port));\r
+               cfg.setProperty("hibernate.connection.driver_class", databaseTypeEnum.getDriverClassName());\r
+               cfg.setProperty("hibernate.connection.url", databaseTypeEnum.getConnectionString(server, database, port));\r
                cfg.setProperty("hibernate.connection.username", username);\r
                cfg.setProperty("hibernate.connection.password", password);\r
-               cfg.setProperty("hibernate.dialect", databaseEnum.getHibernateDialect());\r
+               cfg.setProperty("hibernate.dialect", databaseTypeEnum.getHibernateDialect());\r
                \r
                Properties ps = cfg.getProperties();\r
                Iterator<Object> it =   ps.keySet().iterator();\r
@@ -123,19 +123,19 @@ public class DatabaseServiceHibernateImpl extends ServiceBase implements IDataba
 \r
 \r
        /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.api.service.IDatabaseService#connectToDatabase(eu.etaxonomy.cdm.database.DatabaseEnum, java.lang.String, java.lang.String, java.lang.String, java.lang.String)\r
+        * @see eu.etaxonomy.cdm.api.service.IDatabaseService#connectToDatabase(eu.etaxonomy.cdm.database.DatabaseTypeEnum, java.lang.String, java.lang.String, java.lang.String, java.lang.String)\r
         */\r
-       public boolean connectToDatabase(DatabaseEnum databaseEnum, String server,\r
+       public boolean connectToDatabase(DatabaseTypeEnum databaseTypeEnum, String server,\r
                        String database, String username, String password) {\r
-               return connectToDatabase(databaseEnum, server, database, username, password, databaseEnum.getDefaultPort()) ;\r
+               return connectToDatabase(databaseTypeEnum, server, database, username, password, databaseTypeEnum.getDefaultPort()) ;\r
        }\r
        \r
 \r
        /* (non-Javadoc)\r
         * @see eu.etaxonomy.cdm.api.service.IDatabaseService#getDatabaseTypeName()\r
         */\r
-       public DatabaseEnum getDatabaseEnum() {\r
-               return DatabaseEnum.getDatabaseEnumByDriverClass(getDataSource().getDriverClassName());\r
+       public DatabaseTypeEnum getDatabaseEnum() {\r
+               return DatabaseTypeEnum.getDatabaseEnumByDriverClass(getDataSource().getDriverClassName());\r
        }\r
 \r
 \r