add 1 method to be compliant with Java 7

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

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/LocalH2.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/LocalH2.java
index 46145439e6fc8f9c96569c2f5e8af7827c400541..e37ea0c51970d1a938ba1f968fc213a312122a43 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/LocalH2.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/LocalH2.java
@@ -10,18 +10,23 @@
 package eu.etaxonomy.cdm.database;\r
 \r
 import java.io.File;\r
+import java.io.IOException;\r
 import java.sql.Connection;\r
 import java.sql.Driver;\r
 import java.sql.DriverManager;\r
 import java.sql.SQLException;\r
 import java.util.Properties;\r
 \r
+import javax.sql.DataSource;\r
+\r
+import org.apache.commons.dbcp.BasicDataSource;\r
+import org.apache.commons.pool.impl.GenericObjectPool;\r
 import org.apache.log4j.Logger;\r
 import org.h2.tools.Server;\r
 import org.springframework.jdbc.CannotGetJdbcConnectionException;\r
-import org.springframework.jdbc.datasource.DriverManagerDataSource;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationUtils;\r
+import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 \r
 \r
 /**\r
@@ -31,7 +36,7 @@ import eu.etaxonomy.cdm.api.application.CdmApplicationUtils;
  *\r
  */\r
 \r
-public class LocalH2 extends DriverManagerDataSource {\r
+public class LocalH2 extends BasicDataSource {\r
        private static final Logger logger = Logger.getLogger(LocalH2.class);\r
        \r
        private String sep = System.getProperty("file.separator");\r
@@ -50,7 +55,9 @@ public class LocalH2 extends DriverManagerDataSource {
        protected boolean isSilent = true;\r
        /** default driver class name */\r
        protected String DEFAULT_DRIVER_CLASS_NAME = "org.h2.Driver";\r
-       String mode = H2Mode.EMBEDDED.toString(); \r
+       String mode = H2Mode.EMBEDDED.toString();\r
+\r
+       private NomenclaturalCode nomenclaturalCode; \r
        \r
        /**\r
         * \r
@@ -65,10 +72,24 @@ public class LocalH2 extends DriverManagerDataSource {
         * @throws CannotGetJdbcConnectionException\r
         */\r
        public LocalH2(String url) throws CannotGetJdbcConnectionException {\r
-               super(url);\r
+               super();\r
+               this.setUrl(url);\r
                setDriverClassName(DEFAULT_DRIVER_CLASS_NAME);\r
        }\r
 \r
+       /* FIXME This is a workaround to solve a problem with dbcp connection pooling.\r
+        * Remove this when dbcp connection pool gets configured correctly\r
+        * \r
+        * (non-Javadoc)\r
+        * @see org.apache.commons.dbcp.BasicDataSource#createDataSource()\r
+        */\r
+       @Override\r
+       protected synchronized DataSource createDataSource() throws SQLException {\r
+               super.createDataSource();\r
+               connectionPool.setWhenExhaustedAction(GenericObjectPool.WHEN_EXHAUSTED_GROW);\r
+               return dataSource;\r
+       }\r
+       \r
        /**\r
         * @param url\r
         * @param username\r
@@ -77,8 +98,9 @@ public class LocalH2 extends DriverManagerDataSource {
         */\r
        public LocalH2(String url, String username, String password)\r
                        throws CannotGetJdbcConnectionException {\r
-               super(url, username, password);\r
-               this.setDriverClassName(DEFAULT_DRIVER_CLASS_NAME);\r
+               this(url);\r
+               this.setUsername(username);\r
+               this.setPassword(password);\r
        }\r
 \r
        /**\r
@@ -90,7 +112,8 @@ public class LocalH2 extends DriverManagerDataSource {
         */\r
        public LocalH2(String driverClassName, String url, String username,\r
                        String password) throws CannotGetJdbcConnectionException {\r
-               super(driverClassName, url, username, password);\r
+               this(url, username, password);\r
+               this.setDriverClassName(driverClassName);\r
        }\r
 \r
 //** ********************************************************************************/\r
@@ -151,8 +174,13 @@ public class LocalH2 extends DriverManagerDataSource {
        }\r
        \r
        private static final String getDefaultPath(){\r
-               //String path = System.getProperty("user.dir");\r
-               File path = CdmApplicationUtils.getWritableResourceDir();\r
+               File path;\r
+               try {\r
+                       path = CdmApplicationUtils.getWritableResourceDir();\r
+               } catch (IOException e) {\r
+                       logger.error(e);\r
+                       throw new RuntimeException(e);\r
+               }\r
                String subPath = File.separator + "h2" + File.separator + "LocalH2"; \r
                return  path + subPath;\r
        }\r
@@ -189,9 +217,10 @@ public class LocalH2 extends DriverManagerDataSource {
        }\r
        \r
        public void setLocalUrl(){\r
-               logger.info("setLocalUrl");\r
                String dbName = "cdmLocal";\r
-               setUrl(pureUrl + "file:" + getDefaultPath() + "/" + dbName);\r
+               String localUrlString = pureUrl + "file:" + getDefaultPath() + "/" + dbName;\r
+               logger.info("setLocalUrl: " + localUrlString);\r
+               setUrl(localUrlString);\r
        }\r
        \r
        public void setMode(String mode){\r
@@ -202,5 +231,9 @@ public class LocalH2 extends DriverManagerDataSource {
                return mode;\r
        }\r
        \r
+       public void setNomenclaturalCode(NomenclaturalCode code){\r
+               this.nomenclaturalCode = code;\r
+       }\r
+       \r
 \r
 }\r