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

VIVO-742 Rename some 'solr' packages.

Browse source
This commit is contained in:
j2blake 2014-04-22 18:28:06 -04:00
parent 2d6aeaafb8
commit 711afa44fa
17 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
productMods/WEB-INF/resources/startup_listeners.txt
View file

@ -68,7 +68,7 @@ edu.ucsf.vitro.opensocial.OpenSocialSmokeTests
edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup
# Add VIVO specific DocumentModifers, this must come before SolrSetup # Add VIVO specific DocumentModifers, this must come before SolrSetup
edu.cornell.mannlib.vitro.webapp.search.solr.VivoDocumentModifiers edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoDocumentModifiers
# The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper # The search indexer uses a "public" permission, so the PropertyRestrictionPolicyHelper
# and the PermissionRegistry must already be set up. # and the PermissionRegistry must already be set up.

4
src/edu/cornell/mannlib/vitro/webapp/search/solr/CalculateParameters.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/CalculateParameters.java
View file

@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
@ -28,7 +28,7 @@ import com.hp.hpl.jena.shared.Lock;
import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.beans.Individual;
import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument;
import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames; import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.DocumentModifier;
public class CalculateParameters implements DocumentModifier { public class CalculateParameters implements DocumentModifier {

4
src/edu/cornell/mannlib/vitro/webapp/search/solr/VIVOValuesFromVcards.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVOValuesFromVcards.java
View file

@ -1,6 +1,6 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXT; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXT;
import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXTUNSTEMMED; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXTUNSTEMMED;
@ -19,7 +19,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.DocumentModifier;
/** /**
* If there are any VCards on this Individual with Title objects, store the text * If there are any VCards on this Individual with Title objects, store the text

6
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java
View file

@ -1,13 +1,11 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields;
/** /**
* Class that adds text from context nodes to Solr Documents for * Class that adds text from context nodes to Solr Documents for

16
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoDocumentModifiers.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoDocumentModifiers.java
View file

@ -1,5 +1,5 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -13,9 +13,17 @@ import com.hp.hpl.jena.query.DatasetFactory;
import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess; import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.CalculateParameters;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ExcludeBasedOnNamespace; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.DocumentModifier;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.SearchIndexExcluder; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ExcludeBasedOnNamespace;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.SearchIndexExcluder;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VIVOValuesFromVcards;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFAdvisingFields;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFBasicFields;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFEducationFields;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFGrantFields;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoISFMemberFields;
import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.VivoInformationResourceContextNodeFields;
public class VivoDocumentModifiers implements javax.servlet.ServletContextListener{ public class VivoDocumentModifiers implements javax.servlet.ServletContextListener{

4
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFAdvisingFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java
View file

@ -1,12 +1,12 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
/** /**
* DocumentModifier for adding rdfs:labels of individuals related via * DocumentModifier for adding rdfs:labels of individuals related via

4
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFBasicFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java
View file

@ -1,12 +1,12 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
/** /**
* DocumentModifier to populate Solr fields for the basic ISF relationships. * DocumentModifier to populate Solr fields for the basic ISF relationships.

4
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFEducationFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java
View file

@ -1,12 +1,12 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
public class VivoISFEducationFields extends ContextNodeFields { public class VivoISFEducationFields extends ContextNodeFields {
private static String VIVONS = "http://vivoweb.org/ontology/core#"; private static String VIVONS = "http://vivoweb.org/ontology/core#";

4
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFGrantFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java
View file

@ -1,12 +1,12 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
/* /*
* This DocumentModifier is for the ISF style grants. * This DocumentModifier is for the ISF style grants.

4
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoISFMemberFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java
View file

@ -1,12 +1,12 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
/** /**
* This class will: * This class will:

6
src/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFields.java → src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java
View file

@ -1,13 +1,11 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ContextNodeFields;
import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ContextNodeFields;
/** /**
* Class that adds text from context nodes to Solr Documents for * Class that adds text from context nodes to Solr Documents for

0
test/edu/cornell/mannlib/vitro/webapp/search/solr/NIHVIVO3853_DataSet1.rdf → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NIHVIVO3853_DataSet1.rdf
View file

0
test/edu/cornell/mannlib/vitro/webapp/search/solr/VIVO146_DataSet1.n3 → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVO146_DataSet1.n3
View file

2
test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest.java → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest.java
View file

@ -1,5 +1,5 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;

2
test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoAgentContextNodeFieldsTest2.java → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest2.java
View file

@ -1,5 +1,5 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;

2
test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.java → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.java
View file

@ -1,5 +1,5 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */ /* $This file is distributed under the terms of the license in /doc/license.txt$ */
package edu.cornell.mannlib.vitro.webapp.search.solr; package edu.cornell.mannlib.vitro.webapp.search.documentBuilding;
import java.io.IOException; import java.io.IOException;

0
test/edu/cornell/mannlib/vitro/webapp/search/solr/VivoInformationResourceContextNodeFieldsTest.n3 → test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.n3
View file