From bb7ab3b2a3ab91eef2e978ee9faad87ef5fd649c Mon Sep 17 00:00:00 2001 From: j2blake Date: Thu, 14 Aug 2014 16:55:46 -0400 Subject: [PATCH] VIVO-848 Move the FileStorage system behind an interface Add it to the Application framework, and do some cleanup. --- productMods/WEB-INF/resources/startup_listeners.txt | 3 --- .../webapp/controller/harvester/FileHarvestController.java | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/productMods/WEB-INF/resources/startup_listeners.txt b/productMods/WEB-INF/resources/startup_listeners.txt index 58004395..2871e488 100644 --- a/productMods/WEB-INF/resources/startup_listeners.txt +++ b/productMods/WEB-INF/resources/startup_listeners.txt @@ -28,8 +28,6 @@ edu.cornell.mannlib.vitro.webapp.servlet.setup.rdfsetup.RDFSetup edu.cornell.mannlib.vitro.webapp.servlet.setup.ConfigurationModelsSetup edu.cornell.mannlib.vitro.webapp.servlet.setup.ContentModelSetup -edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup - edu.cornell.mannlib.vitro.webapp.web.images.PlaceholderUtil$Setup # Some permissions were removed in release 1.7 @@ -71,7 +69,6 @@ edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoDocumentModifiers # The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper # and the PermissionRegistry must already be set up. -edu.cornell.mannlib.vitro.webapp.searchengine.SearchEngineSetup edu.cornell.mannlib.vitro.webapp.searchindex.SearchIndexerSetup edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java index 6ba3f55a..548b9c68 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java +++ b/src/edu/cornell/mannlib/vitro/webapp/controller/harvester/FileHarvestController.java @@ -41,7 +41,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; -import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup; +import edu.cornell.mannlib.vitro.webapp.filestorage.impl.FileStorageImplWrapper; public class FileHarvestController extends FreemarkerHttpServlet { @@ -213,12 +213,12 @@ public class FileHarvestController extends FreemarkerHttpServlet { */ private static String getUploadPathBase(ServletContext context) throws Exception { - String vitroHomeDirectoryName = ConfigurationProperties.getBean(context).getProperty(FileStorageSetup.PROPERTY_VITRO_HOME_DIR); + String vitroHomeDirectoryName = ConfigurationProperties.getBean(context).getProperty(FileStorageImplWrapper.PROPERTY_VITRO_HOME_DIR); if (vitroHomeDirectoryName == null) { throw new Exception("Vitro home directory name could not be found."); } - String pathBase = vitroHomeDirectoryName + "/" + FileStorageSetup.FILE_STORAGE_SUBDIRECTORY + "/" + PATH_TO_UPLOADS; + String pathBase = vitroHomeDirectoryName + "/" + FileStorageImplWrapper.FILE_STORAGE_SUBDIRECTORY + "/" + PATH_TO_UPLOADS; return pathBase; }