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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
brianjlowe 2013-11-08 12:32:01 -05:00
commit 7a6b585eb9
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
webapp/src/edu/cornell/mannlib/vitro/webapp/utils/ApplicationConfigurationOntologyUtils.java
View file

@ -38,9 +38,8 @@ public class ApplicationConfigurationOntologyUtils {
private static final Log log = LogFactory.getLog(ApplicationConfigurationOntologyUtils.class); private static final Log log = LogFactory.getLog(ApplicationConfigurationOntologyUtils.class);
public static List<ObjectProperty> getAdditionalFauxSubpropertiesForList(List<ObjectProperty> propList, Individual subject, VitroRequest vreq) { public static List<ObjectProperty> getAdditionalFauxSubpropertiesForList(List<ObjectProperty> propList, Individual subject, VitroRequest vreq) {
ServletContext ctx = vreq.getSession().getServletContext(); Model displayModel = vreq.getDisplayModel();
Model displayModel = ModelAccess.on(ctx).getDisplayModel(); Model tboxModel = vreq.getOntModelSelector().getTBoxModel();
Model tboxModel = ModelAccess.on(ctx).getOntModel(ModelID.UNION_TBOX);
return getAdditionalFauxSubpropertiesForList(propList, subject, displayModel, tboxModel); return getAdditionalFauxSubpropertiesForList(propList, subject, displayModel, tboxModel);
} }

3
webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilderThreadTest.java
View file

@ -5,13 +5,14 @@ package edu.cornell.mannlib.vitro.webapp.search.indexing;
import junit.framework.Assert; import junit.framework.Assert;
import org.apache.log4j.Level; import org.apache.log4j.Level;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import edu.cornell.mannlib.vitro.testing.AbstractTestClass; import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
public class IndexBuilderThreadTest extends AbstractTestClass { public class IndexBuilderThreadTest extends AbstractTestClass {
@Ignore
@Test @Test
public void testStoppingTheThread(){ public void testStoppingTheThread(){
setLoggerLevel(IndexBuilder.class, Level.OFF); setLoggerLevel(IndexBuilder.class, Level.OFF);