merge trunk into model change 3.6

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

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java
index 02bee3b0d0634bd75024f072f9aac024bad99d14..8340cece065e8211caf2079599878e1b7254ba02 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java
@@ -114,7 +114,7 @@ public class CdmDataSource extends CdmDataSourceBase {
                //FIXME in work\r
                int port = -1;\r
                H2Mode mode = H2Mode.EMBEDDED;\r
                //FIXME in work\r
                int port = -1;\r
                H2Mode mode = H2Mode.EMBEDDED;\r

-               CdmDataSource dataSource = new CdmDataSource(DatabaseTypeEnum.H2, null, database, port, username, password, null, mode, code);\r
+               CdmDataSource dataSource = new CdmDataSource(DatabaseTypeEnum.H2, null, database, port, username, password, filePath, mode, code);\r

                return dataSource;\r
        }\r
 \r
                return dataSource;\r
        }\r
 \r


@@ -130,6 +130,17 @@ public class CdmDataSource extends CdmDataSourceBase {
        }\r
 \r
 \r
        }\r
 \r
 \r

+       public static CdmDataSource NewInstance(ICdmDataSource dataSource) {\r
+               return new CdmDataSource(dataSource.getDatabaseType(),\r
+                               dataSource.getServer(),\r
+                               dataSource.getDatabase(),\r
+                               dataSource.getPort(),\r
+                               dataSource.getUsername(),\r
+                               dataSource.getPassword(),\r
+                               dataSource.getFilePath(),\r
+                               dataSource.getMode(),\r
+                               dataSource.getNomenclaturalCode());\r
+       }\r

        /**\r
         * @param server\r
         * @param database\r
        /**\r
         * @param server\r
         * @param database\r


@@ -160,6 +171,21 @@ public class CdmDataSource extends CdmDataSourceBase {
                return database;\r
        }\r
 \r
                return database;\r
        }\r
 \r

+       @Override\r
+       public String getServer() {\r
+               return server;\r
+       }\r
+       \r
+       @Override\r
+       public int getPort() {\r
+               return port;\r
+       }\r
+\r
+       @Override\r
+       public NomenclaturalCode getNomenclaturalCode() {\r
+               return nomenclaturalCode;\r
+       }\r
+       \r

        @Override\r
        public BeanDefinition getDatasourceBean(){\r
                AbstractBeanDefinition bd = new RootBeanDefinition(dbType.getDataSourceClass());\r
        @Override\r
        public BeanDefinition getDatasourceBean(){\r
                AbstractBeanDefinition bd = new RootBeanDefinition(dbType.getDataSourceClass());\r


@@ -267,6 +293,11 @@ public class CdmDataSource extends CdmDataSourceBase {
        public String getDatabase() {\r
                return database;\r
        }\r
        public String getDatabase() {\r
                return database;\r
        }\r

+       \r
+       @Override\r
+       public void setDatabase(String database) {\r
+               this.database = database;               \r
+       }\r

 \r
        @Override\r
        public DatabaseTypeEnum getDatabaseType() {\r
 \r
        @Override\r
        public DatabaseTypeEnum getDatabaseType() {\r


@@ -278,37 +309,46 @@ public class CdmDataSource extends CdmDataSourceBase {
                return filePath;\r
        }\r
 \r
                return filePath;\r
        }\r
 \r

-\r
-       @Override\r
-       public int getPort() {\r
-               return port;\r
-       }\r
-\r
-       @Override\r
-       public String getServer() {\r
-               return server;\r
-       }\r
-\r

        @Override\r
        public H2Mode getMode() {\r
                return mode;\r
        }\r
 \r
        @Override\r
        public H2Mode getMode() {\r
                return mode;\r
        }\r
 \r

+       @Override\r
+       public void setMode(H2Mode h2Mode) {\r
+               this.mode = h2Mode;\r
+               \r
+       }\r
+       \r

        @Override\r
        public String getPassword() {\r
                return password;\r
        }\r
 \r
        @Override\r
        public String getPassword() {\r
                return password;\r
        }\r
 \r

+       @Override\r
+       public void setPassword(String password) {\r
+               this.password = password;\r
+               \r
+       }\r
+       \r

        @Override\r
        public String getUsername() {\r
                return username;\r
        }\r
 \r
        @Override\r
        @Override\r
        public String getUsername() {\r
                return username;\r
        }\r
 \r
        @Override\r

-       public NomenclaturalCode getNomenclaturalCode() {\r
-               return nomenclaturalCode;\r
+       public void setUsername(String username) {\r
+               this.username = username;\r
+               \r

        }\r
 \r
        }\r
 \r

+\r
+\r
+\r
+\r
+\r
+\r
+\r

        @Override\r
        public String toString() {\r
                if (StringUtils.isBlank(this.database)){\r
        @Override\r
        public String toString() {\r
                if (StringUtils.isBlank(this.database)){\r


@@ -318,6 +358,8 @@ public class CdmDataSource extends CdmDataSourceBase {
                        return result;\r
                }\r
        }\r
                        return result;\r
                }\r
        }\r

+\r
+\r

        \r
        \r
 \r
        \r
        \r
 \r