Skip to content
Snippets Groups Projects
Commit 281a84de authored by Sara Bertocco's avatar Sara Bertocco
Browse files

New working version after Victoria trip - different DB management

parent 7226ba27
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,9 @@ package it.inaf.oats.vospacebackend.implementation; ...@@ -7,7 +7,9 @@ package it.inaf.oats.vospacebackend.implementation;
import ca.nrc.cadc.uws.server.DatabaseJobPersistence; import ca.nrc.cadc.uws.server.DatabaseJobPersistence;
import ca.nrc.cadc.uws.server.JobDAO; 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; import javax.sql.DataSource;
/** /**
...@@ -20,6 +22,11 @@ public class DatabaseJobPersistenceImpl extends DatabaseJobPersistence { ...@@ -20,6 +22,11 @@ public class DatabaseJobPersistenceImpl extends DatabaseJobPersistence {
protected JobDAO.JobSchema getJobSchema() { 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); return new JobDAO.JobSchema("Job", "JobDetail", false);
} }
...@@ -29,13 +36,7 @@ public class DatabaseJobPersistenceImpl extends DatabaseJobPersistence { ...@@ -29,13 +36,7 @@ public class DatabaseJobPersistenceImpl extends DatabaseJobPersistence {
*/ */
protected DataSource getDataSource() { protected DataSource getDataSource() {
MysqlDataSource dataSource = new MysqlDataSource(); return DBConnectionMng.getDataSource();
dataSource.setDatabaseName("cadctest");
dataSource.setUser("oatsops");
dataSource.setPassword("Peper0ne");
dataSource.setServerName("localhost");
return dataSource;
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment