From f690bf02353bad9c5426cfb7d41d51b07f6d80c8 Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Thu, 19 Jun 2014 11:11:18 -0400 Subject: [PATCH] VIVO-801 Bug fix: user a consistent spelling for tdbModels directory. --- .../mannlib/vivo/utilities/rdbmigration/RdbMigrator.java | 3 ++- .../mannlib/vitro/webapp/servlet/setup/RDFServiceSetup.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java b/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java index cf7ac8610..d453db2c4 100644 --- a/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java +++ b/utilities/rdbmigration/src/edu/cornell/mannlib/vivo/utilities/rdbmigration/RdbMigrator.java @@ -33,6 +33,7 @@ import com.hp.hpl.jena.tdb.TDBFactory; * copying VIVO configuration data from RDB to TDB. */ public class RdbMigrator { + private static final String DIRECTORY_TDB = "tdbModels"; private static final String TABLE_RDB = "jena_graph"; private static final String TABLE_MIGRATED = "vivo_rdb_migrated"; private static final List EXPECTED_MODELS = Arrays @@ -120,7 +121,7 @@ public class RdbMigrator { if (!vivoHome.canWrite()) { quit("Can't write to '" + vivoHome + "'."); } - targetDir = new File(vivoHome, "tdbmodels"); + targetDir = new File(vivoHome, DIRECTORY_TDB); } private boolean doesTdbExist() { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFServiceSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFServiceSetup.java index 380b94df6..f1615e78f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFServiceSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/RDFServiceSetup.java @@ -35,7 +35,8 @@ import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; public class RDFServiceSetup extends JenaDataSourceSetupBase implements javax.servlet.ServletContextListener { - private static final Log log = LogFactory.getLog(RDFServiceSetup.class); + private static final Log log = LogFactory.getLog(RDFServiceSetup.class); + private static final String DIRECTORY_TDB = "tdbModels"; @Override public void contextDestroyed(ServletContextEvent arg0) { @@ -71,7 +72,7 @@ implements javax.servlet.ServletContextListener { private void useTDBForConfigurationModels(ServletContext ctx) throws IOException { String vitroHome = ConfigurationProperties.getBean(ctx).getProperty( "vitro.home") ; - String directoryPath = vitroHome + File.separatorChar + "tdbModels"; + String directoryPath = vitroHome + File.separatorChar + DIRECTORY_TDB; RDFServiceFactory factory = new RDFServiceFactoryTDB(directoryPath); RDFServiceUtils.setRDFServiceFactory(ctx, factory, CONFIGURATION); }