diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 8000cd6..6249222 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,12 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 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 d76b901..f1dcb07 100644 --- a/src/main/java/org/gcube/dataaccess/databases/utils/ConnectionManager.java +++ b/src/main/java/org/gcube/dataaccess/databases/utils/ConnectionManager.java @@ -211,7 +211,7 @@ public class ConnectionManager { } catch (Exception e) { - // e.printStackTrace(); + e.printStackTrace(); // System.out.println(String.format("Error while executing query: %1$s %2$s", // query, e.getMessage())); diff --git a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseFactory.java b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseFactory.java index df346ae..2e9b6fb 100644 --- a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseFactory.java +++ b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseFactory.java @@ -40,7 +40,7 @@ public class DatabaseFactory { public static SessionFactory initDBConnection(String configurationFile, LexicalEngineConfiguration config) throws Exception { - +// AnalysisLogger.getLogger().debug("DatabaseFactory-> start init"); if (config == null) return initDBConnection(configurationFile); @@ -137,7 +137,8 @@ public class DatabaseFactory { */ if (element.equals("c3p0.checkoutTimeout")) { - currentnode.setText("" + (20000)); //added a timeout about 30 seconds +// currentnode.setText("" + (20000)); //added a timeout about 30 seconds + currentnode.setText("" + (1000)); //added a timeout about 5 seconds } // if (element.equals("c3p0.acquireRetryAttempts")) { @@ -154,6 +155,7 @@ public class DatabaseFactory { cfg.setProperty("hibernate.hbm2ddl.auto", "create"); SessionFactory DBSessionFactory = null; +// AnalysisLogger.getLogger().debug("DatabaseFactory-> buildSession"); DBSessionFactory = cfg.buildSessionFactory(); // close stream 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 bd31ec6..21289aa 100644 --- a/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java +++ b/src/main/java/org/gcube/dataaccess/databases/utils/DatabaseManagement.java @@ -469,7 +469,7 @@ public class DatabaseManagement { List list = new ArrayList(); if (DBType.equals(POSTGRES)) { - +// AnalysisLogger.getLogger().debug("DatabaseManagement-> execute query"); List resultSet = connection.executeQuery( listSchemaNameQuery, sourceDBSession);