From 281a84dedf58d60ca5f67b1ec3e39b9f0ebc04ed Mon Sep 17 00:00:00 2001
From: Sara Bertocco <bertocco@oats.inaf.it>
Date: Thu, 21 Jul 2016 14:41:12 +0200
Subject: [PATCH] New working version after Victoria trip - different DB
management
---
.../DatabaseJobPersistenceImpl.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/it/inaf/oats/vospacebackend/implementation/DatabaseJobPersistenceImpl.java b/src/main/java/it/inaf/oats/vospacebackend/implementation/DatabaseJobPersistenceImpl.java
index b1117d9..37de12f 100644
--- a/src/main/java/it/inaf/oats/vospacebackend/implementation/DatabaseJobPersistenceImpl.java
+++ b/src/main/java/it/inaf/oats/vospacebackend/implementation/DatabaseJobPersistenceImpl.java
@@ -7,7 +7,9 @@ package it.inaf.oats.vospacebackend.implementation;
import ca.nrc.cadc.uws.server.DatabaseJobPersistence;
import ca.nrc.cadc.uws.server.JobDAO;
-import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
+import ca.nrc.cadc.uws.server.JobDAO.JobSchema;
+import java.util.HashMap;
+import java.util.Map;
import javax.sql.DataSource;
/**
@@ -20,6 +22,11 @@ public class DatabaseJobPersistenceImpl extends DatabaseJobPersistence {
protected JobDAO.JobSchema getJobSchema() {
+ Map<String,Integer> jobTabLimits = new HashMap<String,Integer>();
+ jobTabLimits.put("jobInfo_content", 1024);
+ Map<String,Integer> detailTabLimits = new HashMap<String,Integer>();
+ JobSchema jobSchema = new JobSchema("vospace.dbo.Job", "vospace.dbo.JobDetail", true, jobTabLimits, detailTabLimits);
+
return new JobDAO.JobSchema("Job", "JobDetail", false);
}
@@ -28,14 +35,8 @@ public class DatabaseJobPersistenceImpl extends DatabaseJobPersistence {
* Providing a data source.
*/
protected DataSource getDataSource() {
-
- MysqlDataSource dataSource = new MysqlDataSource();
- dataSource.setDatabaseName("cadctest");
- dataSource.setUser("oatsops");
- dataSource.setPassword("Peper0ne");
- dataSource.setServerName("localhost");
- return dataSource;
+ return DBConnectionMng.getDataSource();
}
}
--
GitLab