ubating hibernate version in comment

[cdmlib.git] / cdmlib-remote-webapp / src / main / webapp / WEB-INF / datasources / routing-datasource.xml

diff --git a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml
index 2f3da069ca4322b622a9c82c51e0ef0fdfaa2df8..3f077ff4e5b526a7e811a5f3de6485cf72998034 100644 (file)
--- a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml
+++ b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml
@@ -16,10 +16,6 @@
        eu.etaxonomy.cdm.database.DataSourceBeanLoader\r
        \r
        -->\r
-       <!--  The property defaultDatasourceName defaults to "default" \r
-       <property name="beanDefinitionFile" value="datasources-p6spy.xml" />\r
-       <property name="defaultDatasourceName" value="cichorieae" />\r
-       -->\r
     </bean>\r
     \r
     <!-- This configures default properties, which can overridden with the file specified by the location property -->\r
@@ -38,7 +34,7 @@
                   \r
                                          (1)\r
                                          Do NOT specify the dataSource in the sessionFactory for example in the \r
-                                         org.springframework.orm.hibernate3.LocalSessionFactoryBean\r
+                                         org.springframework.orm.hibernate5.LocalSessionFactoryBean\r
                                          !!!==> If *dataSource* is set, this will override corresponding settings in Hibernate properties.!!!\r
                                                  If this is set, the Hibernate settings should not define a connection provider to \r
                                              avoid meaningless double configuration.\r
@@ -50,6 +46,13 @@
                           All other properties must be defined as usual in a c3p0.properties file. \r
                           This is confusing, and will hopefully be simplified some time in the future, but for now... \r
                           \r
+                          DOUMENTATION UPDATE (2015-05-22):\r
+                          Hibernate's C3P0ConnectionProvider renames 7 c3p0 configuration properties, which, \r
+                          if set in your hibernate configuration, will override any configuration you may have set \r
+                          in a c3p0.properties file.\r
+                          TODO: are points (2) and (3) still valid? I don't think so! (AK)\r
+                          \r
+                          \r
                                hibernate.c3p0.acquire_increment\r
                                                        hibernate.c3p0.idle_test_period\r
                                                        hibernate.c3p0.timeout\r
@@ -68,4 +71,4 @@
         </property>\r
     </bean>\r
 \r
-</beans>
\ No newline at end of file
+</beans>\r