litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-2205 Applied patch from Jim Wood to fix bugs in database agnosticism

Browse source
This commit is contained in:
brianjlowe 2011-07-07 18:39:12 +00:00
parent d09a6640d9
commit f9f3966abe
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/JenaDataSourceSetupBase.java
View file

@ -372,7 +372,6 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
return defaultformat; return defaultformat;
} }
protected final static String DB_TYPE = "MySQL";
private static VitroJenaModelMaker vjmm = null; private static VitroJenaModelMaker vjmm = null;
private static VitroJenaSDBModelMaker vsmm = null; private static VitroJenaSDBModelMaker vsmm = null;
private static final String sdbModelMaker = "vitroJenaSDBModelMaker"; private static final String sdbModelMaker = "vitroJenaSDBModelMaker";
@ -380,6 +379,7 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
protected void makeModelMakerFromConnectionProperties(TripleStoreType type, ServletContext ctx){ protected void makeModelMakerFromConnectionProperties(TripleStoreType type, ServletContext ctx){
String jdbcUrl = getJdbcUrl(ctx); String jdbcUrl = getJdbcUrl(ctx);
String dbtypeStr = ConfigurationProperties.getBean(ctx).getProperty("VitroConnection.DataSource.dbtype","MySQL");
String username = ConfigurationProperties.getBean(ctx).getProperty( String username = ConfigurationProperties.getBean(ctx).getProperty(
"VitroConnection.DataSource.username"); "VitroConnection.DataSource.username");
String password = ConfigurationProperties.getBean(ctx).getProperty( String password = ConfigurationProperties.getBean(ctx).getProperty(
@ -387,12 +387,12 @@ public class JenaDataSourceSetupBase extends JenaBaseDaoCon {
if (TripleStoreType.RDB.equals(type)){ if (TripleStoreType.RDB.equals(type)){
vjmm = new VitroJenaModelMaker( vjmm = new VitroJenaModelMaker(
jdbcUrl, username, password, DB_TYPE, ctx); jdbcUrl, username, password, dbtypeStr, ctx);
} }
else if(TripleStoreType.SDB.equals(type)){ else if(TripleStoreType.SDB.equals(type)){
StoreDesc storeDesc = new StoreDesc( StoreDesc storeDesc = new StoreDesc(
LayoutType.LayoutTripleNodesHash, DatabaseType.MySQL); LayoutType.LayoutTripleNodesHash, DatabaseType.fetch(dbtypeStr));
BasicDataSource bds = JenaDataSourceSetup.makeBasicDataSource( BasicDataSource bds = JenaDataSourceSetup.makeBasicDataSource(
getDbDriverClassName(ctx), jdbcUrl, username, password, ctx); getDbDriverClassName(ctx), jdbcUrl, username, password, ctx);
try { try {