From 77082fa4ad931a6152e4ae31af0baba72a7ae6ae Mon Sep 17 00:00:00 2001
From: Loredana Liccardo <loredana.liccardo@isti.cnr.it>
Date: Wed, 10 Sep 2014 07:57:17 +0000
Subject: [PATCH] File DestinationDBHibernate.cfg.xml in "cfg" folder of the
 project renamed in DestinationDBHibernateDBManager.cfg.xml and correction in
 method initDBSession of the ConectionMannaager class in order to specify this
 file name.

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-access/DatabasesResourcesManager@99649 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 cfg/DestinationDBHibernateDBManager.cfg.xml   | 20 +++++++++++++++++++
 .../databases/utils/ConnectionManager.java    |  3 ++-
 .../databases/utils/DatabaseManagement.java   |  1 +
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 cfg/DestinationDBHibernateDBManager.cfg.xml

diff --git a/cfg/DestinationDBHibernateDBManager.cfg.xml b/cfg/DestinationDBHibernateDBManager.cfg.xml
new file mode 100644
index 0000000..8b2db9e
--- /dev/null
+++ b/cfg/DestinationDBHibernateDBManager.cfg.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<hibernate-configuration>
+	<session-factory>
+		<property name="connection.driver_class">com.mysql.jdbc.Driver</property>
+		<property name="connection.provider_class">org.hibernate.connection.C3P0ConnectionProvider</property>			
+		<property name="connection.url">jdbc:mysql://146.48.87.169/timeseries</property>
+		<property name="connection.username">root</property>
+		<property name="connection.password">test</property>
+		<property name="dialect">org.hibernate.dialect.MySQLDialect</property>
+		<property name="transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property>
+		<property name="c3p0.timeout">0</property>
+		<property name="c3p0.checkoutTimeout">0</property>
+		<property name="c3p0.acquireRetryAttempts">1</property>
+		<property name="c3p0.max_size">1</property> 
+		<property name="c3p0.max_statements">0</property> 
+		<property name="c3p0.min_size">1</property>
+		<property name="current_session_context_class">thread</property>
+	</session-factory>
+</hibernate-configuration>
+
diff --git a/src/main/java/org/gcube/dataaccess/databases/utils/ConnectionManager.java b/src/main/java/org/gcube/dataaccess/databases/utils/ConnectionManager.java
index 43d5561..8b0ac6c 100644
--- a/src/main/java/org/gcube/dataaccess/databases/utils/ConnectionManager.java
+++ b/src/main/java/org/gcube/dataaccess/databases/utils/ConnectionManager.java
@@ -44,7 +44,7 @@ public class ConnectionManager {
 		try {
 			if ((config != null) && (config.getConfigPath() != null)) {
 				String defaultDatabaseFile = config.getConfigPath()
-						+ AlgorithmConfiguration.defaultConnectionFile;
+						+ "DestinationDBHibernateDBManager.cfg.xml";
 
 				config.setDatabaseDriver(config.getParam("DatabaseDriver"));
 				config.setDatabaseUserName(config.getParam("DatabaseUserName"));
@@ -74,6 +74,7 @@ public class ConnectionManager {
 	}
 
 	// create the database's connection using the configuration file
+	// Note that this method is not called actually.
 	public SessionFactory initDBConnection(String configurationFile)
 			throws Exception {
 		String xml = FileTools.readXMLDoc(configurationFile);
diff --git a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
index a67b73a..f41aac8 100644
--- a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
+++ b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java
@@ -270,6 +270,7 @@ public class DatabaseManagement {
 	// create the database's connection using the configuration file.
 	// note that for database postgres the variable sourceSchemaName is set to
 	// the schema's name.
+	// Note that this method is not called actually
 	public SessionFactory createConnection(String cfgDir, String SourceFile)
 			throws Exception {