remove exception from UpdataleRoutingDatasource which is not compatibel with parent...

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

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
index 6626becb04a9478727cdee8ceb97e2f585400daa..6fceff355087d7b61c7514e36df9db7895593ff0 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
@@ -27,7 +27,6 @@ import java.util.Properties;
 \r
 import javax.sql.DataSource;\r
 \r
-import org.apache.commons.dbcp.BasicDataSource;\r
 import org.apache.log4j.Logger;\r
 import org.hibernate.cache.CacheProvider;\r
 import org.hibernate.cache.NoCacheProvider;\r
@@ -41,6 +40,8 @@ import org.springframework.beans.factory.config.PropertiesFactoryBean;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;\r
 import org.springframework.beans.factory.support.RootBeanDefinition;\r
 \r
+import com.mchange.v2.c3p0.ComboPooledDataSource;\r
+\r
 import eu.etaxonomy.cdm.api.application.CdmApplicationUtils;\r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
 import eu.etaxonomy.cdm.common.XmlHelp;\r
@@ -101,10 +102,13 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
                }\r
        }\r
 \r
-\r
-       private static String dataSourceClassName = BasicDataSource.class.getName();\r
+       /**\r
+        * The Datasource class that Spring will use to set up the connection to the database\r
+        */\r
+       private static String dataSourceClassName = ComboPooledDataSource.class.getName();\r
+       // we used dbcps BasicDataSource before\r
+//     private static String dataSourceClassName = BasicDataSource.class.getName();\r
        \r
-\r
        //name\r
        protected String dataSourceName;\r
 \r
@@ -112,28 +116,20 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
        /**\r
         * Returns the default CdmDataSource\r
         * @return the default CdmDataSource\r
+        * @throws DataSourceNotFoundException \r
         */\r
-       public final static CdmPersistentDataSource NewDefaultInstance(){\r
-               try {\r
-                       return NewInstance("default");\r
-               } catch (DataSourceNotFoundException e) {\r
-                       logger.error("Default datasource does not exist in config file");\r
-                       return null;\r
-               }\r
+       public final static CdmPersistentDataSource NewDefaultInstance() throws DataSourceNotFoundException {\r
+               return NewInstance("default");\r
        }\r
        \r
        \r
        /**\r
         * Returns the default CdmDataSource\r
         * @return the default CdmDataSource\r
+        * @throws DataSourceNotFoundException \r
         */\r
-       public final static CdmPersistentDataSource NewLocalHsqlInstance(){\r
-               try {\r
-                       return NewInstance("localDefaultHsql");\r
-               } catch (DataSourceNotFoundException e) {\r
-                       logger.error("Local datasource does not exist in config file");\r
-                       return null;\r
-               }\r
+       public final static CdmPersistentDataSource NewLocalHsqlInstance() throws DataSourceNotFoundException{\r
+               return NewInstance("localDefaultHsql");\r
        }\r
        \r
        /**\r
@@ -141,8 +137,7 @@ public class CdmPersistentDataSource extends CdmDataSourceBase{
         * @param strDataSource\r
         * @return\r
         */\r
-       public final static CdmPersistentDataSource NewInstance(String dataSourceName) \r
-                               throws DataSourceNotFoundException{\r
+       public final static CdmPersistentDataSource NewInstance(String dataSourceName) throws DataSourceNotFoundException{\r
                if (exists(dataSourceName)){\r
                        return new CdmPersistentDataSource(dataSourceName);\r
                }else{\r