From b012acd96894969ae40becbe19edba7ff279e929 Mon Sep 17 00:00:00 2001 From: j2blake Date: Thu, 7 Nov 2013 14:49:12 -0500 Subject: [PATCH 1/2] Ignore this test - it may fail on a slow machine. --- .../vitro/webapp/search/indexing/IndexBuilderThreadTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilderThreadTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilderThreadTest.java index 450694ed1..9301ee435 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilderThreadTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilderThreadTest.java @@ -5,13 +5,14 @@ package edu.cornell.mannlib.vitro.webapp.search.indexing; import junit.framework.Assert; import org.apache.log4j.Level; +import org.junit.Ignore; import org.junit.Test; import edu.cornell.mannlib.vitro.testing.AbstractTestClass; public class IndexBuilderThreadTest extends AbstractTestClass { - + @Ignore @Test public void testStoppingTheThread(){ setLoggerLevel(IndexBuilder.class, Level.OFF); From 1e60661a005da61afa78050df3ba3dc93ec28c59 Mon Sep 17 00:00:00 2001 From: brianjlowe Date: Fri, 8 Nov 2013 12:29:08 -0500 Subject: [PATCH 2/2] VIVO-510 fixes bug with spanish labels appearing on populated faux properties --- .../webapp/utils/ApplicationConfigurationOntologyUtils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java index 62a5e5d9f..ed2b17765 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java @@ -38,9 +38,8 @@ public class ApplicationConfigurationOntologyUtils { private static final Log log = LogFactory.getLog(ApplicationConfigurationOntologyUtils.class); public static List getAdditionalFauxSubpropertiesForList(List propList, Individual subject, VitroRequest vreq) { - ServletContext ctx = vreq.getSession().getServletContext(); - Model displayModel = ModelAccess.on(ctx).getDisplayModel(); - Model tboxModel = ModelAccess.on(ctx).getOntModel(ModelID.UNION_TBOX); + Model displayModel = vreq.getDisplayModel(); + Model tboxModel = vreq.getOntModelSelector().getTBoxModel(); return getAdditionalFauxSubpropertiesForList(propList, subject, displayModel, tboxModel); }