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 b1117d9ab76063d84f7b0944a7e6b369e6a44e9b..37de12fe4750fbfc88cdc89434b31860dce33adb 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(); } }