diff --git a/webapp/src/edu/cornell/mannlib/vedit/util/OperationUtils.java b/webapp/src/edu/cornell/mannlib/vedit/util/OperationUtils.java index b679cddb3..e0fbd4c21 100644 --- a/webapp/src/edu/cornell/mannlib/vedit/util/OperationUtils.java +++ b/webapp/src/edu/cornell/mannlib/vedit/util/OperationUtils.java @@ -137,11 +137,9 @@ public class OperationUtils{ } } } catch (InstantiationException ie){ - log.error("edu.cornell.mannlib.vitro.edit.utils.OperationUtils.cloneBean("+bean.getClass().toString()+") could not instantiate new instance of bean."); - log.error(ie.getStackTrace()); + log.error("edu.cornell.mannlib.vitro.edit.utils.OperationUtils.cloneBean("+bean.getClass().toString()+") could not instantiate new instance of bean.", ie); } catch (IllegalAccessException iae){ - log.error("edu.cornell.mannlib.vitro.edit.utils.OperationUtils.cloneBean("+bean.getClass().toString()+") encountered illegal access exception instantiating new bean."); - log.error(iae.getStackTrace()); + log.error("edu.cornell.mannlib.vitro.edit.utils.OperationUtils.cloneBean("+bean.getClass().toString()+") encountered illegal access exception instantiating new bean.", iae); } return newBean; } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java index 66204b310..482fd5df6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ModelAccess.java @@ -38,7 +38,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector; * VitroModelSource.getModel(URL, loadIfAbsent) * VitroModelSource.openModel(name) * VitroModelSource.openModelIfPresent(string) - * ServletContext.getAttribute("jenaPersistentOntModel") * ServletContext.getAttribute("pelletOntModel") * VitroJenaModelMaker * VitroJenaSpecialModelMaker diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java index fcf9d4182..06ebcdc63 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/ContentModelSetup.java @@ -84,7 +84,7 @@ public class ContentModelSetup extends JenaDataSourceSetupBase loadDataFromFilesystem(baseABoxModel, baseTBoxModel, applicationMetadataModel, ctx); } - log.info("Setting up union models"); + log.info("Setting up full models"); OntModel baseFullModel = createCombinedBulkUpdatingModel(baseABoxModel, baseTBoxModel); OntModel inferenceFullModel = createCombinedModel(inferenceABoxModel, inferenceTBoxModel); OntModel unionFullModel = ModelFactory.createOntologyModel(DB_ONT_MODEL_SPEC, dataset.getDefaultModel());