From f4e81a7328cad86648c89ab14ec34a47e31c4ac8 Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Tue, 22 Apr 2014 18:28:14 -0400 Subject: [PATCH] VIVO-742 Rename some 'solr' packages. --- .../search/{solr => }/SearchIndexer.java | 4 ++-- .../documentBuilding/ContextNodeFields.java | 2 +- .../documentBuilding/DocumentModifier.java | 2 +- .../ExcludeBasedOnNamespace.java | 2 +- .../documentBuilding/ExcludeBasedOnType.java | 2 +- .../ExcludeBasedOnTypeNamespace.java | 2 +- .../documentBuilding/ExcludeNonFlagVitro.java | 4 ++-- .../IndividualToSearchDocument.java | 2 +- .../documentBuilding/NameBoost.java | 2 +- .../documentBuilding/NameFields.java | 2 +- .../documentBuilding/SearchIndexExcluder.java | 2 +- .../SkipIndividualException.java | 2 +- .../documentBuilding/SourceInstitution.java | 2 +- .../SyncingExcludeBasedOnType.java | 2 +- .../documentBuilding/ThumbnailImageURL.java | 2 +- .../search/indexing/IndexWorkerThread.java | 2 +- .../searchindex/SearchIndexerSetup.java | 24 +++++++++---------- .../ExcludeBasedOnTypeTest.java | 2 +- .../ThumbnailImageURLTest.java | 8 +++---- .../{solr => documentBuilding}/testPerson.n3 | 0 20 files changed, 35 insertions(+), 35 deletions(-) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/SearchIndexer.java (98%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/ContextNodeFields.java (98%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/DocumentModifier.java (89%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/ExcludeBasedOnNamespace.java (92%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/ExcludeBasedOnType.java (97%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/ExcludeBasedOnTypeNamespace.java (96%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/ExcludeNonFlagVitro.java (89%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/IndividualToSearchDocument.java (99%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/NameBoost.java (95%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/NameFields.java (97%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/SearchIndexExcluder.java (87%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/SkipIndividualException.java (76%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/SourceInstitution.java (93%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/SyncingExcludeBasedOnType.java (98%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/ThumbnailImageURL.java (98%) rename webapp/test/edu/cornell/mannlib/vitro/webapp/search/{solr => }/documentBuilding/ExcludeBasedOnTypeTest.java (97%) rename webapp/test/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/ThumbnailImageURLTest.java (88%) rename webapp/test/edu/cornell/mannlib/vitro/webapp/search/{solr => documentBuilding}/testPerson.n3 (100%) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SearchIndexer.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/SearchIndexer.java similarity index 98% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SearchIndexer.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/SearchIndexer.java index 952c4653f..aafef4ad3 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/SearchIndexer.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/SearchIndexer.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.solr; +package edu.cornell.mannlib.vitro.webapp.search; import java.util.HashSet; @@ -18,7 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchResponse; import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchResultDocumentList; import edu.cornell.mannlib.vitro.webapp.search.IndexingException; import edu.cornell.mannlib.vitro.webapp.search.beans.IndexerIface; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.IndividualToSearchDocument; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.IndividualToSearchDocument; public class SearchIndexer implements IndexerIface { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ContextNodeFields.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ContextNodeFields.java similarity index 98% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ContextNodeFields.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ContextNodeFields.java index 010bac7b1..21bc72984 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ContextNodeFields.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ContextNodeFields.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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.Collection; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/DocumentModifier.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/DocumentModifier.java similarity index 89% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/DocumentModifier.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/DocumentModifier.java index a3ff1e8bf..7b3b6194a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/DocumentModifier.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.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/solr/documentBuilding/ExcludeBasedOnNamespace.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnNamespace.java similarity index 92% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeBasedOnNamespace.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnNamespace.java index 088fe6fb2..615fdfffd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeBasedOnNamespace.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnNamespace.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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.Arrays; import java.util.List; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeBasedOnType.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnType.java similarity index 97% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeBasedOnType.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnType.java index 97c9c5aa6..f39f567ea 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeBasedOnType.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnType.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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.Arrays; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeBasedOnTypeNamespace.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnTypeNamespace.java similarity index 96% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeBasedOnTypeNamespace.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnTypeNamespace.java index 7e3ba57ea..60af4f0bc 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeBasedOnTypeNamespace.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnTypeNamespace.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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.Arrays; import java.util.Collections; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeNonFlagVitro.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeNonFlagVitro.java similarity index 89% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeNonFlagVitro.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeNonFlagVitro.java index 6dec71993..61bb82dab 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeNonFlagVitro.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeNonFlagVitro.java @@ -1,7 +1,7 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; -import static edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.IndividualToSearchDocument.DONT_EXCLUDE; +import static edu.cornell.mannlib.vitro.webapp.search.documentBuilding.IndividualToSearchDocument.DONT_EXCLUDE; import java.util.List; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/IndividualToSearchDocument.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/IndividualToSearchDocument.java similarity index 99% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/IndividualToSearchDocument.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/IndividualToSearchDocument.java index 2e29205b2..1a09dbffd 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/IndividualToSearchDocument.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/IndividualToSearchDocument.java @@ -1,7 +1,7 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.HashMap; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/NameBoost.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameBoost.java similarity index 95% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/NameBoost.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameBoost.java index 83a23bde6..5647a1cca 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/NameBoost.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.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/solr/documentBuilding/NameFields.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameFields.java similarity index 97% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/NameFields.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/NameFields.java index f2943038f..06b592d53 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/NameFields.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.io.BufferedReader; import java.io.IOException; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/SearchIndexExcluder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SearchIndexExcluder.java similarity index 87% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/SearchIndexExcluder.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SearchIndexExcluder.java index 83678288a..a34a7dde8 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/SearchIndexExcluder.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SearchIndexExcluder.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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import edu.cornell.mannlib.vitro.webapp.beans.Individual; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/SkipIndividualException.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SkipIndividualException.java similarity index 76% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/SkipIndividualException.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SkipIndividualException.java index ef5bc7a79..19f643c1a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/SkipIndividualException.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SkipIndividualException.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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; public class SkipIndividualException extends Exception{ diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/SourceInstitution.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SourceInstitution.java similarity index 93% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/SourceInstitution.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SourceInstitution.java index 5a138e04c..ccd0c0ccc 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/SourceInstitution.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.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/solr/documentBuilding/SyncingExcludeBasedOnType.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SyncingExcludeBasedOnType.java similarity index 98% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/SyncingExcludeBasedOnType.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SyncingExcludeBasedOnType.java index 3dc3f5dde..dfdf2a28d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/SyncingExcludeBasedOnType.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/SyncingExcludeBasedOnType.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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.util.ArrayList; import java.util.List; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ThumbnailImageURL.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ThumbnailImageURL.java similarity index 98% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ThumbnailImageURL.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ThumbnailImageURL.java index 7b6a054d7..bafcd761d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ThumbnailImageURL.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.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/indexing/IndexWorkerThread.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexWorkerThread.java index cb33a9406..3e27a57cf 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexWorkerThread.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexWorkerThread.java @@ -11,7 +11,7 @@ import org.apache.commons.logging.LogFactory; import edu.cornell.mannlib.vitro.webapp.beans.Individual; import edu.cornell.mannlib.vitro.webapp.search.IndexingException; import edu.cornell.mannlib.vitro.webapp.search.beans.IndexerIface; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.IndividualToSearchDocument; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.IndividualToSearchDocument; import edu.cornell.mannlib.vitro.webapp.utils.threads.VitroBackgroundThread; class IndexWorkerThread extends 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 2a8543333..de51e80f1 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerSetup.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchindex/SearchIndexerSetup.java @@ -25,22 +25,22 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngine; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; 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.ExcludeBasedOnNamespace; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ExcludeBasedOnType; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ExcludeBasedOnTypeNamespace; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ExcludeNonFlagVitro; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.IndividualToSearchDocument; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.NameBoost; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.NameFields; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.SearchIndexExcluder; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.SyncingExcludeBasedOnType; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ThumbnailImageURL; 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.search.solr.SearchIndexer; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.DocumentModifier; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ExcludeBasedOnNamespace; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ExcludeBasedOnType; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ExcludeBasedOnTypeNamespace; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ExcludeNonFlagVitro; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.IndividualToSearchDocument; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.NameBoost; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.NameFields; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.SearchIndexExcluder; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.SyncingExcludeBasedOnType; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ThumbnailImageURL; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; /** diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeBasedOnTypeTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnTypeTest.java similarity index 97% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeBasedOnTypeTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ExcludeBasedOnTypeTest.java index 908b62354..923751325 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/documentBuilding/ExcludeBasedOnTypeTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/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.solr.documentBuilding; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import static org.junit.Assert.*; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/ThumbnailImageURLTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ThumbnailImageURLTest.java similarity index 88% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/ThumbnailImageURLTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ThumbnailImageURLTest.java index 7ebf7f4ed..edce6b4a5 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/ThumbnailImageURLTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/ThumbnailImageURLTest.java @@ -2,7 +2,7 @@ /** * */ -package edu.cornell.mannlib.vitro.webapp.search.solr; +package edu.cornell.mannlib.vitro.webapp.search.documentBuilding; import java.io.InputStream; @@ -29,8 +29,8 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceFactorySingle; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.model.RDFServiceModel; import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.SkipIndividualException; -import edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ThumbnailImageURL; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.SkipIndividualException; +import edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ThumbnailImageURL; public class ThumbnailImageURLTest extends AbstractTestClass{ RDFServiceFactory testRDF; @@ -54,7 +54,7 @@ public class ThumbnailImageURLTest extends AbstractTestClass{ * Test to see if ThumbnailImageURL gets the date it is suppose to gete * from a set of RDF. * - * Test method for {@link edu.cornell.mannlib.vitro.webapp.search.solr.documentBuilding.ThumbnailImageURL#modifyDocument(edu.cornell.mannlib.vitro.webapp.beans.Individual, org.apache.solr.common.SolrInputDocument, java.lang.StringBuffer)}. + * Test method for {@link edu.cornell.mannlib.vitro.webapp.search.documentBuilding.ThumbnailImageURL#modifyDocument(edu.cornell.mannlib.vitro.webapp.beans.Individual, org.apache.solr.common.SolrInputDocument, java.lang.StringBuffer)}. */ @Test public void testThumbnailFieldCreatedInSolrDoc() { diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/testPerson.n3 b/webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/testPerson.n3 similarity index 100% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/search/solr/testPerson.n3 rename to webapp/test/edu/cornell/mannlib/vitro/webapp/search/documentBuilding/testPerson.n3