diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/IndividualToSearchDocument.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/IndividualToSearchDocument.java index 5f470558d..923e1ad56 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/IndividualToSearchDocument.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/IndividualToSearchDocument.java @@ -37,6 +37,8 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchResultDocument; import edu.cornell.mannlib.vitro.webapp.search.IndexingException; +import edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding.DocumentModifier; +import edu.cornell.mannlib.vitro.webapp.searchindex.exclusions.SearchIndexExcluder; public class IndividualToSearchDocument { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java index f923cd42e..9a9f38bc8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java @@ -25,7 +25,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.search.beans.IndexerIface; -import edu.cornell.mannlib.vitro.webapp.search.beans.StatementToURIsToUpdate; +import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.StatementToURIsToUpdate; import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerSetup.java index c52134f47..9d71b083c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerSetup.java @@ -28,13 +28,13 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngine; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceUtils; import edu.cornell.mannlib.vitro.webapp.search.SearchIndexer; -import edu.cornell.mannlib.vitro.webapp.search.beans.StatementToURIsToUpdate; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.DocumentModifier; import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.IndividualToSearchDocument; -import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.SearchIndexExcluder; -import edu.cornell.mannlib.vitro.webapp.search.indexing.AdditionalUriFinders; import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder; import edu.cornell.mannlib.vitro.webapp.search.indexing.SearchReindexingListener; +import edu.cornell.mannlib.vitro.webapp.searchindex.documentBuilding.DocumentModifier; +import edu.cornell.mannlib.vitro.webapp.searchindex.exclusions.SearchIndexExcluder; +import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.AdditionalUriFinders; +import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.StatementToURIsToUpdate; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; import edu.cornell.mannlib.vitro.webapp.utils.configuration.ConfigurationBeanLoader; import edu.cornell.mannlib.vitro.webapp.utils.configuration.ConfigurationBeanLoaderException; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ContextNodeFields.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ContextNodeFields.java similarity index 98% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ContextNodeFields.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ContextNodeFields.java index cb1a829d0..0b13a9d68 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ContextNodeFields.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ContextNodeFields.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.Collection; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/DocumentModifier.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifier.java similarity index 92% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/DocumentModifier.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifier.java index c6323b17d..a97f47349 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/DocumentModifier.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/DocumentModifier.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 edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameBoost.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/NameBoost.java similarity index 96% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameBoost.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/NameBoost.java index f1840dcdf..631db918d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameBoost.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/NameBoost.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.NAME_LOWERCASE; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.NAME_RAW; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameFields.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/NameFields.java similarity index 97% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameFields.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/NameFields.java index 2c8184e23..ea5716966 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameFields.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/NameFields.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.BufferedReader; import java.io.IOException; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SourceInstitution.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/SourceInstitution.java similarity index 93% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SourceInstitution.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/SourceInstitution.java index 85dfb40bd..b87a26d6f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SourceInstitution.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/SourceInstitution.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 edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchInputDocument; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ThumbnailImageURL.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java similarity index 98% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ThumbnailImageURL.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.java index e99db5916..548b2f039 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ThumbnailImageURL.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURL.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.THUMBNAIL; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.THUMBNAIL_URL; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnNamespace.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnNamespace.java similarity index 93% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnNamespace.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnNamespace.java index 7e295313b..6bda6f901 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnNamespace.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnNamespace.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.exclusions; import java.util.ArrayList; import java.util.List; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnType.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnType.java similarity index 97% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnType.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnType.java index 1a9879e80..08d01002c 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnType.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnType.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.exclusions; import static edu.cornell.mannlib.vitro.webapp.search.documentBuilding.IndividualToSearchDocument.DONT_EXCLUDE; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnTypeNamespace.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeNamespace.java similarity index 96% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnTypeNamespace.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeNamespace.java index 671112f28..e85f98682 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnTypeNamespace.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeNamespace.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.exclusions; import java.util.ArrayList; import java.util.List; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeNonFlagVitro.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeNonFlagVitro.java similarity index 96% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeNonFlagVitro.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeNonFlagVitro.java index 7d25e7713..3b63ed6ba 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeNonFlagVitro.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeNonFlagVitro.java @@ -1,5 +1,5 @@ /* $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.exclusions; import static edu.cornell.mannlib.vitro.webapp.search.documentBuilding.IndividualToSearchDocument.DONT_EXCLUDE; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SearchIndexExcluder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluder.java similarity index 88% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SearchIndexExcluder.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluder.java index a34a7dde8..949cec2e3 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SearchIndexExcluder.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SearchIndexExcluder.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.exclusions; import edu.cornell.mannlib.vitro.webapp.beans.Individual; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SyncingExcludeBasedOnType.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SyncingExcludeBasedOnType.java similarity index 99% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SyncingExcludeBasedOnType.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SyncingExcludeBasedOnType.java index c6152126c..0caf64025 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SyncingExcludeBasedOnType.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/SyncingExcludeBasedOnType.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.exclusions; import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.EXCLUDE_CLASS; import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.SEARCH_INDEX_URI; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForClassGroupChanges.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChanges.java similarity index 94% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForClassGroupChanges.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChanges.java index c52958a3d..aecd582ee 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForClassGroupChanges.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChanges.java @@ -2,7 +2,7 @@ /** * */ -package edu.cornell.mannlib.vitro.webapp.search.indexing; +package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import java.util.ArrayList; import java.util.Collections; @@ -15,7 +15,6 @@ import com.hp.hpl.jena.shared.Lock; import com.hp.hpl.jena.vocabulary.RDF; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.search.beans.StatementToURIsToUpdate; /** * If a class changes classgroups, then all members of that class diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForDataProperties.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForDataProperties.java similarity index 83% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForDataProperties.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForDataProperties.java index d9528aa0d..d44ff002a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForDataProperties.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForDataProperties.java @@ -1,13 +1,13 @@ /* $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.Collections; import java.util.List; import com.hp.hpl.jena.rdf.model.Statement; -import edu.cornell.mannlib.vitro.webapp.search.beans.StatementToURIsToUpdate; +import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.StatementToURIsToUpdate; public class AdditionalURIsForDataProperties implements StatementToURIsToUpdate{ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForObjectProperties.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectProperties.java similarity index 97% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForObjectProperties.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectProperties.java index 38fdf1ea7..7ee7f67cd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForObjectProperties.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectProperties.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; @@ -21,7 +21,6 @@ import com.hp.hpl.jena.vocabulary.RDFS; 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; /** * For a given statement, return the URIs that may need to be updated in diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForTypeStatements.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatements.java similarity index 85% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForTypeStatements.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatements.java index 7103f48c4..1ca7a6004 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForTypeStatements.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatements.java @@ -1,8 +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.Collections; import java.util.List; @@ -10,7 +8,7 @@ import java.util.List; import com.hp.hpl.jena.rdf.model.Statement; import com.hp.hpl.jena.vocabulary.RDF; -import edu.cornell.mannlib.vitro.webapp.search.beans.StatementToURIsToUpdate; +import edu.cornell.mannlib.vitro.webapp.searchindex.indexing.StatementToURIsToUpdate; /** * Adds URIs to index for type statement changes on individuals. diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalUriFinders.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUriFinders.java similarity index 86% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalUriFinders.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUriFinders.java index 4758de021..f474f1f8b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalUriFinders.java +++ b/webapp/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/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/StatementToURIsToUpdate.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/StatementToURIsToUpdate.java similarity index 93% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/StatementToURIsToUpdate.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/StatementToURIsToUpdate.java index a0fbe3c6d..f73aa848b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/StatementToURIsToUpdate.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/StatementToURIsToUpdate.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.beans; +package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import java.util.List; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/URIsForClassGroupChange.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/URIsForClassGroupChange.java similarity index 93% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/URIsForClassGroupChange.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/URIsForClassGroupChange.java index cdd912637..d5bfa1c5a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/URIsForClassGroupChange.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/URIsForClassGroupChange.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.indexing; + +package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import java.util.ArrayList; import java.util.Collections; @@ -10,7 +11,6 @@ import com.hp.hpl.jena.rdf.model.Statement; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.search.beans.StatementToURIsToUpdate; /** * if a class's classgroup changes, reindex all individuals in that class. diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameFieldsTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/NameFieldsTest.java similarity index 98% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameFieldsTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/NameFieldsTest.java index 1a7c163e1..15922750a 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameFieldsTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/NameFieldsTest.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.modelaccess.ModelAccess.WhichService.CONTENT; import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.NAME_RAW; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ThumbnailImageURLTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java similarity index 97% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ThumbnailImageURLTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java index b5c9149cf..10b6ab66f 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ThumbnailImageURLTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/ThumbnailImageURLTest.java @@ -1,8 +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.modelaccess.ModelAccess.WhichService.CONTENT; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnTypeTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeTest.java similarity index 97% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnTypeTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeTest.java index 923751325..052cd246c 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnTypeTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/exclusions/ExcludeBasedOnTypeTest.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.exclusions; import static org.junit.Assert.*; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForClassGroupChangesTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChangesTest.java similarity index 96% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForClassGroupChangesTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChangesTest.java index dbd7156f0..81b64a8a6 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForClassGroupChangesTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForClassGroupChangesTest.java @@ -1,10 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -/** - * - */ -package edu.cornell.mannlib.vitro.webapp.search.indexing; -import static org.junit.Assert.*; +package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; import java.io.StringReader; import java.util.List; @@ -16,11 +12,8 @@ import org.junit.Test; import com.hp.hpl.jena.ontology.OntModel; import com.hp.hpl.jena.rdf.model.ModelFactory; import com.hp.hpl.jena.rdf.model.ResourceFactory; -import com.hp.hpl.jena.vocabulary.OWL; -import com.hp.hpl.jena.vocabulary.RDFS; import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary; -import edu.cornell.mannlib.vitro.webapp.search.beans.StatementToURIsToUpdate; /** * @author bdc34 diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForObjectPropertiesTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectPropertiesTest.java similarity index 99% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForObjectPropertiesTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectPropertiesTest.java index 5b91a3816..3d77c9dec 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForObjectPropertiesTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForObjectPropertiesTest.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.io.StringReader; import java.util.List; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForTypeStatementsTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatementsTest.java similarity index 94% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForTypeStatementsTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatementsTest.java index fe9a6c9d7..25ead970b 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/indexing/AdditionalURIsForTypeStatementsTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForTypeStatementsTest.java @@ -1,10 +1,7 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -/** - * - */ -package edu.cornell.mannlib.vitro.webapp.search.indexing; -import java.util.ArrayList; +package edu.cornell.mannlib.vitro.webapp.searchindex.indexing; + import java.util.List; import org.junit.Assert;