diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/CalculateParameters.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java similarity index 99% rename from src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/CalculateParameters.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java index e3169436..2f0301c4 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/CalculateParameters.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVOValuesFromVcards.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VIVOValuesFromVcards.java similarity index 98% rename from src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVOValuesFromVcards.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VIVOValuesFromVcards.java index 7d9849bc..3b9aac52 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVOValuesFromVcards.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VIVOValuesFromVcards.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXT; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.ALLTEXTUNSTEMMED; diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoAgentContextNodeFields.java similarity index 99% rename from src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoAgentContextNodeFields.java index 3e325a66..76b33689 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoAgentContextNodeFields.java @@ -1,5 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; + +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import java.util.ArrayList; import java.util.List; diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFAdvisingFields.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFAdvisingFields.java index 600feb4d..0b761511 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFAdvisingFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFAdvisingFields.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import java.util.ArrayList; import java.util.List; diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFBasicFields.java similarity index 96% rename from src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFBasicFields.java index 010fbc82..956fab99 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFBasicFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFBasicFields.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import java.util.ArrayList; import java.util.List; diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFEducationFields.java similarity index 96% rename from src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFEducationFields.java index a4655805..b3208795 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFEducationFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFEducationFields.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import java.util.ArrayList; import java.util.List; diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFGrantFields.java similarity index 98% rename from src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFGrantFields.java index edcb4368..e94018fd 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFGrantFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFGrantFields.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import java.util.ArrayList; import java.util.List; diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFMemberFields.java similarity index 96% rename from src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFMemberFields.java index 4e7251c3..458378cc 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoISFMemberFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoISFMemberFields.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import java.util.ArrayList; import java.util.List; diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoInformationResourceContextNodeFields.java similarity index 97% rename from src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoInformationResourceContextNodeFields.java index c34815b2..36d5d5b0 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFields.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoInformationResourceContextNodeFields.java @@ -1,5 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; + +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import java.util.ArrayList; import java.util.List; diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForContextNodes.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForContextNodes.java similarity index 99% rename from src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForContextNodes.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForContextNodes.java index 06d10992..78745437 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForContextNodes.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForContextNodes.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.indexing; +package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import java.util.ArrayList; import java.util.Collections; @@ -22,7 +22,6 @@ import com.hp.hpl.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; -import edu.cornell.mannlib.vitro.webapp.search.beans.StatementToURIsToUpdate; public class AdditionalURIsForContextNodes implements StatementToURIsToUpdate { diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalUriFinders.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUriFinders.java similarity index 87% rename from src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalUriFinders.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUriFinders.java index 41bcf522..c64e7086 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalUriFinders.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUriFinders.java @@ -1,13 +1,12 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.indexing; +package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import java.util.ArrayList; import java.util.List; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; -import edu.cornell.mannlib.vitro.webapp.search.beans.StatementToURIsToUpdate; /** * Make a list of StatementToURIsToUpdate objects for use by the diff --git a/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalUrisForVCards.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUrisForVCards.java similarity index 95% rename from src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalUrisForVCards.java rename to src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUrisForVCards.java index c3ac4c31..5bf0bf8e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalUrisForVCards.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUrisForVCards.java @@ -1,10 +1,9 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.indexing; +package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.List; import org.apache.commons.logging.Log; @@ -20,7 +19,6 @@ import com.hp.hpl.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; -import edu.cornell.mannlib.vitro.webapp.search.beans.StatementToURIsToUpdate; /** * If the property of a VCard object is changed, we should re-index the owner of diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NIHVIVO3853_DataSet1.rdf b/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/NIHVIVO3853_DataSet1.rdf similarity index 100% rename from test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NIHVIVO3853_DataSet1.rdf rename to test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/NIHVIVO3853_DataSet1.rdf diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVO146_DataSet1.n3 b/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VIVO146_DataSet1.n3 similarity index 100% rename from test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VIVO146_DataSet1.n3 rename to test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VIVO146_DataSet1.n3 diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest.java b/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoAgentContextNodeFieldsTest.java similarity index 98% rename from test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest.java rename to test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoAgentContextNodeFieldsTest.java index e418e2ff..30801cb9 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest.java +++ b/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoAgentContextNodeFieldsTest.java @@ -1,5 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; + +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest2.java b/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoAgentContextNodeFieldsTest2.java similarity index 97% rename from test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest2.java rename to test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoAgentContextNodeFieldsTest2.java index f3973ef1..8aa00df2 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoAgentContextNodeFieldsTest2.java +++ b/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoAgentContextNodeFieldsTest2.java @@ -1,5 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; + +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.java b/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoInformationResourceContextNodeFieldsTest.java similarity index 98% rename from test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.java rename to test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoInformationResourceContextNodeFieldsTest.java index 6691121d..aaaa16a9 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.java +++ b/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoInformationResourceContextNodeFieldsTest.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding; import java.io.IOException; import java.io.InputStream; diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.n3 b/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoInformationResourceContextNodeFieldsTest.n3 similarity index 100% rename from test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/VivoInformationResourceContextNodeFieldsTest.n3 rename to test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/VivoInformationResourceContextNodeFieldsTest.n3 diff --git a/test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForContextNodesTest.java b/test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForContextNodesTest.java similarity index 99% rename from test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForContextNodesTest.java rename to test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForContextNodesTest.java index 7e0a348b..8693b9fb 100644 --- a/test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForContextNodesTest.java +++ b/test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForContextNodesTest.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.indexing; +package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import static org.junit.Assert.assertTrue;