From db22b4d1f71eee62de9e622cc65aeab9cdbf8860 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Sat, 23 Jan 2016 01:17:07 +0100 Subject: [PATCH] Applied folder moves and renames before merge in SVN r1144174. --- .../maven/solr/{src => core}/pom.xml.template | 0 .../solr/{src => }/solrj/pom.xml.template | 0 .../{src => }/test-framework/pom.xml.template | 0 .../solr/{src => }/webapp/pom.xml.template | 0 .../analysis/ASCIIFoldingFilterFactory.java | 0 .../ArabicLetterTokenizerFactory.java | 0 .../ArabicNormalizationFilterFactory.java | 0 .../analysis/ArabicStemFilterFactory.java | 0 .../solr/analysis/BaseCharFilterFactory.java | 0 .../solr/analysis/BaseTokenFilterFactory.java | 0 .../solr/analysis/BaseTokenStreamFactory.java | 0 .../solr/analysis/BaseTokenizerFactory.java | 0 .../analysis/BrazilianStemFilterFactory.java | 0 .../analysis/BulgarianStemFilterFactory.java | 0 .../solr/analysis/CJKTokenizerFactory.java | 0 .../analysis/CapitalizationFilterFactory.java | 0 .../solr/analysis/CharFilterFactory.java | 0 .../solr/analysis/ChineseFilterFactory.java | 0 .../analysis/ChineseTokenizerFactory.java | 0 .../solr/analysis/ClassicFilterFactory.java | 0 .../analysis/ClassicTokenizerFactory.java | 0 .../analysis/CollationKeyFilterFactory.java | 0 .../analysis/CommonGramsFilterFactory.java | 0 .../CommonGramsQueryFilterFactory.java | 0 .../solr/analysis/CzechStemFilterFactory.java | 0 .../DelimitedPayloadTokenFilterFactory.java | 0 ...tionaryCompoundWordTokenFilterFactory.java | 0 .../DoubleMetaphoneFilterFactory.java | 0 .../solr/analysis/EdgeNGramFilterFactory.java | 0 .../analysis/EdgeNGramTokenizerFactory.java | 0 .../solr/analysis/ElisionFilterFactory.java | 0 .../EnglishMinimalStemFilterFactory.java | 0 .../EnglishPossessiveFilterFactory.java | 0 .../FinnishLightStemFilterFactory.java | 0 .../FrenchLightStemFilterFactory.java | 0 .../FrenchMinimalStemFilterFactory.java | 0 .../analysis/GalicianStemFilterFactory.java | 0 .../GermanLightStemFilterFactory.java | 0 .../GermanMinimalStemFilterFactory.java | 0 .../analysis/GermanStemFilterFactory.java | 0 .../analysis/GreekLowerCaseFilterFactory.java | 0 .../solr/analysis/GreekStemFilterFactory.java | 0 .../analysis/HTMLStripCharFilterFactory.java | 0 .../HindiNormalizationFilterFactory.java | 0 .../solr/analysis/HindiStemFilterFactory.java | 0 .../HungarianLightStemFilterFactory.java | 0 .../HyphenatedWordsFilterFactory.java | 0 ...enationCompoundWordTokenFilterFactory.java | 0 .../IndicNormalizationFilterFactory.java | 0 .../analysis/IndonesianStemFilterFactory.java | 0 .../ItalianLightStemFilterFactory.java | 0 .../solr/analysis/KStemFilterFactory.java | 0 .../solr/analysis/KeepWordFilterFactory.java | 0 .../analysis/KeywordMarkerFilterFactory.java | 0 .../analysis/KeywordTokenizerFactory.java | 0 .../analysis/LatvianStemFilterFactory.java | 0 .../solr/analysis/LengthFilterFactory.java | 0 .../solr/analysis/LetterTokenizerFactory.java | 0 .../LimitTokenCountFilterFactory.java | 0 .../solr/analysis/LowerCaseFilterFactory.java | 0 .../analysis/LowerCaseTokenizerFactory.java | 0 .../analysis/MappingCharFilterFactory.java | 0 .../solr/analysis/NGramFilterFactory.java | 0 .../solr/analysis/NGramTokenizerFactory.java | 0 .../NumericPayloadTokenFilterFactory.java | 0 .../PathHierarchyTokenizerFactory.java | 0 .../PatternReplaceCharFilterFactory.java | 0 .../analysis/PatternReplaceFilterFactory.java | 0 .../analysis/PatternTokenizerFactory.java | 0 .../analysis/PersianCharFilterFactory.java | 0 .../PersianNormalizationFilterFactory.java | 0 .../solr/analysis/PhoneticFilterFactory.java | 0 .../analysis/PorterStemFilterFactory.java | 0 .../PortugueseLightStemFilterFactory.java | 0 .../PortugueseMinimalStemFilterFactory.java | 0 .../analysis/PortugueseStemFilterFactory.java | 0 .../solr/analysis/PositionFilterFactory.java | 0 .../RemoveDuplicatesTokenFilterFactory.java | 0 .../analysis/ReverseStringFilterFactory.java | 0 .../solr/analysis/ReversedWildcardFilter.java | 0 .../ReversedWildcardFilterFactory.java | 0 .../RussianLetterTokenizerFactory.java | 0 .../RussianLightStemFilterFactory.java | 0 .../solr/analysis/ShingleFilterFactory.java | 0 .../analysis/SnowballPorterFilterFactory.java | 0 .../apache/solr/analysis/SolrAnalyzer.java | 0 .../SpanishLightStemFilterFactory.java | 0 .../solr/analysis/StandardFilterFactory.java | 0 .../analysis/StandardTokenizerFactory.java | 0 .../StemmerOverrideFilterFactory.java | 0 .../solr/analysis/StopFilterFactory.java | 0 .../SwedishLightStemFilterFactory.java | 0 .../solr/analysis/SynonymFilterFactory.java | 0 .../solr/analysis/ThaiWordFilterFactory.java | 0 .../solr/analysis/TokenFilterFactory.java | 0 .../TokenOffsetPayloadTokenFilterFactory.java | 0 .../apache/solr/analysis/TokenizerChain.java | 0 .../solr/analysis/TokenizerFactory.java | 0 .../solr/analysis/TrieTokenizerFactory.java | 0 .../solr/analysis/TrimFilterFactory.java | 0 .../TurkishLowerCaseFilterFactory.java | 0 .../TypeAsPayloadTokenFilterFactory.java | 0 .../UAX29URLEmailTokenizerFactory.java | 0 .../analysis/WhitespaceTokenizerFactory.java | 0 .../analysis/WikipediaTokenizerFactory.java | 0 .../analysis/WordDelimiterFilterFactory.java | 0 .../solrj/embedded/EmbeddedSolrServer.java | 0 .../solrj/embedded/JettySolrRunner.java | 0 .../apache/solr/cloud/CloudDescriptor.java | 0 .../org/apache/solr/cloud/SolrZkServer.java | 0 .../org/apache/solr/cloud/ZkController.java | 0 .../solr/cloud/ZkSolrResourceLoader.java | 0 .../solr/core/AbstractSolrEventListener.java | 0 .../java/org/apache/solr/core/CloseHook.java | 0 .../solr/core/CodecProviderFactory.java | 0 .../src/java/org/apache/solr/core/Config.java | 0 .../org/apache/solr/core/CoreContainer.java | 0 .../org/apache/solr/core/CoreDescriptor.java | 0 .../apache/solr/core/DirectoryFactory.java | 0 .../solr/core/IndexDeletionPolicyWrapper.java | 0 .../apache/solr/core/IndexReaderFactory.java | 0 .../org/apache/solr/core/JmxMonitoredMap.java | 0 .../solr/core/MMapDirectoryFactory.java | 0 .../java/org/apache/solr/core/PluginInfo.java | 0 .../apache/solr/core/QuerySenderListener.java | 0 .../apache/solr/core/RAMDirectoryFactory.java | 0 .../apache/solr/core/RefCntRamDirectory.java | 0 .../org/apache/solr/core/RequestHandlers.java | 0 .../solr/core/RunExecutableListener.java | 0 .../apache/solr/core/SchemaCodecProvider.java | 0 .../solr/core/SimpleFSDirectoryFactory.java | 0 .../java/org/apache/solr/core/SolrConfig.java | 0 .../java/org/apache/solr/core/SolrCore.java | 0 .../apache/solr/core/SolrDeletionPolicy.java | 0 .../apache/solr/core/SolrEventListener.java | 0 .../org/apache/solr/core/SolrInfoMBean.java | 0 .../apache/solr/core/SolrResourceLoader.java | 0 .../apache/solr/core/SolrXMLSerializer.java | 0 .../solr/core/StandardDirectoryFactory.java | 0 .../solr/core/StandardIndexReaderFactory.java | 0 .../handler/AnalysisRequestHandlerBase.java | 0 .../handler/BinaryUpdateRequestHandler.java | 0 .../solr/handler/CSVRequestHandler.java | 0 .../handler/ContentStreamHandlerBase.java | 0 .../solr/handler/ContentStreamLoader.java | 0 .../DocumentAnalysisRequestHandler.java | 0 .../solr/handler/DumpRequestHandler.java | 0 .../handler/FieldAnalysisRequestHandler.java | 0 .../org/apache/solr/handler/JsonLoader.java | 0 .../handler/JsonUpdateRequestHandler.java | 0 .../solr/handler/MoreLikeThisHandler.java | 0 .../solr/handler/PingRequestHandler.java | 0 .../solr/handler/ReplicationHandler.java | 0 .../solr/handler/RequestHandlerBase.java | 0 .../solr/handler/RequestHandlerUtils.java | 0 .../org/apache/solr/handler/SnapPuller.java | 0 .../org/apache/solr/handler/SnapShooter.java | 0 .../solr/handler/StandardRequestHandler.java | 0 .../org/apache/solr/handler/XMLLoader.java | 0 .../solr/handler/XmlUpdateRequestHandler.java | 0 .../handler/XsltUpdateRequestHandler.java | 0 .../apache/solr/handler/XsltXMLLoader.java | 0 .../solr/handler/admin/AdminHandlers.java | 0 .../solr/handler/admin/CoreAdminHandler.java | 0 .../handler/admin/LukeRequestHandler.java | 0 .../solr/handler/admin/PluginInfoHandler.java | 0 .../admin/PropertiesRequestHandler.java | 0 .../handler/admin/ShowFileRequestHandler.java | 0 .../handler/admin/SolrInfoMBeanHandler.java | 0 .../solr/handler/admin/SystemInfoHandler.java | 0 .../solr/handler/admin/ThreadDumpHandler.java | 0 .../handler/component/DebugComponent.java | 0 .../handler/component/FacetComponent.java | 0 .../handler/component/FieldFacetStats.java | 0 .../handler/component/HighlightComponent.java | 0 .../handler/component/HttpShardHandler.java | 0 .../component/HttpShardHandlerFactory.java | 0 .../component/MoreLikeThisComponent.java | 0 .../handler/component/PivotFacetHelper.java | 0 .../handler/component/QueryComponent.java | 0 .../component/QueryElevationComponent.java | 0 .../handler/component/ResponseBuilder.java | 0 .../handler/component/SearchComponent.java | 0 .../solr/handler/component/SearchHandler.java | 0 .../solr/handler/component/ShardDoc.java | 0 .../solr/handler/component/ShardHandler.java | 0 .../component/ShardHandlerFactory.java | 0 .../solr/handler/component/ShardRequest.java | 0 .../solr/handler/component/ShardResponse.java | 0 .../component/SpellCheckComponent.java | 0 .../handler/component/StatsComponent.java | 0 .../solr/handler/component/StatsValues.java | 0 .../component/TermVectorComponent.java | 0 .../handler/component/TermsComponent.java | 0 .../apache/solr/highlight/DefaultEncoder.java | 0 .../highlight/DefaultSolrHighlighter.java | 0 .../apache/solr/highlight/GapFragmenter.java | 0 .../highlight/HighlightingPluginBase.java | 0 .../apache/solr/highlight/HtmlEncoder.java | 0 .../apache/solr/highlight/HtmlFormatter.java | 0 .../solr/highlight/RegexFragmenter.java | 0 .../highlight/ScoreOrderFragmentsBuilder.java | 0 .../solr/highlight/SimpleFragListBuilder.java | 0 .../highlight/SimpleFragmentsBuilder.java | 0 .../solr/highlight/SingleFragListBuilder.java | 0 .../apache/solr/highlight/SolrEncoder.java | 0 .../apache/solr/highlight/SolrFormatter.java | 0 .../solr/highlight/SolrFragListBuilder.java | 0 .../apache/solr/highlight/SolrFragmenter.java | 0 .../solr/highlight/SolrFragmentsBuilder.java | 0 .../solr/highlight/SolrHighlighter.java | 0 .../solr/request/LocalSolrQueryRequest.java | 0 .../PerSegmentSingleValuedFaceting.java | 0 .../solr/request/ServletSolrParams.java | 0 .../org/apache/solr/request/SimpleFacets.java | 0 .../apache/solr/request/SolrQueryRequest.java | 0 .../solr/request/SolrQueryRequestBase.java | 0 .../solr/request/SolrRequestHandler.java | 0 .../apache/solr/request/SolrRequestInfo.java | 0 .../apache/solr/request/UnInvertedField.java | 0 .../response/BinaryQueryResponseWriter.java | 0 .../solr/response/BinaryResponseWriter.java | 0 .../solr/response/CSVResponseWriter.java | 0 .../solr/response/JSONResponseWriter.java | 0 .../solr/response/PHPResponseWriter.java | 0 .../response/PHPSerializedResponseWriter.java | 0 .../org/apache/solr/response/PageTool.java | 0 .../solr/response/PythonResponseWriter.java | 0 .../solr/response/QueryResponseWriter.java | 0 .../solr/response/RawResponseWriter.java | 0 .../apache/solr/response/ResultContext.java | 0 .../solr/response/RubyResponseWriter.java | 0 .../response/SolrParamResourceLoader.java | 0 .../solr/response/SolrQueryResponse.java | 0 .../response/SolrVelocityResourceLoader.java | 0 .../solr/response/TextResponseWriter.java | 0 .../solr/response/VelocityResponseWriter.java | 0 .../solr/response/XMLResponseWriter.java | 0 .../org/apache/solr/response/XMLWriter.java | 0 .../solr/response/XSLTResponseWriter.java | 0 .../transform/DocIdAugmenterFactory.java | 0 .../response/transform/DocTransformer.java | 0 .../response/transform/DocTransformers.java | 0 .../transform/ExplainAugmenterFactory.java | 0 .../transform/RenameFieldsTransformer.java | 0 .../response/transform/ScoreAugmenter.java | 0 .../transform/ShardAugmenterFactory.java | 0 .../response/transform/TransformContext.java | 0 .../transform/TransformerFactory.java | 0 .../transform/TransformerWithContext.java | 0 .../transform/ValueAugmenterFactory.java | 0 .../transform/ValueSourceAugmenter.java | 0 .../solr/schema/AbstractSubTypeFieldType.java | 0 .../org/apache/solr/schema/BCDIntField.java | 0 .../org/apache/solr/schema/BCDLongField.java | 0 .../org/apache/solr/schema/BCDStrField.java | 0 .../org/apache/solr/schema/BinaryField.java | 0 .../org/apache/solr/schema/BoolField.java | 0 .../org/apache/solr/schema/ByteField.java | 0 .../apache/solr/schema/CollationField.java | 0 .../solr/schema/CoordinateFieldType.java | 0 .../org/apache/solr/schema/CopyField.java | 0 .../org/apache/solr/schema/DateField.java | 0 .../org/apache/solr/schema/DoubleField.java | 0 .../apache/solr/schema/ExternalFileField.java | 0 .../apache/solr/schema/FieldProperties.java | 0 .../org/apache/solr/schema/FieldType.java | 0 .../org/apache/solr/schema/FloatField.java | 0 .../org/apache/solr/schema/GeoHashField.java | 0 .../org/apache/solr/schema/IndexSchema.java | 0 .../java/org/apache/solr/schema/IntField.java | 0 .../org/apache/solr/schema/LatLonType.java | 0 .../org/apache/solr/schema/LongField.java | 0 .../org/apache/solr/schema/PointType.java | 0 .../apache/solr/schema/RandomSortField.java | 0 .../org/apache/solr/schema/SchemaAware.java | 0 .../org/apache/solr/schema/SchemaField.java | 0 .../org/apache/solr/schema/ShortField.java | 0 .../apache/solr/schema/SimilarityFactory.java | 0 .../schema/SimilarityProviderFactory.java | 0 .../solr/schema/SortableDoubleField.java | 0 .../solr/schema/SortableFloatField.java | 0 .../apache/solr/schema/SortableIntField.java | 0 .../apache/solr/schema/SortableLongField.java | 0 .../apache/solr/schema/SpatialQueryable.java | 0 .../java/org/apache/solr/schema/StrField.java | 0 .../apache/solr/schema/StrFieldSource.java | 0 .../org/apache/solr/schema/TextField.java | 0 .../org/apache/solr/schema/TrieDateField.java | 0 .../apache/solr/schema/TrieDoubleField.java | 0 .../org/apache/solr/schema/TrieField.java | 0 .../apache/solr/schema/TrieFloatField.java | 0 .../org/apache/solr/schema/TrieIntField.java | 0 .../org/apache/solr/schema/TrieLongField.java | 0 .../org/apache/solr/schema/UUIDField.java | 0 .../org/apache/solr/search/BitDocSet.java | 0 .../solr/search/BoostQParserPlugin.java | 0 .../org/apache/solr/search/CacheConfig.java | 0 .../apache/solr/search/CacheRegenerator.java | 0 .../solr/search/DelegatingCollector.java | 0 .../org/apache/solr/search/DisMaxQParser.java | 0 .../solr/search/DisMaxQParserPlugin.java | 0 .../org/apache/solr/search/DocIterator.java | 0 .../java/org/apache/solr/search/DocList.java | 0 .../org/apache/solr/search/DocListAndSet.java | 0 .../java/org/apache/solr/search/DocSet.java | 0 .../solr/search/DocSetHitCollector.java | 0 .../java/org/apache/solr/search/DocSlice.java | 0 .../search/ExtendedDismaxQParserPlugin.java | 0 .../org/apache/solr/search/ExtendedQuery.java | 0 .../apache/solr/search/ExtendedQueryBase.java | 0 .../org/apache/solr/search/FastLRUCache.java | 0 .../solr/search/FieldQParserPlugin.java | 0 .../apache/solr/search/FunctionQParser.java | 0 .../solr/search/FunctionQParserPlugin.java | 0 .../search/FunctionRangeQParserPlugin.java | 0 .../java/org/apache/solr/search/Grouping.java | 0 .../org/apache/solr/search/HashDocSet.java | 0 .../apache/solr/search/JoinQParserPlugin.java | 0 .../java/org/apache/solr/search/LRUCache.java | 0 .../solr/search/LuceneQParserPlugin.java | 0 .../solr/search/LuceneQueryOptimizer.java | 0 .../MissingStringLastComparatorSource.java | 0 .../solr/search/NestedQParserPlugin.java | 0 .../solr/search/OldLuceneQParserPlugin.java | 0 .../org/apache/solr/search/PostFilter.java | 0 .../solr/search/PrefixQParserPlugin.java | 0 .../java/org/apache/solr/search/QParser.java | 0 .../org/apache/solr/search/QParserPlugin.java | 0 .../org/apache/solr/search/QueryParsing.java | 0 .../apache/solr/search/QueryResultKey.java | 0 .../org/apache/solr/search/QueryUtils.java | 0 .../apache/solr/search/RawQParserPlugin.java | 0 .../org/apache/solr/search/ReturnFields.java | 0 .../org/apache/solr/search/SolrCache.java | 0 .../org/apache/solr/search/SolrCacheBase.java | 0 .../solr/search/SolrConstantScoreQuery.java | 0 .../solr/search/SolrFieldCacheMBean.java | 0 .../org/apache/solr/search/SolrFilter.java | 0 .../apache/solr/search/SolrIndexSearcher.java | 0 .../apache/solr/search/SolrQueryParser.java | 0 .../solr/search/SolrSimilarityProvider.java | 0 .../org/apache/solr/search/SolrSortField.java | 0 .../java/org/apache/solr/search/SortSpec.java | 0 .../apache/solr/search/SortedIntDocSet.java | 0 .../java/org/apache/solr/search/Sorting.java | 0 .../solr/search/SpatialBoxQParserPlugin.java | 0 .../solr/search/SpatialFilterQParser.java | 0 .../search/SpatialFilterQParserPlugin.java | 0 .../apache/solr/search/SpatialOptions.java | 0 .../apache/solr/search/TermQParserPlugin.java | 0 .../apache/solr/search/ValueSourceParser.java | 0 .../org/apache/solr/search/WrappedQuery.java | 0 .../solr/search/function/FileFloatSource.java | 0 .../function/ValueSourceRangeFilter.java | 0 .../function/distance/GeohashFunction.java | 0 .../distance/GeohashHaversineFunction.java | 0 .../distance/HaversineConstFunction.java | 0 .../function/distance/HaversineFunction.java | 0 .../distance/SquaredEuclideanFunction.java | 0 .../distance/StringDistanceFunction.java | 0 .../distance/VectorDistanceFunction.java | 0 .../solr/servlet/DirectSolrConnection.java | 0 .../solr/servlet/LogLevelSelection.java | 0 .../solr/servlet/SolrDispatchFilter.java | 0 .../solr/servlet/SolrRequestParsers.java | 0 .../servlet/cache/HttpCacheHeaderUtil.java | 0 .../org/apache/solr/servlet/cache/Method.java | 0 .../spelling/AbstractLuceneSpellChecker.java | 0 .../solr/spelling/DirectSolrSpellChecker.java | 0 .../solr/spelling/FileBasedSpellChecker.java | 0 .../solr/spelling/IndexBasedSpellChecker.java | 0 .../solr/spelling/PossibilityIterator.java | 0 .../apache/solr/spelling/QueryConverter.java | 0 .../solr/spelling/RankedSpellPossibility.java | 0 .../solr/spelling/SolrSpellChecker.java | 0 .../solr/spelling/SpellCheckCollation.java | 0 .../solr/spelling/SpellCheckCollator.java | 0 .../solr/spelling/SpellCheckCorrection.java | 0 .../apache/solr/spelling/SpellingOptions.java | 0 .../solr/spelling/SpellingQueryConverter.java | 0 .../apache/solr/spelling/SpellingResult.java | 0 .../solr/spelling/suggest/LookupFactory.java | 0 .../solr/spelling/suggest/Suggester.java | 0 .../suggest/fst/FSTLookupFactory.java | 0 .../suggest/jaspell/JaspellLookupFactory.java | 0 .../suggest/tst/TSTLookupFactory.java | 0 .../apache/solr/update/AddUpdateCommand.java | 0 .../org/apache/solr/update/CommitTracker.java | 0 .../solr/update/CommitUpdateCommand.java | 0 .../update/DefaultIndexWriterProvider.java | 0 .../solr/update/DeleteUpdateCommand.java | 0 .../solr/update/DirectUpdateHandler2.java | 0 .../apache/solr/update/DocumentBuilder.java | 0 .../solr/update/IndexWriterProvider.java | 0 .../solr/update/MergeIndexesCommand.java | 0 .../solr/update/RollbackUpdateCommand.java | 0 .../apache/solr/update/SolrIndexConfig.java | 0 .../apache/solr/update/SolrIndexWriter.java | 0 .../org/apache/solr/update/UpdateCommand.java | 0 .../org/apache/solr/update/UpdateHandler.java | 0 .../processor/LogUpdateProcessorFactory.java | 0 .../update/processor/Lookup3Signature.java | 0 .../solr/update/processor/MD5Signature.java | 0 .../processor/RunUpdateProcessorFactory.java | 0 .../solr/update/processor/Signature.java | 0 .../SignatureUpdateProcessorFactory.java | 0 .../processor/TextProfileSignature.java | 0 .../processor/UpdateRequestProcessor.java | 0 .../UpdateRequestProcessorChain.java | 0 .../UpdateRequestProcessorFactory.java | 0 .../java/org/apache/solr/util/BCDUtils.java | 0 .../org/apache/solr/util/BoundedTreeSet.java | 0 .../org/apache/solr/util/DateMathParser.java | 0 .../apache/solr/util/LongPriorityQueue.java | 0 .../org/apache/solr/util/NumberUtils.java | 0 .../java/org/apache/solr/util/PrimUtils.java | 0 .../java/org/apache/solr/util/RefCounted.java | 0 .../org/apache/solr/util/SentinelIntSet.java | 0 .../org/apache/solr/util/SimplePostTool.java | 0 .../org/apache/solr/util/SolrPluginUtils.java | 0 .../solr/util/SuggestMissingFactories.java | 0 .../org/apache/solr/util/VersionedFile.java | 0 .../solr/util/doc-files/min-should-match.html | 0 .../util/plugin/AbstractPluginLoader.java | 0 .../util/plugin/MapInitializedPlugin.java | 0 .../solr/util/plugin/MapPluginLoader.java | 0 .../plugin/NamedListInitializedPlugin.java | 0 .../util/plugin/NamedListPluginLoader.java | 0 .../util/plugin/PluginInfoInitialized.java | 0 .../solr/util/plugin/ResourceLoaderAware.java | 0 .../solr/util/plugin/SolrCoreAware.java | 0 .../solr/util/xslt/TransformerProvider.java | 0 solr/{ => core}/src/test-files/README | 0 .../{ => core}/src/test-files/lib-dirs/README | 0 .../lib-dirs/a/a1/empty-file-a1.txt | 0 .../lib-dirs/a/a2/empty-file-a2.txt | 0 .../lib-dirs/b/b1/empty-file-b1.txt | 0 .../lib-dirs/b/b2/empty-file-b2.txt | 0 .../lib-dirs/c/c1/empty-file-c1.txt | 0 .../lib-dirs/c/c2/empty-file-c2.txt | 0 .../lib-dirs/d/d1/empty-file-d1.txt | 0 .../lib-dirs/d/d2/empty-file-d2.txt | 0 .../src/test-files/mailing_lists.pdf | 0 .../solr/conf/bad-schema-dup-dynamicField.xml | 0 .../solr/conf/bad-schema-dup-field.xml | 0 .../solr/conf/bad-schema-dup-fieldType.xml | 0 .../solr/conf/bad-schema-nontext-analyzer.xml | 0 .../test-files/solr/conf/bad_solrconfig.xml | 0 .../solr/conf/compoundDictionary.txt | 0 .../src/test-files/solr/conf/da_UTF8.xml | 0 .../solr/conf/da_compoundDictionary.txt | 0 .../src/test-files/solr/conf/elevate.xml | 0 .../test-files/solr/conf/frenchArticles.txt | 0 .../src/test-files/solr/conf/hyphenation.dtd | 0 .../src/test-files/solr/conf/keep-1.txt | 0 .../src/test-files/solr/conf/keep-2.txt | 0 .../solr/conf/mapping-ISOLatin1Accent.txt | 0 .../src/test-files/solr/conf/old_synonyms.txt | 0 .../src/test-files/solr/conf/protwords.txt | 0 .../solr/conf/schema-binaryfield.xml | 0 .../test-files/solr/conf/schema-collate.xml | 0 .../solr/conf/schema-copyfield-test.xml | 0 .../solr/conf/schema-luceneMatchVersion.xml | 0 .../test-files/solr/conf/schema-minimal.xml | 0 .../conf/schema-not-required-unique-key.xml | 0 .../test-files/solr/conf/schema-numeric.xml | 0 .../solr/conf/schema-replication1.xml | 0 .../solr/conf/schema-replication2.xml | 0 .../solr/conf/schema-required-fields.xml | 0 .../test-files/solr/conf/schema-reversed.xml | 0 .../solr/conf/schema-spellchecker.xml | 0 .../test-files/solr/conf/schema-stop-keep.xml | 0 .../src/test-files/solr/conf/schema-trie.xml | 0 .../src/test-files/solr/conf/schema.xml | 0 .../src/test-files/solr/conf/schema11.xml | 0 .../src/test-files/solr/conf/schema12.xml | 0 .../src/test-files/solr/conf/schema_codec.xml | 0 .../solr/conf/solrconfig-SOLR-749.xml | 0 .../solr/conf/solrconfig-altdirectory.xml | 0 .../solr/conf/solrconfig-collate.xml | 0 .../solr/conf/solrconfig-delpolicy1.xml | 0 .../solr/conf/solrconfig-delpolicy2.xml | 0 .../solr/conf/solrconfig-elevate.xml | 0 .../solr/conf/solrconfig-enableplugin.xml | 0 .../solr/conf/solrconfig-functionquery.xml | 0 .../solr/conf/solrconfig-highlight.xml | 0 .../solr/conf/solrconfig-legacy.xml | 0 .../solr/conf/solrconfig-master.xml | 0 .../solr/conf/solrconfig-master1.xml | 0 .../solr/conf/solrconfig-master2.xml | 0 .../solr/conf/solrconfig-mergepolicy.xml | 0 .../solr/conf/solrconfig-nocache.xml | 0 .../solrconfig-propinject-indexdefault.xml | 0 .../solr/conf/solrconfig-propinject.xml | 0 .../conf/solrconfig-querysender-noquery.xml | 0 .../solr/conf/solrconfig-querysender.xml | 0 .../solr/conf/solrconfig-repeater.xml | 0 .../solr/conf/solrconfig-reqHandler.incl | 0 .../test-files/solr/conf/solrconfig-slave.xml | 0 .../solr/conf/solrconfig-slave1.xml | 0 .../conf/solrconfig-solcoreproperties.xml | 0 .../conf/solrconfig-spellcheckcomponent.xml | 0 .../solr/conf/solrconfig-spellchecker.xml | 0 .../solr/conf/solrconfig-termindex.xml | 0 .../solr/conf/solrconfig-transformers.xml | 0 .../solr/conf/solrconfig-xinclude.xml | 0 .../src/test-files/solr/conf/solrconfig.xml | 0 .../test-files/solr/conf/solrconfig_codec.xml | 0 .../test-files/solr/conf/solrconfig_perf.xml | 0 .../src/test-files/solr/conf/stemdict.txt | 0 .../src/test-files/solr/conf/stop-1.txt | 0 .../src/test-files/solr/conf/stop-2.txt | 0 .../src/test-files/solr/conf/stopwithbom.txt | 0 .../src/test-files/solr/conf/stopwords.txt | 0 .../solr/conf/stopwordsWrongEncoding.txt | 0 .../src/test-files/solr/conf/synonyms.txt | 0 .../solr/conf/velocity/VM_global_library.vm | 0 .../src/test-files/solr/conf/wdftypes.txt | 0 .../solr/conf/xslt/dummy-using-include.xsl | 0 .../src/test-files/solr/conf/xslt/dummy.xsl | 0 .../conf/xslt/xsl-update-handler-test.xsl | 0 .../test-files/solr/crazy-path-to-config.xml | 0 .../test-files/solr/crazy-path-to-schema.xml | 0 .../{ => core}/src/test-files/solr/lib/README | 0 .../solr/lib/classes/empty-file-main-lib.txt | 0 solr/{ => core}/src/test-files/solr/solr.xml | 0 solr/{ => core}/src/test-files/spellings.txt | 0 .../apache/solr/BasicFunctionalityTest.java | 0 .../org/apache/solr/ConvertedLegacyTest.java | 0 .../apache/solr/DisMaxRequestHandlerTest.java | 0 .../test/org/apache/solr/EchoParamsTest.java | 0 .../org/apache/solr/MinimalSchemaTest.java | 0 .../org/apache/solr/OutputWriterTest.java | 0 .../src/test/org/apache/solr/SampleTest.java | 0 .../org/apache/solr/SolrInfoMBeanTest.java | 0 .../apache/solr/TestDistributedSearch.java | 0 .../org/apache/solr/TestGroupingSearch.java | 0 .../src/test/org/apache/solr/TestJoin.java | 0 .../org/apache/solr/TestPluginEnable.java | 0 .../apache/solr/TestSolrCoreProperties.java | 0 .../src/test/org/apache/solr/TestTrie.java | 0 .../CommonGramsFilterFactoryTest.java | 0 .../CommonGramsQueryFilterFactoryTest.java | 0 .../DoubleMetaphoneFilterFactoryTest.java | 0 .../solr/analysis/LengthFilterTest.java | 0 .../SnowballPorterFilterFactoryTest.java | 0 .../solr/analysis/TestArabicFilters.java | 0 .../TestBrazilianStemFilterFactory.java | 0 .../TestBulgarianStemFilterFactory.java | 0 .../analysis/TestCJKTokenizerFactory.java | 0 .../TestCapitalizationFilterFactory.java | 0 .../analysis/TestChineseFilterFactory.java | 0 .../analysis/TestChineseTokenizerFactory.java | 0 .../TestCollationKeyFilterFactory.java | 0 .../analysis/TestCzechStemFilterFactory.java | 0 ...estDelimitedPayloadTokenFilterFactory.java | 0 ...tionaryCompoundWordTokenFilterFactory.java | 0 .../analysis/TestElisionFilterFactory.java | 0 .../TestEnglishMinimalStemFilterFactory.java | 0 .../TestFinnishLightStemFilterFactory.java | 0 .../TestFrenchLightStemFilterFactory.java | 0 .../TestFrenchMinimalStemFilterFactory.java | 0 .../TestGalicianStemFilterFactory.java | 0 .../TestGermanLightStemFilterFactory.java | 0 .../TestGermanMinimalStemFilterFactory.java | 0 .../analysis/TestGermanStemFilterFactory.java | 0 .../TestGreekLowerCaseFilterFactory.java | 0 .../analysis/TestGreekStemFilterFactory.java | 0 .../solr/analysis/TestHindiFilters.java | 0 .../TestHungarianLightStemFilterFactory.java | 0 ...enationCompoundWordTokenFilterFactory.java | 0 .../TestIndonesianStemFilterFactory.java | 0 .../TestItalianLightStemFilterFactory.java | 0 .../solr/analysis/TestKStemFilterFactory.java | 0 .../solr/analysis/TestKeepFilterFactory.java | 0 .../TestKeywordMarkerFilterFactory.java | 0 .../TestLatvianStemFilterFactory.java | 0 .../solr/analysis/TestLuceneMatchVersion.java | 0 .../TestMappingCharFilterFactory.java | 0 .../solr/analysis/TestMultiWordSynonyms.java | 0 .../solr/analysis/TestNGramFilters.java | 0 .../TestPatternReplaceCharFilterFactory.java | 0 .../TestPatternReplaceFilterFactory.java | 0 .../analysis/TestPatternTokenizerFactory.java | 0 ...TestPersianNormalizationFilterFactory.java | 0 .../analysis/TestPhoneticFilterFactory.java | 0 .../analysis/TestPorterStemFilterFactory.java | 0 .../TestPortugueseLightStemFilterFactory.java | 0 ...estPortugueseMinimalStemFilterFactory.java | 0 .../TestPortugueseStemFilterFactory.java | 0 ...estRemoveDuplicatesTokenFilterFactory.java | 0 .../TestReverseStringFilterFactory.java | 0 .../TestReversedWildcardFilterFactory.java | 0 .../solr/analysis/TestRussianFilters.java | 0 .../TestRussianLightStemFilterFactory.java | 0 .../analysis/TestShingleFilterFactory.java | 0 .../TestSpanishLightStemFilterFactory.java | 0 .../solr/analysis/TestStandardFactories.java | 0 .../TestStemmerOverrideFilterFactory.java | 0 .../solr/analysis/TestStopFilterFactory.java | 0 .../TestSwedishLightStemFilterFactory.java | 0 .../apache/solr/analysis/TestSynonymMap.java | 0 .../analysis/TestThaiWordFilterFactory.java | 0 .../solr/analysis/TestTrimFilterFactory.java | 0 .../TestTurkishLowerCaseFilterFactory.java | 0 .../TestUAX29URLEmailTokenizerFactory.java | 0 .../TestWikipediaTokenizerFactory.java | 0 .../TestWordDelimiterFilterFactory.java | 0 .../cloud/AbstractDistributedZkTestCase.java | 0 .../apache/solr/cloud/AbstractZkTestCase.java | 0 .../solr/cloud/BasicDistributedZkTest.java | 0 .../org/apache/solr/cloud/BasicZkTest.java | 0 .../solr/cloud/CloudStateUpdateTest.java | 0 .../apache/solr/cloud/ZkControllerTest.java | 0 .../apache/solr/cloud/ZkNodePropsTest.java | 0 .../apache/solr/cloud/ZkSolrClientTest.java | 0 .../org/apache/solr/cloud/ZkTestServer.java | 0 .../solr/core/AlternateDirectoryTest.java | 0 .../solr/core/DummyValueSourceParser.java | 0 .../apache/solr/core/FakeDeletionPolicy.java | 0 .../solr/core/IndexReaderFactoryTest.java | 0 .../solr/core/MockCodecProviderFactory.java | 0 .../apache/solr/core/MockEventListener.java | 0 .../MockQuerySenderListenerReqHandler.java | 0 .../solr/core/RAMDirectoryFactoryTest.java | 0 .../apache/solr/core/RequestHandlersTest.java | 0 .../apache/solr/core/ResourceLoaderTest.java | 0 .../org/apache/solr/core/SOLR749Test.java | 0 .../org/apache/solr/core/SolrCoreTest.java | 0 .../solr/core/TestArbitraryIndexDir.java | 0 .../org/apache/solr/core/TestBadConfig.java | 0 .../solr/core/TestCodecProviderSupport.java | 0 .../test/org/apache/solr/core/TestConfig.java | 0 .../apache/solr/core/TestJmxIntegration.java | 0 .../apache/solr/core/TestJmxMonitoredMap.java | 0 .../TestLegacyMergeSchedulerPolicyConfig.java | 0 .../solr/core/TestMergePolicyConfig.java | 0 .../org/apache/solr/core/TestPropInject.java | 0 .../solr/core/TestPropInjectDefaults.java | 0 .../solr/core/TestQuerySenderListener.java | 0 .../solr/core/TestQuerySenderNoQuery.java | 0 .../solr/core/TestSolrDeletionPolicy1.java | 0 .../solr/core/TestSolrDeletionPolicy2.java | 0 .../solr/core/TestSolrXMLSerializer.java | 0 .../apache/solr/core/TestXIncludeConfig.java | 0 .../AnalysisRequestHandlerTestBase.java | 0 .../DocumentAnalysisRequestHandlerTest.java | 0 .../FieldAnalysisRequestHandlerTest.java | 0 .../apache/solr/handler/JsonLoaderTest.java | 0 .../solr/handler/MoreLikeThisHandlerTest.java | 0 .../handler/StandardRequestHandlerTest.java | 0 .../apache/solr/handler/TestCSVLoader.java | 0 .../solr/handler/TestReplicationHandler.java | 0 .../handler/XmlUpdateRequestHandlerTest.java | 0 .../handler/XsltUpdateRequestHandlerTest.java | 0 .../handler/admin/LukeRequestHandlerTest.java | 0 .../handler/admin/SystemInfoHandlerTest.java | 0 .../handler/component/DebugComponentTest.java | 0 .../DistributedSpellCheckComponentTest.java | 0 .../DistributedTermsComponentTest.java | 0 .../DummyCustomParamSpellChecker.java | 0 .../QueryElevationComponentTest.java | 0 .../handler/component/SearchHandlerTest.java | 0 .../component/SpellCheckComponentTest.java | 0 .../handler/component/StatsComponentTest.java | 0 .../component/TermVectorComponentTest.java | 0 .../handler/component/TermsComponentTest.java | 0 .../solr/highlight/DummyHighlighter.java | 0 .../highlight/FastVectorHighlighterTest.java | 0 .../solr/highlight/HighlighterConfigTest.java | 0 .../solr/highlight/HighlighterTest.java | 0 .../apache/solr/request/JSONWriterTest.java | 0 .../apache/solr/request/SimpleFacetsTest.java | 0 .../request/TestBinaryResponseWriter.java | 0 .../org/apache/solr/request/TestFaceting.java | 0 .../apache/solr/request/TestWriterPerf.java | 0 .../solr/response/TestCSVResponseWriter.java | 0 .../TestPHPSerializedResponseWriter.java | 0 .../solr/schema/BadIndexSchemaTest.java | 0 .../org/apache/solr/schema/CopyFieldTest.java | 0 .../solr/schema/CustomSimilarityFactory.java | 0 .../CustomSimilarityProviderFactory.java | 0 .../org/apache/solr/schema/DateFieldTest.java | 0 .../apache/solr/schema/IndexSchemaTest.java | 0 .../schema/MockConfigurableSimilarity.java | 0 .../MockConfigurableSimilarityProvider.java | 0 .../solr/schema/NotRequiredUniqueKeyTest.java | 0 .../apache/solr/schema/NumericFieldsTest.java | 0 .../org/apache/solr/schema/PolyFieldTest.java | 0 .../solr/schema/RequiredFieldsTest.java | 0 .../apache/solr/schema/TestBinaryField.java | 0 .../solr/schema/TestCollationField.java | 0 .../solr/schema/TestPerFieldSimilarity.java | 0 .../org/apache/solr/schema/UUIDFieldTest.java | 0 .../org/apache/solr/search/DocSetPerf.java | 0 .../apache/solr/search/FooQParserPlugin.java | 0 .../apache/solr/search/QueryParsingTest.java | 0 .../apache/solr/search/SpatialFilterTest.java | 0 .../org/apache/solr/search/TestDocSet.java | 0 .../solr/search/TestExtendedDismaxParser.java | 0 .../apache/solr/search/TestFastLRUCache.java | 0 .../org/apache/solr/search/TestFiltering.java | 0 .../apache/solr/search/TestIndexSearcher.java | 0 .../org/apache/solr/search/TestLRUCache.java | 0 .../apache/solr/search/TestQueryTypes.java | 0 .../apache/solr/search/TestQueryUtils.java | 0 .../apache/solr/search/TestRangeQuery.java | 0 .../apache/solr/search/TestSearchPerf.java | 0 .../solr/search/TestSolrQueryParser.java | 0 .../test/org/apache/solr/search/TestSort.java | 0 .../search/function/NvlValueSourceParser.java | 0 .../search/function/SortByFunctionTest.java | 0 .../search/function/TestFunctionQuery.java | 0 .../distance/DistanceFunctionTest.java | 0 .../apache/solr/servlet/CacheHeaderTest.java | 0 .../solr/servlet/CacheHeaderTestBase.java | 0 .../servlet/DirectSolrConnectionTest.java | 0 .../solr/servlet/NoCacheHeaderTest.java | 0 .../solr/servlet/SolrRequestParserTest.java | 0 .../spelling/DirectSolrSpellCheckerTest.java | 0 .../spelling/FileBasedSpellCheckerTest.java | 0 .../spelling/IndexBasedSpellCheckerTest.java | 0 .../solr/spelling/SampleComparator.java | 0 .../solr/spelling/SimpleQueryConverter.java | 0 .../solr/spelling/SpellCheckCollatorTest.java | 0 .../SpellPossibilityIteratorTest.java | 0 .../spelling/SpellingQueryConverterTest.java | 0 .../spelling/suggest/SuggesterFSTTest.java | 0 .../spelling/suggest/SuggesterTSTTest.java | 0 .../solr/spelling/suggest/SuggesterTest.java | 0 .../apache/solr/update/AutoCommitTest.java | 0 .../DirectUpdateHandlerOptimizeTest.java | 0 .../solr/update/DirectUpdateHandlerTest.java | 0 .../solr/update/DocumentBuilderTest.java | 0 .../solr/update/TestIndexingPerformance.java | 0 .../apache/solr/update/UpdateParamsTest.java | 0 .../CustomUpdateRequestProcessorFactory.java | 0 .../SignatureUpdateProcessorFactoryTest.java | 0 .../UpdateRequestProcessorFactoryTest.java | 0 .../test/org/apache/solr/util/BitSetPerf.java | 0 .../apache/solr/util/DateMathParserTest.java | 0 .../org/apache/solr/util/PrimUtilsTest.java | 0 .../apache/solr/util/SolrPluginUtilsTest.java | 0 .../org/apache/solr/util/TestNumberUtils.java | 0 .../test/org/apache/solr/util/TestUtils.java | 0 .../velocity/VelocityResponseWriterTest.java | 0 .../dev-tools/stub-analysis-factory-maker.pl | 0 solr/{src => }/scripts/abc | 0 solr/{src => }/scripts/abo | 0 solr/{src => }/scripts/backup | 0 solr/{src => }/scripts/backupcleaner | 0 solr/{src => }/scripts/commit | 0 solr/{src => }/scripts/optimize | 0 solr/{src => }/scripts/rsyncd-disable | 0 solr/{src => }/scripts/rsyncd-enable | 0 solr/{src => }/scripts/rsyncd-start | 0 solr/{src => }/scripts/rsyncd-stop | 0 solr/{src => }/scripts/scripts-util | 0 solr/{src => }/scripts/snapcleaner | 0 solr/{src => }/scripts/snapinstaller | 0 solr/{src => }/scripts/snappuller | 0 solr/{src => }/scripts/snappuller-disable | 0 solr/{src => }/scripts/snappuller-enable | 0 solr/{src => }/scripts/snapshooter | 0 solr/{src/site => site-src}/README.txt | 0 .../{src/site => site-src}/forrest.properties | 0 .../classes/CatalogManager.properties | 0 .../src/documentation/content/.htaccess | 0 .../documentation/content/xdocs/features.xml | 0 .../content/xdocs/images/favicon.ico | Bin .../content/xdocs/images/lucene_green_150.gif | Bin .../images/lucidworks_reference_guide.png | Bin .../content/xdocs/images/powered_by_solr.ai | 0 .../content/xdocs/images/powered_by_solr.eps | Bin .../content/xdocs/images/powered_by_solr.png | Bin .../content/xdocs/images/powered_by_solr.svg | 0 .../content/xdocs/images/solr-book-image.jpg | Bin .../content/xdocs/images/solr.jpg | Bin .../content/xdocs/images/solr_FC.eps | 0 .../content/xdocs/images/solr_FC.svg | 0 .../src/documentation/content/xdocs/index.xml | 0 .../content/xdocs/issue_tracking.xml | 0 .../content/xdocs/mailing_lists.xml | 0 .../src/documentation/content/xdocs/site.xml | 0 .../src/documentation/content/xdocs/tabs.xml | 0 .../documentation/content/xdocs/tutorial.xml | 0 .../content/xdocs/version_control.xml | 0 .../resources/schema/catalog.xcat | 0 .../src/documentation/skinconf.xml | 0 .../skins/common/css/forrest.css.xslt | 0 .../skins/common/images/README.txt | 0 .../common/images/corner-imports.svg.xslt | 0 .../skins/common/images/dc.svg.xslt | 0 .../skins/common/images/poddoc.svg.xslt | 0 .../skins/common/images/rc.svg.xslt | 0 .../skins/common/images/txtdoc.svg.xslt | 0 .../common/scripts/breadcrumbs-optimized.js | 0 .../skins/common/scripts/breadcrumbs.js | 0 .../skins/common/scripts/fontsize.js | 0 .../skins/common/scripts/getBlank.js | 0 .../skins/common/scripts/getMenu.js | 0 .../skins/common/scripts/menu.js | 0 .../skins/common/scripts/prototype.js | 0 .../documentation/skins/common/skinconf.xsl | 0 .../common/translations/CommonMessages_de.xml | 0 .../translations/CommonMessages_en_US.xml | 0 .../common/translations/CommonMessages_es.xml | 0 .../common/translations/CommonMessages_fr.xml | 0 .../skins/common/xslt/fo/document-to-fo.xsl | 0 .../skins/common/xslt/fo/footerinfo.xsl | 0 .../skins/common/xslt/fo/pdfoutline.xsl | 0 .../skins/common/xslt/html/book-to-menu.xsl | 0 .../common/xslt/html/document-to-html.xsl | 0 .../skins/common/xslt/html/dotdots.xsl | 0 .../skins/common/xslt/html/pathutils.xsl | 0 .../skins/common/xslt/html/renderlogo.xsl | 0 .../skins/common/xslt/html/site-to-xhtml.xsl | 0 .../skins/common/xslt/html/split.xsl | 0 .../common/xslt/html/strip_namespaces.xsl | 0 .../skins/common/xslt/html/tab-to-menu.xsl | 0 .../skins/common/xslt/html/tabutils.xsl | 0 .../skins/common/xslt/svg/document-to-svg.xsl | 0 .../documentation/skins/lucene/css/basic.css | 0 .../documentation/skins/lucene/css/print.css | 0 .../skins/lucene/css/profile.css.xslt | 0 .../documentation/skins/lucene/css/screen.css | 0 .../skins/lucene/images/chapter.gif | Bin .../skins/lucene/images/chapter_open.gif | Bin .../skins/lucene/images/current.gif | Bin .../skins/lucene/images/error.png | Bin .../skins/lucene/images/header_white_line.gif | Bin .../skins/lucene/images/info.png | Bin .../skins/lucene/images/instruction_arrow.png | Bin .../skins/lucene/images/label.gif | Bin .../skins/lucene/images/page.gif | Bin .../skins/lucene/images/pdfdoc.gif | Bin .../skins/lucene/images/printer.gif | Bin .../skins/lucene/images/success.png | Bin .../skins/lucene/images/warning.png | Bin .../skins/lucene/images/xmldoc.gif | Bin .../src/documentation/skins/lucene/note.txt | 0 .../documentation/skins/lucene/skinconf.xsl | 0 .../skins/lucene/xslt/fo/document-to-fo.xsl | 0 .../skins/lucene/xslt/html/book-to-menu.xsl | 0 .../lucene/xslt/html/document-to-html.xsl | 0 .../skins/lucene/xslt/html/site-to-xhtml.xsl | 0 .../skins/lucene/xslt/html/tab-to-menu.xsl | 0 .../solr/client/solrj/ResponseParser.java | 0 .../apache/solr/client/solrj/SolrQuery.java | 0 .../apache/solr/client/solrj/SolrRequest.java | 0 .../solr/client/solrj/SolrResponse.java | 0 .../apache/solr/client/solrj/SolrServer.java | 0 .../client/solrj/SolrServerException.java | 0 .../solrj/StreamingResponseCallback.java | 0 .../solrj/beans/DocumentObjectBinder.java | 0 .../apache/solr/client/solrj/beans/Field.java | 0 .../solrj/impl/BinaryRequestWriter.java | 0 .../solrj/impl/BinaryResponseParser.java | 0 .../client/solrj/impl/CloudSolrServer.java | 0 .../solrj/impl/CommonsHttpSolrServer.java | 0 .../client/solrj/impl/LBHttpSolrServer.java | 0 .../impl/StreamingBinaryResponseParser.java | 0 .../solrj/impl/StreamingUpdateSolrServer.java | 0 .../client/solrj/impl/XMLResponseParser.java | 0 .../solrj/request/AbstractUpdateRequest.java | 0 .../request/ContentStreamUpdateRequest.java | 0 .../solrj/request/CoreAdminRequest.java | 0 .../solrj/request/DirectXmlRequest.java | 0 .../request/DocumentAnalysisRequest.java | 0 .../solrj/request/FieldAnalysisRequest.java | 0 .../request/JavaBinUpdateRequestCodec.java | 0 .../client/solrj/request/LukeRequest.java | 0 .../client/solrj/request/QueryRequest.java | 0 .../client/solrj/request/RequestWriter.java | 0 .../solr/client/solrj/request/SolrPing.java | 0 .../client/solrj/request/UpdateRequest.java | 0 .../solrj/response/AnalysisResponseBase.java | 0 .../solrj/response/CoreAdminResponse.java | 0 .../response/DocumentAnalysisResponse.java | 0 .../client/solrj/response/FacetField.java | 0 .../solrj/response/FieldAnalysisResponse.java | 0 .../client/solrj/response/FieldStatsInfo.java | 0 .../client/solrj/response/LukeResponse.java | 0 .../client/solrj/response/PivotField.java | 0 .../client/solrj/response/QueryResponse.java | 0 .../solrj/response/SolrPingResponse.java | 0 .../solrj/response/SolrResponseBase.java | 0 .../solrj/response/SpellCheckResponse.java | 0 .../client/solrj/response/TermsResponse.java | 0 .../client/solrj/response/UpdateResponse.java | 0 .../solr/client/solrj/util/ClientUtils.java | 0 .../apache/solr/common/ResourceLoader.java | 0 .../org/apache/solr/common/SolrDocument.java | 0 .../apache/solr/common/SolrDocumentList.java | 0 .../org/apache/solr/common/SolrException.java | 0 .../apache/solr/common/SolrInputDocument.java | 0 .../apache/solr/common/SolrInputField.java | 0 .../apache/solr/common/cloud/CloudState.java | 0 .../solr/common/cloud/ConnectionManager.java | 0 .../cloud/DefaultConnectionStrategy.java | 0 .../apache/solr/common/cloud/OnReconnect.java | 0 .../org/apache/solr/common/cloud/Slice.java | 0 .../solr/common/cloud/SolrZkClient.java | 0 .../solr/common/cloud/SolrZooKeeper.java | 0 .../cloud/ZkClientConnectionStrategy.java | 0 .../apache/solr/common/cloud/ZkNodeProps.java | 0 .../solr/common/cloud/ZkStateReader.java | 0 .../solr/common/cloud/ZooKeeperException.java | 0 .../apache/solr/common/luke/FieldFlag.java | 0 .../solr/common/params/AnalysisParams.java | 0 .../common/params/AppendedSolrParams.java | 0 .../solr/common/params/CommonParams.java | 0 .../solr/common/params/CoreAdminParams.java | 0 .../solr/common/params/DefaultSolrParams.java | 0 .../solr/common/params/DisMaxParams.java | 0 .../solr/common/params/EventParams.java | 0 .../solr/common/params/FacetParams.java | 0 .../solr/common/params/GroupParams.java | 0 .../solr/common/params/HighlightParams.java | 0 .../solr/common/params/MapSolrParams.java | 0 .../common/params/ModifiableSolrParams.java | 0 .../common/params/MoreLikeThisParams.java | 0 .../common/params/MultiMapSolrParams.java | 0 .../common/params/QueryElevationParams.java | 0 .../common/params/RequiredSolrParams.java | 0 .../solr/common/params/ShardParams.java | 0 .../apache/solr/common/params/SolrParams.java | 0 .../solr/common/params/SpatialParams.java | 0 .../solr/common/params/SpellingParams.java | 0 .../solr/common/params/StatsParams.java | 0 .../solr/common/params/TermVectorParams.java | 0 .../solr/common/params/TermsParams.java | 0 .../solr/common/params/UpdateParams.java | 0 .../org/apache/solr/common/util/Base64.java | 0 .../solr/common/util/ConcurrentLRUCache.java | 0 .../solr/common/util/ContentStream.java | 0 .../solr/common/util/ContentStreamBase.java | 0 .../org/apache/solr/common/util/DOMUtil.java | 0 .../org/apache/solr/common/util/DateUtil.java | 0 .../solr/common/util/FastInputStream.java | 0 .../solr/common/util/FastOutputStream.java | 0 .../apache/solr/common/util/FastWriter.java | 0 .../apache/solr/common/util/FileUtils.java | 0 .../org/apache/solr/common/util/Hash.java | 0 .../solr/common/util/IteratorChain.java | 0 .../apache/solr/common/util/JavaBinCodec.java | 0 .../apache/solr/common/util/NamedList.java | 0 .../org/apache/solr/common/util/RTimer.java | 0 .../solr/common/util/RegexFileFilter.java | 0 .../solr/common/util/SimpleOrderedMap.java | 0 .../org/apache/solr/common/util/StrUtils.java | 0 .../solr/common/util/SystemIdResolver.java | 0 .../org/apache/solr/common/util/XML.java | 0 .../solr/common/util/XMLErrorLogger.java | 0 solr/solrj/src/test-files/README | 21 + solr/{ => solrj}/src/test-files/books.csv | 0 .../test-files/sampleDateFacetResponse.xml | 0 .../solr/conf/schema-replication1.xml | 49 ++ .../solrj/src/test-files/solr/conf/schema.xml | 657 ++++++++++++++++++ .../solr/conf/solrconfig-slave1.xml | 88 +++ .../test-files/solr/crazy-path-to-schema.xml | 48 ++ .../test-files/solr/shared/conf/schema.xml | 0 .../solr/shared/conf/solrconfig.xml | 0 .../solr/shared/conf/stopwords-en.txt | 0 .../solr/shared/conf/stopwords-fr.txt | 0 .../src/test-files/solr/shared/solr.xml | 0 .../client/solrj/LargeVolumeTestBase.java | 0 .../solrj/MergeIndexesExampleTestBase.java | 0 .../solrj/MultiCoreExampleTestBase.java | 0 .../client/solrj/SolrExampleBinaryTest.java | 0 .../client/solrj/SolrExampleTestBase.java | 0 .../solr/client/solrj/SolrExampleTests.java | 0 .../solr/client/solrj/SolrExceptionTest.java | 0 .../solr/client/solrj/SolrQueryTest.java | 0 .../solr/client/solrj/StartSolrJetty.java | 0 .../solr/client/solrj/TestBatchUpdate.java | 0 .../client/solrj/TestLBHttpSolrServer.java | 0 .../solrj/beans/TestDocumentObjectBinder.java | 0 .../solrj/embedded/JettyWebappTest.java | 0 .../embedded/LargeVolumeBinaryJettyTest.java | 0 .../embedded/LargeVolumeEmbeddedTest.java | 0 .../solrj/embedded/LargeVolumeJettyTest.java | 0 .../embedded/MergeIndexesEmbeddedTest.java | 0 .../solrj/embedded/MultiCoreEmbeddedTest.java | 0 .../embedded/MultiCoreExampleJettyTest.java | 0 .../embedded/SolrExampleEmbeddedTest.java | 0 .../solrj/embedded/SolrExampleJettyTest.java | 0 .../embedded/SolrExampleStreamingTest.java | 0 .../solrj/embedded/TestSolrProperties.java | 0 .../solrj/request/TestUpdateRequestCodec.java | 0 .../response/AnlysisResponseBaseTest.java | 0 .../DocumentAnalysisResponseTest.java | 0 .../response/FieldAnalysisResponseTest.java | 0 .../solrj/response/QueryResponseTest.java | 0 .../solrj/response/TermsResponseTest.java | 0 .../response/TestSpellCheckResponse.java | 0 .../client/solrj/util/ClientUtilsTest.java | 0 .../apache/solr/common/SolrDocumentTest.java | 0 .../params/ModifiableSolrParamsTest.java | 0 .../solr/common/params/SolrParamTest.java | 0 .../solr/common/util/ContentStreamTest.java | 0 .../apache/solr/common/util/DOMUtilTest.java | 0 .../solr/common/util/FileUtilsTest.java | 0 .../solr/common/util/IteratorChainTest.java | 0 .../solr/common/util/NamedListTest.java | 0 .../solr/common/util/TestFastInputStream.java | 0 .../org/apache/solr/common/util/TestHash.java | 0 .../solr/common/util/TestJavaBinCodec.java | 0 .../solr/common/util/TestNamedListCodec.java | 0 .../common/util/TestSystemIdResolver.java | 0 .../solr/common/util/TestXMLEscaping.java | 0 .../solr/BaseDistributedSearchTestCase.java | 0 .../java}/org/apache/solr/JSONTestUtil.java | 0 .../org/apache/solr}/SolrJettyTestBase.java | 0 .../java}/org/apache/solr/SolrTestCaseJ4.java | 0 .../solr/analysis/BaseTokenTestCase.java | 0 .../solr/core/MockDirectoryFactory.java | 0 .../solr/util/AbstractSolrTestCase.java | 0 .../org/apache/solr/util/ExternalPaths.java | 0 .../org/apache/solr/util/TestHarness.java | 0 solr/{src => }/webapp/web/WEB-INF/web.xml | 0 .../{src => }/webapp/web/WEB-INF/weblogic.xml | 0 solr/{src => }/webapp/web/admin/_info.jsp | 0 solr/{src => }/webapp/web/admin/action.jsp | 0 solr/{src => }/webapp/web/admin/analysis.jsp | 0 solr/{src => }/webapp/web/admin/analysis.xsl | 0 .../webapp/web/admin/distributiondump.jsp | 0 solr/{src => }/webapp/web/admin/favicon.ico | Bin solr/{src => }/webapp/web/admin/form.jsp | 0 .../webapp/web/admin/get-properties.jsp | 0 solr/{src => }/webapp/web/admin/header.jsp | 0 solr/{src => }/webapp/web/admin/index.jsp | 0 .../webapp/web/admin/jquery-1.4.3.min.js | 0 solr/{src => }/webapp/web/admin/meta.xsl | 0 solr/{src => }/webapp/web/admin/registry.jsp | 0 solr/{src => }/webapp/web/admin/registry.xsl | 0 .../webapp/web/admin/replication/header.jsp | 0 .../webapp/web/admin/replication/index.jsp | 0 solr/{src => }/webapp/web/admin/schema.jsp | 0 .../{src => }/webapp/web/admin/solr-admin.css | 0 .../{src => }/webapp/web/admin/solr_small.png | Bin solr/{src => }/webapp/web/admin/stats.jsp | 0 solr/{src => }/webapp/web/admin/stats.xsl | 0 solr/{src => }/webapp/web/admin/tabular.xsl | 0 .../{src => }/webapp/web/admin/threaddump.jsp | 0 .../{src => }/webapp/web/admin/threaddump.xsl | 0 solr/{src => }/webapp/web/admin/zookeeper.jsp | 0 solr/{src => }/webapp/web/css/screen.css | 0 solr/{src => }/webapp/web/favicon.ico | Bin solr/{src => }/webapp/web/img/div.gif | Bin solr/{src => }/webapp/web/img/favicon.ico | Bin .../webapp/web/img/ico/arrow-000-small.png | Bin .../webapp/web/img/ico/arrow-circle.png | Bin .../webapp/web/img/ico/arrow-switch.png | Bin solr/{src => }/webapp/web/img/ico/battery.png | Bin .../webapp/web/img/ico/block-small.png | Bin solr/{src => }/webapp/web/img/ico/block.png | Bin .../webapp/web/img/ico/book-open-text.png | Bin solr/{src => }/webapp/web/img/ico/box.png | Bin solr/{src => }/webapp/web/img/ico/bug.png | Bin solr/{src => }/webapp/web/img/ico/chart.png | Bin .../web/img/ico/chevron-small-expand.png | Bin .../webapp/web/img/ico/chevron-small.png | Bin .../webapp/web/img/ico/clipboard-list.png | Bin .../webapp/web/img/ico/clock-select.png | Bin .../webapp/web/img/ico/construction.png | Bin solr/{src => }/webapp/web/img/ico/cross-0.png | Bin solr/{src => }/webapp/web/img/ico/cross-1.png | Bin solr/{src => }/webapp/web/img/ico/cross.png | Bin .../webapp/web/img/ico/dashboard.png | Bin .../{src => }/webapp/web/img/ico/database.png | Bin .../webapp/web/img/ico/databases.png | Bin .../webapp/web/img/ico/disk-black.png | Bin .../webapp/web/img/ico/document-convert.png | Bin .../webapp/web/img/ico/document-import.png | Bin .../webapp/web/img/ico/document-list.png | Bin .../webapp/web/img/ico/document-text.png | Bin .../webapp/web/img/ico/folder-export.png | Bin solr/{src => }/webapp/web/img/ico/folder.png | Bin .../webapp/web/img/ico/funnel-small.png | Bin solr/{src => }/webapp/web/img/ico/funnel.png | Bin solr/{src => }/webapp/web/img/ico/gear.png | Bin solr/{src => }/webapp/web/img/ico/globe.png | Bin .../webapp/web/img/ico/hammer-screwdriver.png | Bin solr/{src => }/webapp/web/img/ico/hand.png | Bin .../webapp/web/img/ico/highlighter-text.png | Bin .../web/img/ico/hourglass--exclamation.png | Bin .../webapp/web/img/ico/hourglass.png | Bin .../web/img/ico/inbox-document-text.png | Bin .../webapp/web/img/ico/information-button.png | Bin .../webapp/web/img/ico/information-small.png | Bin .../webapp/web/img/ico/information.png | Bin solr/{src => }/webapp/web/img/ico/jar.png | Bin .../webapp/web/img/ico/magnifier.png | Bin solr/{src => }/webapp/web/img/ico/mail.png | Bin .../webapp/web/img/ico/network-cloud.png | Bin .../web/img/ico/network-status-away.png | Bin .../web/img/ico/network-status-busy.png | Bin .../web/img/ico/network-status-offline.png | Bin .../webapp/web/img/ico/network-status.png | Bin .../webapp/web/img/ico/node-design.png | Bin .../webapp/web/img/ico/node-master.png | Bin .../webapp/web/img/ico/node-select.png | Bin .../webapp/web/img/ico/node-slave.png | Bin solr/{src => }/webapp/web/img/ico/node.png | Bin .../webapp/web/img/ico/pencil-small.png | Bin .../webapp/web/img/ico/plus-button.png | Bin .../web/img/ico/question-small-white.png | Bin .../webapp/web/img/ico/receipt-invoice.png | Bin solr/{src => }/webapp/web/img/ico/receipt.png | Bin .../webapp/web/img/ico/script-code.png | Bin .../webapp/web/img/ico/server-cast.png | Bin solr/{src => }/webapp/web/img/ico/server.png | Bin solr/{src => }/webapp/web/img/ico/sitemap.png | Bin solr/{src => }/webapp/web/img/ico/slash.png | Bin .../webapp/web/img/ico/status-away.png | Bin .../webapp/web/img/ico/status-busy.png | Bin .../webapp/web/img/ico/status-offline.png | Bin solr/{src => }/webapp/web/img/ico/status.png | Bin .../img/ico/system-monitor--exclamation.png | Bin .../webapp/web/img/ico/system-monitor.png | Bin solr/{src => }/webapp/web/img/ico/table.png | Bin .../{src => }/webapp/web/img/ico/terminal.png | Bin .../webapp/web/img/ico/tick-circle.png | Bin .../{src => }/webapp/web/img/ico/tick-red.png | Bin solr/{src => }/webapp/web/img/ico/tick.png | Bin .../web/img/ico/toggle-small-expand.png | Bin .../webapp/web/img/ico/toggle-small.png | Bin solr/{src => }/webapp/web/img/ico/toolbox.png | Bin .../webapp/web/img/ico/ui-accordion.png | Bin .../webapp/web/img/ico/ui-address-bar.png | Bin .../web/img/ico/ui-check-box-uncheck.png | Bin .../webapp/web/img/ico/ui-check-box.png | Bin .../web/img/ico/ui-radio-button-uncheck.png | Bin .../webapp/web/img/ico/ui-radio-button.png | Bin .../web/img/ico/ui-text-field-select.png | Bin solr/{src => }/webapp/web/img/ico/users.png | Bin solr/{src => }/webapp/web/img/ico/zone.png | Bin .../{src => }/webapp/web/img/loader-light.gif | Bin solr/{src => }/webapp/web/img/loader.gif | Bin solr/{src => }/webapp/web/img/lucene-ico.png | Bin solr/{src => }/webapp/web/img/solr.png | Bin solr/{src => }/webapp/web/img/tree.png | Bin solr/{src => }/webapp/web/index.jsp | 0 solr/{src => }/webapp/web/js/0_console.js | 0 solr/{src => }/webapp/web/js/1_jquery.js | 0 solr/{src => }/webapp/web/js/highlight.js | 0 solr/{src => }/webapp/web/js/jquery.form.js | 0 solr/{src => }/webapp/web/js/jquery.jstree.js | 0 solr/{src => }/webapp/web/js/jquery.sammy.js | 0 .../webapp/web/js/jquery.sparkline.js | 0 .../{src => }/webapp/web/js/jquery.timeago.js | 0 solr/{src => }/webapp/web/js/script.js | 0 solr/{src => }/webapp/web/logging.json | 0 solr/{src => }/webapp/web/tpl/analysis.html | 0 solr/{src => }/webapp/web/tpl/cloud.html | 0 solr/{src => }/webapp/web/tpl/cores.html | 0 solr/{src => }/webapp/web/tpl/dashboard.html | 0 solr/{src => }/webapp/web/tpl/dataimport.html | 0 solr/{src => }/webapp/web/tpl/index.html | 0 solr/{src => }/webapp/web/tpl/plugins.html | 0 solr/{src => }/webapp/web/tpl/query.html | 0 .../{src => }/webapp/web/tpl/replication.html | 0 .../webapp/web/tpl/schema-browser.html | 0 .../web/tpl/schema-browser_dynamic-field.html | 0 .../webapp/web/tpl/schema-browser_type.html | 0 solr/{src => }/webapp/web/tpl/threads.html | 0 solr/{src => }/webapp/web/zookeeper.jsp | 0 1169 files changed, 863 insertions(+) rename dev-tools/maven/solr/{src => core}/pom.xml.template (100%) rename dev-tools/maven/solr/{src => }/solrj/pom.xml.template (100%) rename dev-tools/maven/solr/{src => }/test-framework/pom.xml.template (100%) rename dev-tools/maven/solr/{src => }/webapp/pom.xml.template (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/CharFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ChineseFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ClassicFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ElisionFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/KStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/LatvianStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/LengthFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/NGramFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/PositionFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ReversedWildcardFilter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ShingleFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/SolrAnalyzer.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/StandardFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/StopFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/SynonymFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/TokenFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/TokenizerChain.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/TokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/TrimFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java (100%) rename solr/{src/webapp/src => core/src/java}/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java (100%) rename solr/{src/webapp/src => core/src/java}/org/apache/solr/client/solrj/embedded/JettySolrRunner.java (100%) rename solr/{ => core}/src/java/org/apache/solr/cloud/CloudDescriptor.java (100%) rename solr/{ => core}/src/java/org/apache/solr/cloud/SolrZkServer.java (100%) rename solr/{ => core}/src/java/org/apache/solr/cloud/ZkController.java (100%) rename solr/{ => core}/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/AbstractSolrEventListener.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/CloseHook.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/CodecProviderFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/Config.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/CoreContainer.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/CoreDescriptor.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/DirectoryFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/IndexReaderFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/JmxMonitoredMap.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/MMapDirectoryFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/PluginInfo.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/QuerySenderListener.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/RAMDirectoryFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/RefCntRamDirectory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/RequestHandlers.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/RunExecutableListener.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/SchemaCodecProvider.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/SolrConfig.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/SolrCore.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/SolrDeletionPolicy.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/SolrEventListener.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/SolrInfoMBean.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/SolrResourceLoader.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/SolrXMLSerializer.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/StandardDirectoryFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/core/StandardIndexReaderFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/CSVRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/ContentStreamLoader.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/DumpRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/JsonLoader.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/MoreLikeThisHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/PingRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/ReplicationHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/RequestHandlerBase.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/RequestHandlerUtils.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/SnapPuller.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/SnapShooter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/StandardRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/XMLLoader.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/XsltXMLLoader.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/admin/AdminHandlers.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/DebugComponent.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/FacetComponent.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/FieldFacetStats.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/HighlightComponent.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/HttpShardHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/PivotFacetHelper.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/QueryComponent.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/ResponseBuilder.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/SearchComponent.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/SearchHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/ShardDoc.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/ShardHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/ShardRequest.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/ShardResponse.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/SpellCheckComponent.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/StatsComponent.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/StatsValues.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/TermVectorComponent.java (100%) rename solr/{ => core}/src/java/org/apache/solr/handler/component/TermsComponent.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/DefaultEncoder.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/GapFragmenter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/HighlightingPluginBase.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/HtmlEncoder.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/HtmlFormatter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/RegexFragmenter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/SingleFragListBuilder.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/SolrEncoder.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/SolrFormatter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/SolrFragListBuilder.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/SolrFragmenter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java (100%) rename solr/{ => core}/src/java/org/apache/solr/highlight/SolrHighlighter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/request/LocalSolrQueryRequest.java (100%) rename solr/{ => core}/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java (100%) rename solr/{ => core}/src/java/org/apache/solr/request/ServletSolrParams.java (100%) rename solr/{ => core}/src/java/org/apache/solr/request/SimpleFacets.java (100%) rename solr/{ => core}/src/java/org/apache/solr/request/SolrQueryRequest.java (100%) rename solr/{ => core}/src/java/org/apache/solr/request/SolrQueryRequestBase.java (100%) rename solr/{ => core}/src/java/org/apache/solr/request/SolrRequestHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/request/SolrRequestInfo.java (100%) rename solr/{ => core}/src/java/org/apache/solr/request/UnInvertedField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/BinaryResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/CSVResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/JSONResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/PHPResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/PageTool.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/PythonResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/QueryResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/RawResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/ResultContext.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/RubyResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/SolrParamResourceLoader.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/SolrQueryResponse.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/TextResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/VelocityResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/XMLResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/XMLWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/XSLTResponseWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/DocTransformer.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/DocTransformers.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/ScoreAugmenter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/TransformContext.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/TransformerFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/TransformerWithContext.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/BCDIntField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/BCDLongField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/BCDStrField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/BinaryField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/BoolField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/ByteField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/CollationField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/CoordinateFieldType.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/CopyField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/DateField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/DoubleField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/ExternalFileField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/FieldProperties.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/FieldType.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/FloatField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/GeoHashField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/IndexSchema.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/IntField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/LatLonType.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/LongField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/PointType.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/RandomSortField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/SchemaAware.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/SchemaField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/ShortField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/SimilarityFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/SimilarityProviderFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/SortableDoubleField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/SortableFloatField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/SortableIntField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/SortableLongField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/SpatialQueryable.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/StrField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/StrFieldSource.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/TextField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/TrieDateField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/TrieDoubleField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/TrieField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/TrieFloatField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/TrieIntField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/TrieLongField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/schema/UUIDField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/BitDocSet.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/BoostQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/CacheConfig.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/CacheRegenerator.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/DelegatingCollector.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/DisMaxQParser.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/DisMaxQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/DocIterator.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/DocList.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/DocListAndSet.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/DocSet.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/DocSetHitCollector.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/DocSlice.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/ExtendedQuery.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/ExtendedQueryBase.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/FastLRUCache.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/FieldQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/FunctionQParser.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/FunctionQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/Grouping.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/HashDocSet.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/JoinQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/LRUCache.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/LuceneQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/LuceneQueryOptimizer.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/NestedQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/PostFilter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/PrefixQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/QParser.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/QParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/QueryParsing.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/QueryResultKey.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/QueryUtils.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/RawQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/ReturnFields.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SolrCache.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SolrCacheBase.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SolrConstantScoreQuery.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SolrFieldCacheMBean.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SolrFilter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SolrIndexSearcher.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SolrQueryParser.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SolrSimilarityProvider.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SolrSortField.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SortSpec.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SortedIntDocSet.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/Sorting.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SpatialFilterQParser.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/SpatialOptions.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/TermQParserPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/ValueSourceParser.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/WrappedQuery.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/function/FileFloatSource.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/function/distance/GeohashFunction.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/function/distance/HaversineFunction.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java (100%) rename solr/{ => core}/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java (100%) rename solr/{src/webapp/src => core/src/java}/org/apache/solr/servlet/DirectSolrConnection.java (100%) rename solr/{src/webapp/src => core/src/java}/org/apache/solr/servlet/LogLevelSelection.java (100%) rename solr/{src/webapp/src => core/src/java}/org/apache/solr/servlet/SolrDispatchFilter.java (100%) rename solr/{src/webapp/src => core/src/java}/org/apache/solr/servlet/SolrRequestParsers.java (100%) rename solr/{src/webapp/src => core/src/java}/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java (100%) rename solr/{src/webapp/src => core/src/java}/org/apache/solr/servlet/cache/Method.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/PossibilityIterator.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/QueryConverter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/RankedSpellPossibility.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/SolrSpellChecker.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/SpellCheckCollation.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/SpellCheckCollator.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/SpellCheckCorrection.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/SpellingOptions.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/SpellingQueryConverter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/SpellingResult.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/suggest/LookupFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/suggest/Suggester.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/suggest/fst/FSTLookupFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/spelling/suggest/tst/TSTLookupFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/AddUpdateCommand.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/CommitTracker.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/CommitUpdateCommand.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/DefaultIndexWriterProvider.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/DeleteUpdateCommand.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/DirectUpdateHandler2.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/DocumentBuilder.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/IndexWriterProvider.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/MergeIndexesCommand.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/RollbackUpdateCommand.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/SolrIndexConfig.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/SolrIndexWriter.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/UpdateCommand.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/UpdateHandler.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/processor/Lookup3Signature.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/processor/MD5Signature.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/processor/Signature.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/processor/TextProfileSignature.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java (100%) rename solr/{ => core}/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/BCDUtils.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/BoundedTreeSet.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/DateMathParser.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/LongPriorityQueue.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/NumberUtils.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/PrimUtils.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/RefCounted.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/SentinelIntSet.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/SimplePostTool.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/SolrPluginUtils.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/SuggestMissingFactories.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/VersionedFile.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/doc-files/min-should-match.html (100%) rename solr/{ => core}/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/plugin/MapPluginLoader.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/plugin/PluginInfoInitialized.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/plugin/SolrCoreAware.java (100%) rename solr/{ => core}/src/java/org/apache/solr/util/xslt/TransformerProvider.java (100%) rename solr/{ => core}/src/test-files/README (100%) rename solr/{ => core}/src/test-files/lib-dirs/README (100%) rename solr/{ => core}/src/test-files/lib-dirs/a/a1/empty-file-a1.txt (100%) rename solr/{ => core}/src/test-files/lib-dirs/a/a2/empty-file-a2.txt (100%) rename solr/{ => core}/src/test-files/lib-dirs/b/b1/empty-file-b1.txt (100%) rename solr/{ => core}/src/test-files/lib-dirs/b/b2/empty-file-b2.txt (100%) rename solr/{ => core}/src/test-files/lib-dirs/c/c1/empty-file-c1.txt (100%) rename solr/{ => core}/src/test-files/lib-dirs/c/c2/empty-file-c2.txt (100%) rename solr/{ => core}/src/test-files/lib-dirs/d/d1/empty-file-d1.txt (100%) rename solr/{ => core}/src/test-files/lib-dirs/d/d2/empty-file-d2.txt (100%) rename solr/{ => core}/src/test-files/mailing_lists.pdf (100%) rename solr/{ => core}/src/test-files/solr/conf/bad-schema-dup-dynamicField.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/bad-schema-dup-field.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/bad-schema-dup-fieldType.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/bad-schema-nontext-analyzer.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/bad_solrconfig.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/compoundDictionary.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/da_UTF8.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/da_compoundDictionary.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/elevate.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/frenchArticles.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/hyphenation.dtd (100%) rename solr/{ => core}/src/test-files/solr/conf/keep-1.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/keep-2.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/mapping-ISOLatin1Accent.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/old_synonyms.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/protwords.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-binaryfield.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-collate.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-copyfield-test.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-luceneMatchVersion.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-minimal.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-not-required-unique-key.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-numeric.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-replication1.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-replication2.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-required-fields.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-reversed.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-spellchecker.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-stop-keep.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema-trie.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema11.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema12.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/schema_codec.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-SOLR-749.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-altdirectory.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-collate.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-delpolicy1.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-delpolicy2.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-elevate.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-enableplugin.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-functionquery.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-highlight.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-legacy.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-master.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-master1.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-master2.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-mergepolicy.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-nocache.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-propinject.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-querysender-noquery.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-querysender.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-repeater.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-reqHandler.incl (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-slave.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-slave1.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-solcoreproperties.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-spellchecker.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-termindex.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-transformers.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig-xinclude.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig_codec.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/solrconfig_perf.xml (100%) rename solr/{ => core}/src/test-files/solr/conf/stemdict.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/stop-1.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/stop-2.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/stopwithbom.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/stopwords.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/stopwordsWrongEncoding.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/synonyms.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/velocity/VM_global_library.vm (100%) rename solr/{ => core}/src/test-files/solr/conf/wdftypes.txt (100%) rename solr/{ => core}/src/test-files/solr/conf/xslt/dummy-using-include.xsl (100%) rename solr/{ => core}/src/test-files/solr/conf/xslt/dummy.xsl (100%) rename solr/{ => core}/src/test-files/solr/conf/xslt/xsl-update-handler-test.xsl (100%) rename solr/{ => core}/src/test-files/solr/crazy-path-to-config.xml (100%) rename solr/{ => core}/src/test-files/solr/crazy-path-to-schema.xml (100%) rename solr/{ => core}/src/test-files/solr/lib/README (100%) rename solr/{ => core}/src/test-files/solr/lib/classes/empty-file-main-lib.txt (100%) rename solr/{ => core}/src/test-files/solr/solr.xml (100%) rename solr/{ => core}/src/test-files/spellings.txt (100%) rename solr/{ => core}/src/test/org/apache/solr/BasicFunctionalityTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/ConvertedLegacyTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/DisMaxRequestHandlerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/EchoParamsTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/MinimalSchemaTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/OutputWriterTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/SampleTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/SolrInfoMBeanTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/TestDistributedSearch.java (100%) rename solr/{ => core}/src/test/org/apache/solr/TestGroupingSearch.java (100%) rename solr/{ => core}/src/test/org/apache/solr/TestJoin.java (100%) rename solr/{ => core}/src/test/org/apache/solr/TestPluginEnable.java (100%) rename solr/{ => core}/src/test/org/apache/solr/TestSolrCoreProperties.java (100%) rename solr/{ => core}/src/test/org/apache/solr/TestTrie.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/LengthFilterTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestArabicFilters.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestCJKTokenizerFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestCapitalizationFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestChineseTokenizerFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestGalicianStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestHindiFilters.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestIndonesianStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestItalianLightStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestKStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestLatvianStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestNGramFilters.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestPatternReplaceFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestPersianNormalizationFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestPorterStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestPortugueseLightStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestPortugueseMinimalStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestPortugueseStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestReverseStringFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestRussianFilters.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestRussianLightStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestShingleFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestSpanishLightStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestStandardFactories.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestStopFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestSwedishLightStemFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestSynonymMap.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestTrimFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestTurkishLowerCaseFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestUAX29URLEmailTokenizerFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java (100%) rename solr/{ => core}/src/test/org/apache/solr/cloud/AbstractZkTestCase.java (100%) rename solr/{ => core}/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/cloud/BasicZkTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/cloud/ZkControllerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/cloud/ZkNodePropsTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/cloud/ZkSolrClientTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/cloud/ZkTestServer.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/AlternateDirectoryTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/DummyValueSourceParser.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/FakeDeletionPolicy.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/IndexReaderFactoryTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/MockCodecProviderFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/MockEventListener.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/RequestHandlersTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/ResourceLoaderTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/SOLR749Test.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/SolrCoreTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestBadConfig.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestCodecProviderSupport.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestConfig.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestJmxIntegration.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestJmxMonitoredMap.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestLegacyMergeSchedulerPolicyConfig.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestMergePolicyConfig.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestPropInject.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestPropInjectDefaults.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestQuerySenderListener.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestSolrXMLSerializer.java (100%) rename solr/{ => core}/src/test/org/apache/solr/core/TestXIncludeConfig.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/JsonLoaderTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/TestCSVLoader.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/TestReplicationHandler.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/component/DebugComponentTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/component/SearchHandlerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/component/StatsComponentTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/handler/component/TermsComponentTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/highlight/DummyHighlighter.java (100%) rename solr/{ => core}/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/highlight/HighlighterConfigTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/highlight/HighlighterTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/request/JSONWriterTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/request/SimpleFacetsTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/request/TestBinaryResponseWriter.java (100%) rename solr/{ => core}/src/test/org/apache/solr/request/TestFaceting.java (100%) rename solr/{ => core}/src/test/org/apache/solr/request/TestWriterPerf.java (100%) rename solr/{ => core}/src/test/org/apache/solr/response/TestCSVResponseWriter.java (100%) rename solr/{ => core}/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/BadIndexSchemaTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/CopyFieldTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/CustomSimilarityFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/DateFieldTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/IndexSchemaTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/NumericFieldsTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/PolyFieldTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/RequiredFieldsTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/TestBinaryField.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/TestCollationField.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java (100%) rename solr/{ => core}/src/test/org/apache/solr/schema/UUIDFieldTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/DocSetPerf.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/FooQParserPlugin.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/QueryParsingTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/SpatialFilterTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestDocSet.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestExtendedDismaxParser.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestFastLRUCache.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestFiltering.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestIndexSearcher.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestLRUCache.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestQueryTypes.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestQueryUtils.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestRangeQuery.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestSearchPerf.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestSolrQueryParser.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/TestSort.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/function/NvlValueSourceParser.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/function/SortByFunctionTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/function/TestFunctionQuery.java (100%) rename solr/{ => core}/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/servlet/CacheHeaderTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java (100%) rename solr/{ => core}/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/servlet/SolrRequestParserTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/spelling/SampleComparator.java (100%) rename solr/{ => core}/src/test/org/apache/solr/spelling/SimpleQueryConverter.java (100%) rename solr/{ => core}/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/spelling/suggest/SuggesterFSTTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/spelling/suggest/SuggesterTSTTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/update/AutoCommitTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/update/DocumentBuilderTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/update/TestIndexingPerformance.java (100%) rename solr/{ => core}/src/test/org/apache/solr/update/UpdateParamsTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java (100%) rename solr/{ => core}/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/util/BitSetPerf.java (100%) rename solr/{ => core}/src/test/org/apache/solr/util/DateMathParserTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/util/PrimUtilsTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/util/SolrPluginUtilsTest.java (100%) rename solr/{ => core}/src/test/org/apache/solr/util/TestNumberUtils.java (100%) rename solr/{ => core}/src/test/org/apache/solr/util/TestUtils.java (100%) rename solr/{ => core}/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java (100%) rename solr/{src => }/dev-tools/stub-analysis-factory-maker.pl (100%) rename solr/{src => }/scripts/abc (100%) rename solr/{src => }/scripts/abo (100%) rename solr/{src => }/scripts/backup (100%) rename solr/{src => }/scripts/backupcleaner (100%) rename solr/{src => }/scripts/commit (100%) rename solr/{src => }/scripts/optimize (100%) rename solr/{src => }/scripts/rsyncd-disable (100%) rename solr/{src => }/scripts/rsyncd-enable (100%) rename solr/{src => }/scripts/rsyncd-start (100%) rename solr/{src => }/scripts/rsyncd-stop (100%) rename solr/{src => }/scripts/scripts-util (100%) rename solr/{src => }/scripts/snapcleaner (100%) rename solr/{src => }/scripts/snapinstaller (100%) rename solr/{src => }/scripts/snappuller (100%) rename solr/{src => }/scripts/snappuller-disable (100%) rename solr/{src => }/scripts/snappuller-enable (100%) rename solr/{src => }/scripts/snapshooter (100%) rename solr/{src/site => site-src}/README.txt (100%) rename solr/{src/site => site-src}/forrest.properties (100%) rename solr/{src/site => site-src}/src/documentation/classes/CatalogManager.properties (100%) rename solr/{src/site => site-src}/src/documentation/content/.htaccess (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/features.xml (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/images/favicon.ico (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/images/lucene_green_150.gif (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/images/lucidworks_reference_guide.png (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/images/powered_by_solr.ai (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/images/powered_by_solr.eps (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/images/powered_by_solr.png (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/images/powered_by_solr.svg (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/images/solr-book-image.jpg (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/images/solr.jpg (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/images/solr_FC.eps (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/images/solr_FC.svg (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/index.xml (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/issue_tracking.xml (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/mailing_lists.xml (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/site.xml (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/tabs.xml (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/tutorial.xml (100%) rename solr/{src/site => site-src}/src/documentation/content/xdocs/version_control.xml (100%) rename solr/{src/site => site-src}/src/documentation/resources/schema/catalog.xcat (100%) rename solr/{src/site => site-src}/src/documentation/skinconf.xml (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/css/forrest.css.xslt (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/images/README.txt (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/images/corner-imports.svg.xslt (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/images/dc.svg.xslt (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/images/poddoc.svg.xslt (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/images/rc.svg.xslt (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/images/txtdoc.svg.xslt (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/scripts/breadcrumbs-optimized.js (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/scripts/breadcrumbs.js (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/scripts/fontsize.js (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/scripts/getBlank.js (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/scripts/getMenu.js (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/scripts/menu.js (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/scripts/prototype.js (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/skinconf.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/translations/CommonMessages_de.xml (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/translations/CommonMessages_en_US.xml (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/translations/CommonMessages_es.xml (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/translations/CommonMessages_fr.xml (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/fo/document-to-fo.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/fo/footerinfo.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/fo/pdfoutline.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/html/book-to-menu.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/html/document-to-html.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/html/dotdots.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/html/pathutils.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/html/renderlogo.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/html/site-to-xhtml.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/html/split.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/html/strip_namespaces.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/html/tab-to-menu.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/html/tabutils.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/common/xslt/svg/document-to-svg.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/css/basic.css (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/css/print.css (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/css/profile.css.xslt (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/css/screen.css (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/chapter.gif (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/chapter_open.gif (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/current.gif (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/error.png (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/header_white_line.gif (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/info.png (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/instruction_arrow.png (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/label.gif (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/page.gif (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/pdfdoc.gif (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/printer.gif (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/success.png (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/warning.png (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/images/xmldoc.gif (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/note.txt (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/skinconf.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/xslt/fo/document-to-fo.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/xslt/html/book-to-menu.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/xslt/html/document-to-html.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl (100%) rename solr/{src/site => site-src}/src/documentation/skins/lucene/xslt/html/tab-to-menu.xsl (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/ResponseParser.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/SolrQuery.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/SolrRequest.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/SolrResponse.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/SolrServer.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/SolrServerException.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/StreamingResponseCallback.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/beans/Field.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/impl/BinaryResponseParser.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/impl/CloudSolrServer.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/impl/XMLResponseParser.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/CoreAdminRequest.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/DirectXmlRequest.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/LukeRequest.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/QueryRequest.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/RequestWriter.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/SolrPing.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/request/UpdateRequest.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/AnalysisResponseBase.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/CoreAdminResponse.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/FacetField.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/FieldStatsInfo.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/LukeResponse.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/PivotField.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/QueryResponse.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/SolrPingResponse.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/SolrResponseBase.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/SpellCheckResponse.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/TermsResponse.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/response/UpdateResponse.java (100%) rename solr/{src/solrj => solrj/src/java}/org/apache/solr/client/solrj/util/ClientUtils.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/ResourceLoader.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/SolrDocument.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/SolrDocumentList.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/SolrException.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/SolrInputDocument.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/SolrInputField.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/cloud/CloudState.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/cloud/ConnectionManager.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/cloud/DefaultConnectionStrategy.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/cloud/OnReconnect.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/cloud/Slice.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/cloud/SolrZkClient.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/cloud/SolrZooKeeper.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/cloud/ZkNodeProps.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/cloud/ZkStateReader.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/cloud/ZooKeeperException.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/luke/FieldFlag.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/AnalysisParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/AppendedSolrParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/CommonParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/CoreAdminParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/DefaultSolrParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/DisMaxParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/EventParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/FacetParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/GroupParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/HighlightParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/MapSolrParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/ModifiableSolrParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/MoreLikeThisParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/MultiMapSolrParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/QueryElevationParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/RequiredSolrParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/ShardParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/SolrParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/SpatialParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/SpellingParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/StatsParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/TermVectorParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/TermsParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/params/UpdateParams.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/Base64.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/ConcurrentLRUCache.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/ContentStream.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/ContentStreamBase.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/DOMUtil.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/DateUtil.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/FastInputStream.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/FastOutputStream.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/FastWriter.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/FileUtils.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/Hash.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/IteratorChain.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/JavaBinCodec.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/NamedList.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/RTimer.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/RegexFileFilter.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/SimpleOrderedMap.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/StrUtils.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/SystemIdResolver.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/XML.java (100%) rename solr/{src/common => solrj/src/java}/org/apache/solr/common/util/XMLErrorLogger.java (100%) create mode 100644 solr/solrj/src/test-files/README rename solr/{ => solrj}/src/test-files/books.csv (100%) rename solr/{ => solrj}/src/test-files/sampleDateFacetResponse.xml (100%) create mode 100644 solr/solrj/src/test-files/solr/conf/schema-replication1.xml create mode 100644 solr/solrj/src/test-files/solr/conf/schema.xml create mode 100644 solr/solrj/src/test-files/solr/conf/solrconfig-slave1.xml create mode 100644 solr/solrj/src/test-files/solr/crazy-path-to-schema.xml rename solr/{ => solrj}/src/test-files/solr/shared/conf/schema.xml (100%) rename solr/{ => solrj}/src/test-files/solr/shared/conf/solrconfig.xml (100%) rename solr/{ => solrj}/src/test-files/solr/shared/conf/stopwords-en.txt (100%) rename solr/{ => solrj}/src/test-files/solr/shared/conf/stopwords-fr.txt (100%) rename solr/{ => solrj}/src/test-files/solr/shared/solr.xml (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/SolrQueryTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/StartSolrJetty.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/SolrDocumentTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/params/SolrParamTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/util/ContentStreamTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/util/DOMUtilTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/util/FileUtilsTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/util/IteratorChainTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/util/NamedListTest.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/util/TestFastInputStream.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/util/TestHash.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/util/TestJavaBinCodec.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/util/TestNamedListCodec.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/util/TestSystemIdResolver.java (100%) rename solr/{ => solrj}/src/test/org/apache/solr/common/util/TestXMLEscaping.java (100%) rename solr/{src/test-framework => test-framework/src/java}/org/apache/solr/BaseDistributedSearchTestCase.java (100%) rename solr/{src/test-framework => test-framework/src/java}/org/apache/solr/JSONTestUtil.java (100%) rename solr/{src/test/org/apache/solr/client/solrj => test-framework/src/java/org/apache/solr}/SolrJettyTestBase.java (100%) rename solr/{src/test-framework => test-framework/src/java}/org/apache/solr/SolrTestCaseJ4.java (100%) rename solr/{src/test-framework => test-framework/src/java}/org/apache/solr/analysis/BaseTokenTestCase.java (100%) rename solr/{src/test-framework => test-framework/src/java}/org/apache/solr/core/MockDirectoryFactory.java (100%) rename solr/{src/test-framework => test-framework/src/java}/org/apache/solr/util/AbstractSolrTestCase.java (100%) rename solr/{src/test => test-framework/src/java}/org/apache/solr/util/ExternalPaths.java (100%) rename solr/{src/test-framework => test-framework/src/java}/org/apache/solr/util/TestHarness.java (100%) rename solr/{src => }/webapp/web/WEB-INF/web.xml (100%) rename solr/{src => }/webapp/web/WEB-INF/weblogic.xml (100%) rename solr/{src => }/webapp/web/admin/_info.jsp (100%) rename solr/{src => }/webapp/web/admin/action.jsp (100%) rename solr/{src => }/webapp/web/admin/analysis.jsp (100%) rename solr/{src => }/webapp/web/admin/analysis.xsl (100%) rename solr/{src => }/webapp/web/admin/distributiondump.jsp (100%) rename solr/{src => }/webapp/web/admin/favicon.ico (100%) rename solr/{src => }/webapp/web/admin/form.jsp (100%) rename solr/{src => }/webapp/web/admin/get-properties.jsp (100%) rename solr/{src => }/webapp/web/admin/header.jsp (100%) rename solr/{src => }/webapp/web/admin/index.jsp (100%) rename solr/{src => }/webapp/web/admin/jquery-1.4.3.min.js (100%) rename solr/{src => }/webapp/web/admin/meta.xsl (100%) rename solr/{src => }/webapp/web/admin/registry.jsp (100%) rename solr/{src => }/webapp/web/admin/registry.xsl (100%) rename solr/{src => }/webapp/web/admin/replication/header.jsp (100%) rename solr/{src => }/webapp/web/admin/replication/index.jsp (100%) rename solr/{src => }/webapp/web/admin/schema.jsp (100%) rename solr/{src => }/webapp/web/admin/solr-admin.css (100%) rename solr/{src => }/webapp/web/admin/solr_small.png (100%) rename solr/{src => }/webapp/web/admin/stats.jsp (100%) rename solr/{src => }/webapp/web/admin/stats.xsl (100%) rename solr/{src => }/webapp/web/admin/tabular.xsl (100%) rename solr/{src => }/webapp/web/admin/threaddump.jsp (100%) rename solr/{src => }/webapp/web/admin/threaddump.xsl (100%) rename solr/{src => }/webapp/web/admin/zookeeper.jsp (100%) rename solr/{src => }/webapp/web/css/screen.css (100%) rename solr/{src => }/webapp/web/favicon.ico (100%) rename solr/{src => }/webapp/web/img/div.gif (100%) rename solr/{src => }/webapp/web/img/favicon.ico (100%) rename solr/{src => }/webapp/web/img/ico/arrow-000-small.png (100%) rename solr/{src => }/webapp/web/img/ico/arrow-circle.png (100%) rename solr/{src => }/webapp/web/img/ico/arrow-switch.png (100%) rename solr/{src => }/webapp/web/img/ico/battery.png (100%) rename solr/{src => }/webapp/web/img/ico/block-small.png (100%) rename solr/{src => }/webapp/web/img/ico/block.png (100%) rename solr/{src => }/webapp/web/img/ico/book-open-text.png (100%) rename solr/{src => }/webapp/web/img/ico/box.png (100%) rename solr/{src => }/webapp/web/img/ico/bug.png (100%) rename solr/{src => }/webapp/web/img/ico/chart.png (100%) rename solr/{src => }/webapp/web/img/ico/chevron-small-expand.png (100%) rename solr/{src => }/webapp/web/img/ico/chevron-small.png (100%) rename solr/{src => }/webapp/web/img/ico/clipboard-list.png (100%) rename solr/{src => }/webapp/web/img/ico/clock-select.png (100%) rename solr/{src => }/webapp/web/img/ico/construction.png (100%) rename solr/{src => }/webapp/web/img/ico/cross-0.png (100%) rename solr/{src => }/webapp/web/img/ico/cross-1.png (100%) rename solr/{src => }/webapp/web/img/ico/cross.png (100%) rename solr/{src => }/webapp/web/img/ico/dashboard.png (100%) rename solr/{src => }/webapp/web/img/ico/database.png (100%) rename solr/{src => }/webapp/web/img/ico/databases.png (100%) rename solr/{src => }/webapp/web/img/ico/disk-black.png (100%) rename solr/{src => }/webapp/web/img/ico/document-convert.png (100%) rename solr/{src => }/webapp/web/img/ico/document-import.png (100%) rename solr/{src => }/webapp/web/img/ico/document-list.png (100%) rename solr/{src => }/webapp/web/img/ico/document-text.png (100%) rename solr/{src => }/webapp/web/img/ico/folder-export.png (100%) rename solr/{src => }/webapp/web/img/ico/folder.png (100%) rename solr/{src => }/webapp/web/img/ico/funnel-small.png (100%) rename solr/{src => }/webapp/web/img/ico/funnel.png (100%) rename solr/{src => }/webapp/web/img/ico/gear.png (100%) rename solr/{src => }/webapp/web/img/ico/globe.png (100%) rename solr/{src => }/webapp/web/img/ico/hammer-screwdriver.png (100%) rename solr/{src => }/webapp/web/img/ico/hand.png (100%) rename solr/{src => }/webapp/web/img/ico/highlighter-text.png (100%) rename solr/{src => }/webapp/web/img/ico/hourglass--exclamation.png (100%) rename solr/{src => }/webapp/web/img/ico/hourglass.png (100%) rename solr/{src => }/webapp/web/img/ico/inbox-document-text.png (100%) rename solr/{src => }/webapp/web/img/ico/information-button.png (100%) rename solr/{src => }/webapp/web/img/ico/information-small.png (100%) rename solr/{src => }/webapp/web/img/ico/information.png (100%) rename solr/{src => }/webapp/web/img/ico/jar.png (100%) rename solr/{src => }/webapp/web/img/ico/magnifier.png (100%) rename solr/{src => }/webapp/web/img/ico/mail.png (100%) rename solr/{src => }/webapp/web/img/ico/network-cloud.png (100%) rename solr/{src => }/webapp/web/img/ico/network-status-away.png (100%) rename solr/{src => }/webapp/web/img/ico/network-status-busy.png (100%) rename solr/{src => }/webapp/web/img/ico/network-status-offline.png (100%) rename solr/{src => }/webapp/web/img/ico/network-status.png (100%) rename solr/{src => }/webapp/web/img/ico/node-design.png (100%) rename solr/{src => }/webapp/web/img/ico/node-master.png (100%) rename solr/{src => }/webapp/web/img/ico/node-select.png (100%) rename solr/{src => }/webapp/web/img/ico/node-slave.png (100%) rename solr/{src => }/webapp/web/img/ico/node.png (100%) rename solr/{src => }/webapp/web/img/ico/pencil-small.png (100%) rename solr/{src => }/webapp/web/img/ico/plus-button.png (100%) rename solr/{src => }/webapp/web/img/ico/question-small-white.png (100%) rename solr/{src => }/webapp/web/img/ico/receipt-invoice.png (100%) rename solr/{src => }/webapp/web/img/ico/receipt.png (100%) rename solr/{src => }/webapp/web/img/ico/script-code.png (100%) rename solr/{src => }/webapp/web/img/ico/server-cast.png (100%) rename solr/{src => }/webapp/web/img/ico/server.png (100%) rename solr/{src => }/webapp/web/img/ico/sitemap.png (100%) rename solr/{src => }/webapp/web/img/ico/slash.png (100%) rename solr/{src => }/webapp/web/img/ico/status-away.png (100%) rename solr/{src => }/webapp/web/img/ico/status-busy.png (100%) rename solr/{src => }/webapp/web/img/ico/status-offline.png (100%) rename solr/{src => }/webapp/web/img/ico/status.png (100%) rename solr/{src => }/webapp/web/img/ico/system-monitor--exclamation.png (100%) rename solr/{src => }/webapp/web/img/ico/system-monitor.png (100%) rename solr/{src => }/webapp/web/img/ico/table.png (100%) rename solr/{src => }/webapp/web/img/ico/terminal.png (100%) rename solr/{src => }/webapp/web/img/ico/tick-circle.png (100%) rename solr/{src => }/webapp/web/img/ico/tick-red.png (100%) rename solr/{src => }/webapp/web/img/ico/tick.png (100%) rename solr/{src => }/webapp/web/img/ico/toggle-small-expand.png (100%) rename solr/{src => }/webapp/web/img/ico/toggle-small.png (100%) rename solr/{src => }/webapp/web/img/ico/toolbox.png (100%) rename solr/{src => }/webapp/web/img/ico/ui-accordion.png (100%) rename solr/{src => }/webapp/web/img/ico/ui-address-bar.png (100%) rename solr/{src => }/webapp/web/img/ico/ui-check-box-uncheck.png (100%) rename solr/{src => }/webapp/web/img/ico/ui-check-box.png (100%) rename solr/{src => }/webapp/web/img/ico/ui-radio-button-uncheck.png (100%) rename solr/{src => }/webapp/web/img/ico/ui-radio-button.png (100%) rename solr/{src => }/webapp/web/img/ico/ui-text-field-select.png (100%) rename solr/{src => }/webapp/web/img/ico/users.png (100%) rename solr/{src => }/webapp/web/img/ico/zone.png (100%) rename solr/{src => }/webapp/web/img/loader-light.gif (100%) rename solr/{src => }/webapp/web/img/loader.gif (100%) rename solr/{src => }/webapp/web/img/lucene-ico.png (100%) rename solr/{src => }/webapp/web/img/solr.png (100%) rename solr/{src => }/webapp/web/img/tree.png (100%) rename solr/{src => }/webapp/web/index.jsp (100%) rename solr/{src => }/webapp/web/js/0_console.js (100%) rename solr/{src => }/webapp/web/js/1_jquery.js (100%) rename solr/{src => }/webapp/web/js/highlight.js (100%) rename solr/{src => }/webapp/web/js/jquery.form.js (100%) rename solr/{src => }/webapp/web/js/jquery.jstree.js (100%) rename solr/{src => }/webapp/web/js/jquery.sammy.js (100%) rename solr/{src => }/webapp/web/js/jquery.sparkline.js (100%) rename solr/{src => }/webapp/web/js/jquery.timeago.js (100%) rename solr/{src => }/webapp/web/js/script.js (100%) rename solr/{src => }/webapp/web/logging.json (100%) rename solr/{src => }/webapp/web/tpl/analysis.html (100%) rename solr/{src => }/webapp/web/tpl/cloud.html (100%) rename solr/{src => }/webapp/web/tpl/cores.html (100%) rename solr/{src => }/webapp/web/tpl/dashboard.html (100%) rename solr/{src => }/webapp/web/tpl/dataimport.html (100%) rename solr/{src => }/webapp/web/tpl/index.html (100%) rename solr/{src => }/webapp/web/tpl/plugins.html (100%) rename solr/{src => }/webapp/web/tpl/query.html (100%) rename solr/{src => }/webapp/web/tpl/replication.html (100%) rename solr/{src => }/webapp/web/tpl/schema-browser.html (100%) rename solr/{src => }/webapp/web/tpl/schema-browser_dynamic-field.html (100%) rename solr/{src => }/webapp/web/tpl/schema-browser_type.html (100%) rename solr/{src => }/webapp/web/tpl/threads.html (100%) rename solr/{src => }/webapp/web/zookeeper.jsp (100%) diff --git a/dev-tools/maven/solr/src/pom.xml.template b/dev-tools/maven/solr/core/pom.xml.template similarity index 100% rename from dev-tools/maven/solr/src/pom.xml.template rename to dev-tools/maven/solr/core/pom.xml.template diff --git a/dev-tools/maven/solr/src/solrj/pom.xml.template b/dev-tools/maven/solr/solrj/pom.xml.template similarity index 100% rename from dev-tools/maven/solr/src/solrj/pom.xml.template rename to dev-tools/maven/solr/solrj/pom.xml.template diff --git a/dev-tools/maven/solr/src/test-framework/pom.xml.template b/dev-tools/maven/solr/test-framework/pom.xml.template similarity index 100% rename from dev-tools/maven/solr/src/test-framework/pom.xml.template rename to dev-tools/maven/solr/test-framework/pom.xml.template diff --git a/dev-tools/maven/solr/src/webapp/pom.xml.template b/dev-tools/maven/solr/webapp/pom.xml.template similarity index 100% rename from dev-tools/maven/solr/src/webapp/pom.xml.template rename to dev-tools/maven/solr/webapp/pom.xml.template diff --git a/solr/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ASCIIFoldingFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ArabicLetterTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/BaseCharFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/BaseTokenFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java b/solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java rename to solr/core/src/java/org/apache/solr/analysis/BaseTokenStreamFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/BaseTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/CJKTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/CapitalizationFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/CharFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/CharFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/CharFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/CharFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ChineseFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ChineseFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ChineseTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ClassicFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ClassicFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/DelimitedPayloadTokenFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/DictionaryCompoundWordTokenFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/DoubleMetaphoneFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/EdgeNGramFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/EdgeNGramTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ElisionFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/HTMLStripCharFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/HyphenatedWordsFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/HyphenationCompoundWordTokenFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/KStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/KStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/KStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/KStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/KeepWordFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/KeywordMarkerFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/KeywordTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/LatvianStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/LatvianStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/LatvianStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/LatvianStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/LengthFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/LengthFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/LengthFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/LetterTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/LimitTokenCountFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/LowerCaseFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/LowerCaseTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/MappingCharFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/NGramFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/NGramFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/NGramFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/NGramTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/NumericPayloadTokenFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/PositionFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/PositionFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilter.java b/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilter.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ReversedWildcardFilter.java rename to solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilter.java diff --git a/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/RussianLetterTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ShingleFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ShingleFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ShingleFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java b/solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/SolrAnalyzer.java rename to solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java diff --git a/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/StandardFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/StandardFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/StandardFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/StandardFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/StandardTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/StemmerOverrideFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/StopFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/StopFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/StopFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/SynonymFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/SynonymFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/TokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/TokenFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/TokenFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/TokenFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/TokenOffsetPayloadTokenFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/TokenizerChain.java b/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/TokenizerChain.java rename to solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java diff --git a/solr/src/java/org/apache/solr/analysis/TokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/TokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/TokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/TokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/TrieTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/TrimFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/TrimFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/TrimFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/TypeAsPayloadTokenFilterFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/UAX29URLEmailTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/WhitespaceTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java b/solr/core/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java rename to solr/core/src/java/org/apache/solr/analysis/WikipediaTokenizerFactory.java diff --git a/solr/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java rename to solr/core/src/java/org/apache/solr/analysis/WordDelimiterFilterFactory.java diff --git a/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java similarity index 100% rename from solr/src/webapp/src/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java rename to solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java diff --git a/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java similarity index 100% rename from solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java rename to solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java diff --git a/solr/src/java/org/apache/solr/cloud/CloudDescriptor.java b/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java similarity index 100% rename from solr/src/java/org/apache/solr/cloud/CloudDescriptor.java rename to solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java diff --git a/solr/src/java/org/apache/solr/cloud/SolrZkServer.java b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java similarity index 100% rename from solr/src/java/org/apache/solr/cloud/SolrZkServer.java rename to solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java diff --git a/solr/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java similarity index 100% rename from solr/src/java/org/apache/solr/cloud/ZkController.java rename to solr/core/src/java/org/apache/solr/cloud/ZkController.java diff --git a/solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java b/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java similarity index 100% rename from solr/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java rename to solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java diff --git a/solr/src/java/org/apache/solr/core/AbstractSolrEventListener.java b/solr/core/src/java/org/apache/solr/core/AbstractSolrEventListener.java similarity index 100% rename from solr/src/java/org/apache/solr/core/AbstractSolrEventListener.java rename to solr/core/src/java/org/apache/solr/core/AbstractSolrEventListener.java diff --git a/solr/src/java/org/apache/solr/core/CloseHook.java b/solr/core/src/java/org/apache/solr/core/CloseHook.java similarity index 100% rename from solr/src/java/org/apache/solr/core/CloseHook.java rename to solr/core/src/java/org/apache/solr/core/CloseHook.java diff --git a/solr/src/java/org/apache/solr/core/CodecProviderFactory.java b/solr/core/src/java/org/apache/solr/core/CodecProviderFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/core/CodecProviderFactory.java rename to solr/core/src/java/org/apache/solr/core/CodecProviderFactory.java diff --git a/solr/src/java/org/apache/solr/core/Config.java b/solr/core/src/java/org/apache/solr/core/Config.java similarity index 100% rename from solr/src/java/org/apache/solr/core/Config.java rename to solr/core/src/java/org/apache/solr/core/Config.java diff --git a/solr/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java similarity index 100% rename from solr/src/java/org/apache/solr/core/CoreContainer.java rename to solr/core/src/java/org/apache/solr/core/CoreContainer.java diff --git a/solr/src/java/org/apache/solr/core/CoreDescriptor.java b/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java similarity index 100% rename from solr/src/java/org/apache/solr/core/CoreDescriptor.java rename to solr/core/src/java/org/apache/solr/core/CoreDescriptor.java diff --git a/solr/src/java/org/apache/solr/core/DirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/core/DirectoryFactory.java rename to solr/core/src/java/org/apache/solr/core/DirectoryFactory.java diff --git a/solr/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java b/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java similarity index 100% rename from solr/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java rename to solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java diff --git a/solr/src/java/org/apache/solr/core/IndexReaderFactory.java b/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/core/IndexReaderFactory.java rename to solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java diff --git a/solr/src/java/org/apache/solr/core/JmxMonitoredMap.java b/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java similarity index 100% rename from solr/src/java/org/apache/solr/core/JmxMonitoredMap.java rename to solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java diff --git a/solr/src/java/org/apache/solr/core/MMapDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/core/MMapDirectoryFactory.java rename to solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java diff --git a/solr/src/java/org/apache/solr/core/PluginInfo.java b/solr/core/src/java/org/apache/solr/core/PluginInfo.java similarity index 100% rename from solr/src/java/org/apache/solr/core/PluginInfo.java rename to solr/core/src/java/org/apache/solr/core/PluginInfo.java diff --git a/solr/src/java/org/apache/solr/core/QuerySenderListener.java b/solr/core/src/java/org/apache/solr/core/QuerySenderListener.java similarity index 100% rename from solr/src/java/org/apache/solr/core/QuerySenderListener.java rename to solr/core/src/java/org/apache/solr/core/QuerySenderListener.java diff --git a/solr/src/java/org/apache/solr/core/RAMDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/RAMDirectoryFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/core/RAMDirectoryFactory.java rename to solr/core/src/java/org/apache/solr/core/RAMDirectoryFactory.java diff --git a/solr/src/java/org/apache/solr/core/RefCntRamDirectory.java b/solr/core/src/java/org/apache/solr/core/RefCntRamDirectory.java similarity index 100% rename from solr/src/java/org/apache/solr/core/RefCntRamDirectory.java rename to solr/core/src/java/org/apache/solr/core/RefCntRamDirectory.java diff --git a/solr/src/java/org/apache/solr/core/RequestHandlers.java b/solr/core/src/java/org/apache/solr/core/RequestHandlers.java similarity index 100% rename from solr/src/java/org/apache/solr/core/RequestHandlers.java rename to solr/core/src/java/org/apache/solr/core/RequestHandlers.java diff --git a/solr/src/java/org/apache/solr/core/RunExecutableListener.java b/solr/core/src/java/org/apache/solr/core/RunExecutableListener.java similarity index 100% rename from solr/src/java/org/apache/solr/core/RunExecutableListener.java rename to solr/core/src/java/org/apache/solr/core/RunExecutableListener.java diff --git a/solr/src/java/org/apache/solr/core/SchemaCodecProvider.java b/solr/core/src/java/org/apache/solr/core/SchemaCodecProvider.java similarity index 100% rename from solr/src/java/org/apache/solr/core/SchemaCodecProvider.java rename to solr/core/src/java/org/apache/solr/core/SchemaCodecProvider.java diff --git a/solr/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java rename to solr/core/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java diff --git a/solr/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java similarity index 100% rename from solr/src/java/org/apache/solr/core/SolrConfig.java rename to solr/core/src/java/org/apache/solr/core/SolrConfig.java diff --git a/solr/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java similarity index 100% rename from solr/src/java/org/apache/solr/core/SolrCore.java rename to solr/core/src/java/org/apache/solr/core/SolrCore.java diff --git a/solr/src/java/org/apache/solr/core/SolrDeletionPolicy.java b/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java similarity index 100% rename from solr/src/java/org/apache/solr/core/SolrDeletionPolicy.java rename to solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java diff --git a/solr/src/java/org/apache/solr/core/SolrEventListener.java b/solr/core/src/java/org/apache/solr/core/SolrEventListener.java similarity index 100% rename from solr/src/java/org/apache/solr/core/SolrEventListener.java rename to solr/core/src/java/org/apache/solr/core/SolrEventListener.java diff --git a/solr/src/java/org/apache/solr/core/SolrInfoMBean.java b/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java similarity index 100% rename from solr/src/java/org/apache/solr/core/SolrInfoMBean.java rename to solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java diff --git a/solr/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java similarity index 100% rename from solr/src/java/org/apache/solr/core/SolrResourceLoader.java rename to solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java diff --git a/solr/src/java/org/apache/solr/core/SolrXMLSerializer.java b/solr/core/src/java/org/apache/solr/core/SolrXMLSerializer.java similarity index 100% rename from solr/src/java/org/apache/solr/core/SolrXMLSerializer.java rename to solr/core/src/java/org/apache/solr/core/SolrXMLSerializer.java diff --git a/solr/src/java/org/apache/solr/core/StandardDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/StandardDirectoryFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/core/StandardDirectoryFactory.java rename to solr/core/src/java/org/apache/solr/core/StandardDirectoryFactory.java diff --git a/solr/src/java/org/apache/solr/core/StandardIndexReaderFactory.java b/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/core/StandardIndexReaderFactory.java rename to solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java diff --git a/solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java rename to solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java diff --git a/solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/CSVRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/CSVRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java rename to solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java diff --git a/solr/src/java/org/apache/solr/handler/ContentStreamLoader.java b/solr/core/src/java/org/apache/solr/handler/ContentStreamLoader.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/ContentStreamLoader.java rename to solr/core/src/java/org/apache/solr/handler/ContentStreamLoader.java diff --git a/solr/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/DumpRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/DumpRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/JsonLoader.java b/solr/core/src/java/org/apache/solr/handler/JsonLoader.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/JsonLoader.java rename to solr/core/src/java/org/apache/solr/handler/JsonLoader.java diff --git a/solr/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java rename to solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java diff --git a/solr/src/java/org/apache/solr/handler/PingRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/PingRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/ReplicationHandler.java rename to solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java diff --git a/solr/src/java/org/apache/solr/handler/RequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/RequestHandlerBase.java rename to solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java diff --git a/solr/src/java/org/apache/solr/handler/RequestHandlerUtils.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/RequestHandlerUtils.java rename to solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java diff --git a/solr/src/java/org/apache/solr/handler/SnapPuller.java b/solr/core/src/java/org/apache/solr/handler/SnapPuller.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/SnapPuller.java rename to solr/core/src/java/org/apache/solr/handler/SnapPuller.java diff --git a/solr/src/java/org/apache/solr/handler/SnapShooter.java b/solr/core/src/java/org/apache/solr/handler/SnapShooter.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/SnapShooter.java rename to solr/core/src/java/org/apache/solr/handler/SnapShooter.java diff --git a/solr/src/java/org/apache/solr/handler/StandardRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/StandardRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/XMLLoader.java b/solr/core/src/java/org/apache/solr/handler/XMLLoader.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/XMLLoader.java rename to solr/core/src/java/org/apache/solr/handler/XMLLoader.java diff --git a/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/XsltXMLLoader.java b/solr/core/src/java/org/apache/solr/handler/XsltXMLLoader.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/XsltXMLLoader.java rename to solr/core/src/java/org/apache/solr/handler/XsltXMLLoader.java diff --git a/solr/src/java/org/apache/solr/handler/admin/AdminHandlers.java b/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/admin/AdminHandlers.java rename to solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java diff --git a/solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java rename to solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java diff --git a/solr/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java rename to solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java diff --git a/solr/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java rename to solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java diff --git a/solr/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java rename to solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java diff --git a/solr/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java rename to solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java diff --git a/solr/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java rename to solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java diff --git a/solr/src/java/org/apache/solr/handler/component/DebugComponent.java b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/DebugComponent.java rename to solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java diff --git a/solr/src/java/org/apache/solr/handler/component/FacetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/FacetComponent.java rename to solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java diff --git a/solr/src/java/org/apache/solr/handler/component/FieldFacetStats.java b/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/FieldFacetStats.java rename to solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java diff --git a/solr/src/java/org/apache/solr/handler/component/HighlightComponent.java b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/HighlightComponent.java rename to solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java diff --git a/solr/src/java/org/apache/solr/handler/component/HttpShardHandler.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/HttpShardHandler.java rename to solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java diff --git a/solr/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java rename to solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java diff --git a/solr/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java b/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java rename to solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java diff --git a/solr/src/java/org/apache/solr/handler/component/PivotFacetHelper.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/PivotFacetHelper.java rename to solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java diff --git a/solr/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/QueryComponent.java rename to solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java diff --git a/solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java rename to solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java diff --git a/solr/src/java/org/apache/solr/handler/component/ResponseBuilder.java b/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/ResponseBuilder.java rename to solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java diff --git a/solr/src/java/org/apache/solr/handler/component/SearchComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/SearchComponent.java rename to solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java diff --git a/solr/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/SearchHandler.java rename to solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java diff --git a/solr/src/java/org/apache/solr/handler/component/ShardDoc.java b/solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/ShardDoc.java rename to solr/core/src/java/org/apache/solr/handler/component/ShardDoc.java diff --git a/solr/src/java/org/apache/solr/handler/component/ShardHandler.java b/solr/core/src/java/org/apache/solr/handler/component/ShardHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/ShardHandler.java rename to solr/core/src/java/org/apache/solr/handler/component/ShardHandler.java diff --git a/solr/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java rename to solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java diff --git a/solr/src/java/org/apache/solr/handler/component/ShardRequest.java b/solr/core/src/java/org/apache/solr/handler/component/ShardRequest.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/ShardRequest.java rename to solr/core/src/java/org/apache/solr/handler/component/ShardRequest.java diff --git a/solr/src/java/org/apache/solr/handler/component/ShardResponse.java b/solr/core/src/java/org/apache/solr/handler/component/ShardResponse.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/ShardResponse.java rename to solr/core/src/java/org/apache/solr/handler/component/ShardResponse.java diff --git a/solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java rename to solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java diff --git a/solr/src/java/org/apache/solr/handler/component/StatsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/StatsComponent.java rename to solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java diff --git a/solr/src/java/org/apache/solr/handler/component/StatsValues.java b/solr/core/src/java/org/apache/solr/handler/component/StatsValues.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/StatsValues.java rename to solr/core/src/java/org/apache/solr/handler/component/StatsValues.java diff --git a/solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java rename to solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java diff --git a/solr/src/java/org/apache/solr/handler/component/TermsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java similarity index 100% rename from solr/src/java/org/apache/solr/handler/component/TermsComponent.java rename to solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java diff --git a/solr/src/java/org/apache/solr/highlight/DefaultEncoder.java b/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/DefaultEncoder.java rename to solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java diff --git a/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java rename to solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java diff --git a/solr/src/java/org/apache/solr/highlight/GapFragmenter.java b/solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/GapFragmenter.java rename to solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java diff --git a/solr/src/java/org/apache/solr/highlight/HighlightingPluginBase.java b/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/HighlightingPluginBase.java rename to solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java diff --git a/solr/src/java/org/apache/solr/highlight/HtmlEncoder.java b/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/HtmlEncoder.java rename to solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java diff --git a/solr/src/java/org/apache/solr/highlight/HtmlFormatter.java b/solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/HtmlFormatter.java rename to solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java diff --git a/solr/src/java/org/apache/solr/highlight/RegexFragmenter.java b/solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/RegexFragmenter.java rename to solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java diff --git a/solr/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java b/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java rename to solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java diff --git a/solr/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java rename to solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java diff --git a/solr/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java rename to solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java diff --git a/solr/src/java/org/apache/solr/highlight/SingleFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/SingleFragListBuilder.java rename to solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java diff --git a/solr/src/java/org/apache/solr/highlight/SolrEncoder.java b/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/SolrEncoder.java rename to solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java diff --git a/solr/src/java/org/apache/solr/highlight/SolrFormatter.java b/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/SolrFormatter.java rename to solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java diff --git a/solr/src/java/org/apache/solr/highlight/SolrFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/SolrFragListBuilder.java rename to solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java diff --git a/solr/src/java/org/apache/solr/highlight/SolrFragmenter.java b/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/SolrFragmenter.java rename to solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java diff --git a/solr/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java rename to solr/core/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java diff --git a/solr/src/java/org/apache/solr/highlight/SolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java similarity index 100% rename from solr/src/java/org/apache/solr/highlight/SolrHighlighter.java rename to solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java diff --git a/solr/src/java/org/apache/solr/request/LocalSolrQueryRequest.java b/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java similarity index 100% rename from solr/src/java/org/apache/solr/request/LocalSolrQueryRequest.java rename to solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java diff --git a/solr/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java b/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java similarity index 100% rename from solr/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java rename to solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java diff --git a/solr/src/java/org/apache/solr/request/ServletSolrParams.java b/solr/core/src/java/org/apache/solr/request/ServletSolrParams.java similarity index 100% rename from solr/src/java/org/apache/solr/request/ServletSolrParams.java rename to solr/core/src/java/org/apache/solr/request/ServletSolrParams.java diff --git a/solr/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java similarity index 100% rename from solr/src/java/org/apache/solr/request/SimpleFacets.java rename to solr/core/src/java/org/apache/solr/request/SimpleFacets.java diff --git a/solr/src/java/org/apache/solr/request/SolrQueryRequest.java b/solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java similarity index 100% rename from solr/src/java/org/apache/solr/request/SolrQueryRequest.java rename to solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java diff --git a/solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java b/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java similarity index 100% rename from solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java rename to solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java diff --git a/solr/src/java/org/apache/solr/request/SolrRequestHandler.java b/solr/core/src/java/org/apache/solr/request/SolrRequestHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/request/SolrRequestHandler.java rename to solr/core/src/java/org/apache/solr/request/SolrRequestHandler.java diff --git a/solr/src/java/org/apache/solr/request/SolrRequestInfo.java b/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java similarity index 100% rename from solr/src/java/org/apache/solr/request/SolrRequestInfo.java rename to solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java diff --git a/solr/src/java/org/apache/solr/request/UnInvertedField.java b/solr/core/src/java/org/apache/solr/request/UnInvertedField.java similarity index 100% rename from solr/src/java/org/apache/solr/request/UnInvertedField.java rename to solr/core/src/java/org/apache/solr/request/UnInvertedField.java diff --git a/solr/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java b/solr/core/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/BinaryResponseWriter.java b/solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/BinaryResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/BinaryResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/CSVResponseWriter.java b/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/CSVResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/JSONResponseWriter.java b/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/JSONResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/PHPResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/PHPResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/PageTool.java b/solr/core/src/java/org/apache/solr/response/PageTool.java similarity index 100% rename from solr/src/java/org/apache/solr/response/PageTool.java rename to solr/core/src/java/org/apache/solr/response/PageTool.java diff --git a/solr/src/java/org/apache/solr/response/PythonResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/PythonResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/QueryResponseWriter.java b/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/QueryResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/RawResponseWriter.java b/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/RawResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/RawResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/ResultContext.java b/solr/core/src/java/org/apache/solr/response/ResultContext.java similarity index 100% rename from solr/src/java/org/apache/solr/response/ResultContext.java rename to solr/core/src/java/org/apache/solr/response/ResultContext.java diff --git a/solr/src/java/org/apache/solr/response/RubyResponseWriter.java b/solr/core/src/java/org/apache/solr/response/RubyResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/RubyResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/RubyResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java b/solr/core/src/java/org/apache/solr/response/SolrParamResourceLoader.java similarity index 100% rename from solr/src/java/org/apache/solr/response/SolrParamResourceLoader.java rename to solr/core/src/java/org/apache/solr/response/SolrParamResourceLoader.java diff --git a/solr/src/java/org/apache/solr/response/SolrQueryResponse.java b/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java similarity index 100% rename from solr/src/java/org/apache/solr/response/SolrQueryResponse.java rename to solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java diff --git a/solr/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java b/solr/core/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java similarity index 100% rename from solr/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java rename to solr/core/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java diff --git a/solr/src/java/org/apache/solr/response/TextResponseWriter.java b/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/TextResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/TextResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/VelocityResponseWriter.java b/solr/core/src/java/org/apache/solr/response/VelocityResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/VelocityResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/VelocityResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/XMLResponseWriter.java b/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/XMLResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/XMLWriter.java b/solr/core/src/java/org/apache/solr/response/XMLWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/XMLWriter.java rename to solr/core/src/java/org/apache/solr/response/XMLWriter.java diff --git a/solr/src/java/org/apache/solr/response/XSLTResponseWriter.java b/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/XSLTResponseWriter.java rename to solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java diff --git a/solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java b/solr/core/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java rename to solr/core/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java diff --git a/solr/src/java/org/apache/solr/response/transform/DocTransformer.java b/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/DocTransformer.java rename to solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java diff --git a/solr/src/java/org/apache/solr/response/transform/DocTransformers.java b/solr/core/src/java/org/apache/solr/response/transform/DocTransformers.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/DocTransformers.java rename to solr/core/src/java/org/apache/solr/response/transform/DocTransformers.java diff --git a/solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java b/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java rename to solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java diff --git a/solr/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java b/solr/core/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java rename to solr/core/src/java/org/apache/solr/response/transform/RenameFieldsTransformer.java diff --git a/solr/src/java/org/apache/solr/response/transform/ScoreAugmenter.java b/solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/ScoreAugmenter.java rename to solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java diff --git a/solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java b/solr/core/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java rename to solr/core/src/java/org/apache/solr/response/transform/ShardAugmenterFactory.java diff --git a/solr/src/java/org/apache/solr/response/transform/TransformContext.java b/solr/core/src/java/org/apache/solr/response/transform/TransformContext.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/TransformContext.java rename to solr/core/src/java/org/apache/solr/response/transform/TransformContext.java diff --git a/solr/src/java/org/apache/solr/response/transform/TransformerFactory.java b/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/TransformerFactory.java rename to solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java diff --git a/solr/src/java/org/apache/solr/response/transform/TransformerWithContext.java b/solr/core/src/java/org/apache/solr/response/transform/TransformerWithContext.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/TransformerWithContext.java rename to solr/core/src/java/org/apache/solr/response/transform/TransformerWithContext.java diff --git a/solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java b/solr/core/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java rename to solr/core/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java diff --git a/solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java b/solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java similarity index 100% rename from solr/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java rename to solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java diff --git a/solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java b/solr/core/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java rename to solr/core/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java diff --git a/solr/src/java/org/apache/solr/schema/BCDIntField.java b/solr/core/src/java/org/apache/solr/schema/BCDIntField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/BCDIntField.java rename to solr/core/src/java/org/apache/solr/schema/BCDIntField.java diff --git a/solr/src/java/org/apache/solr/schema/BCDLongField.java b/solr/core/src/java/org/apache/solr/schema/BCDLongField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/BCDLongField.java rename to solr/core/src/java/org/apache/solr/schema/BCDLongField.java diff --git a/solr/src/java/org/apache/solr/schema/BCDStrField.java b/solr/core/src/java/org/apache/solr/schema/BCDStrField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/BCDStrField.java rename to solr/core/src/java/org/apache/solr/schema/BCDStrField.java diff --git a/solr/src/java/org/apache/solr/schema/BinaryField.java b/solr/core/src/java/org/apache/solr/schema/BinaryField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/BinaryField.java rename to solr/core/src/java/org/apache/solr/schema/BinaryField.java diff --git a/solr/src/java/org/apache/solr/schema/BoolField.java b/solr/core/src/java/org/apache/solr/schema/BoolField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/BoolField.java rename to solr/core/src/java/org/apache/solr/schema/BoolField.java diff --git a/solr/src/java/org/apache/solr/schema/ByteField.java b/solr/core/src/java/org/apache/solr/schema/ByteField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/ByteField.java rename to solr/core/src/java/org/apache/solr/schema/ByteField.java diff --git a/solr/src/java/org/apache/solr/schema/CollationField.java b/solr/core/src/java/org/apache/solr/schema/CollationField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/CollationField.java rename to solr/core/src/java/org/apache/solr/schema/CollationField.java diff --git a/solr/src/java/org/apache/solr/schema/CoordinateFieldType.java b/solr/core/src/java/org/apache/solr/schema/CoordinateFieldType.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/CoordinateFieldType.java rename to solr/core/src/java/org/apache/solr/schema/CoordinateFieldType.java diff --git a/solr/src/java/org/apache/solr/schema/CopyField.java b/solr/core/src/java/org/apache/solr/schema/CopyField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/CopyField.java rename to solr/core/src/java/org/apache/solr/schema/CopyField.java diff --git a/solr/src/java/org/apache/solr/schema/DateField.java b/solr/core/src/java/org/apache/solr/schema/DateField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/DateField.java rename to solr/core/src/java/org/apache/solr/schema/DateField.java diff --git a/solr/src/java/org/apache/solr/schema/DoubleField.java b/solr/core/src/java/org/apache/solr/schema/DoubleField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/DoubleField.java rename to solr/core/src/java/org/apache/solr/schema/DoubleField.java diff --git a/solr/src/java/org/apache/solr/schema/ExternalFileField.java b/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/ExternalFileField.java rename to solr/core/src/java/org/apache/solr/schema/ExternalFileField.java diff --git a/solr/src/java/org/apache/solr/schema/FieldProperties.java b/solr/core/src/java/org/apache/solr/schema/FieldProperties.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/FieldProperties.java rename to solr/core/src/java/org/apache/solr/schema/FieldProperties.java diff --git a/solr/src/java/org/apache/solr/schema/FieldType.java b/solr/core/src/java/org/apache/solr/schema/FieldType.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/FieldType.java rename to solr/core/src/java/org/apache/solr/schema/FieldType.java diff --git a/solr/src/java/org/apache/solr/schema/FloatField.java b/solr/core/src/java/org/apache/solr/schema/FloatField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/FloatField.java rename to solr/core/src/java/org/apache/solr/schema/FloatField.java diff --git a/solr/src/java/org/apache/solr/schema/GeoHashField.java b/solr/core/src/java/org/apache/solr/schema/GeoHashField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/GeoHashField.java rename to solr/core/src/java/org/apache/solr/schema/GeoHashField.java diff --git a/solr/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/IndexSchema.java rename to solr/core/src/java/org/apache/solr/schema/IndexSchema.java diff --git a/solr/src/java/org/apache/solr/schema/IntField.java b/solr/core/src/java/org/apache/solr/schema/IntField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/IntField.java rename to solr/core/src/java/org/apache/solr/schema/IntField.java diff --git a/solr/src/java/org/apache/solr/schema/LatLonType.java b/solr/core/src/java/org/apache/solr/schema/LatLonType.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/LatLonType.java rename to solr/core/src/java/org/apache/solr/schema/LatLonType.java diff --git a/solr/src/java/org/apache/solr/schema/LongField.java b/solr/core/src/java/org/apache/solr/schema/LongField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/LongField.java rename to solr/core/src/java/org/apache/solr/schema/LongField.java diff --git a/solr/src/java/org/apache/solr/schema/PointType.java b/solr/core/src/java/org/apache/solr/schema/PointType.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/PointType.java rename to solr/core/src/java/org/apache/solr/schema/PointType.java diff --git a/solr/src/java/org/apache/solr/schema/RandomSortField.java b/solr/core/src/java/org/apache/solr/schema/RandomSortField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/RandomSortField.java rename to solr/core/src/java/org/apache/solr/schema/RandomSortField.java diff --git a/solr/src/java/org/apache/solr/schema/SchemaAware.java b/solr/core/src/java/org/apache/solr/schema/SchemaAware.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/SchemaAware.java rename to solr/core/src/java/org/apache/solr/schema/SchemaAware.java diff --git a/solr/src/java/org/apache/solr/schema/SchemaField.java b/solr/core/src/java/org/apache/solr/schema/SchemaField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/SchemaField.java rename to solr/core/src/java/org/apache/solr/schema/SchemaField.java diff --git a/solr/src/java/org/apache/solr/schema/ShortField.java b/solr/core/src/java/org/apache/solr/schema/ShortField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/ShortField.java rename to solr/core/src/java/org/apache/solr/schema/ShortField.java diff --git a/solr/src/java/org/apache/solr/schema/SimilarityFactory.java b/solr/core/src/java/org/apache/solr/schema/SimilarityFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/SimilarityFactory.java rename to solr/core/src/java/org/apache/solr/schema/SimilarityFactory.java diff --git a/solr/src/java/org/apache/solr/schema/SimilarityProviderFactory.java b/solr/core/src/java/org/apache/solr/schema/SimilarityProviderFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/SimilarityProviderFactory.java rename to solr/core/src/java/org/apache/solr/schema/SimilarityProviderFactory.java diff --git a/solr/src/java/org/apache/solr/schema/SortableDoubleField.java b/solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/SortableDoubleField.java rename to solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java diff --git a/solr/src/java/org/apache/solr/schema/SortableFloatField.java b/solr/core/src/java/org/apache/solr/schema/SortableFloatField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/SortableFloatField.java rename to solr/core/src/java/org/apache/solr/schema/SortableFloatField.java diff --git a/solr/src/java/org/apache/solr/schema/SortableIntField.java b/solr/core/src/java/org/apache/solr/schema/SortableIntField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/SortableIntField.java rename to solr/core/src/java/org/apache/solr/schema/SortableIntField.java diff --git a/solr/src/java/org/apache/solr/schema/SortableLongField.java b/solr/core/src/java/org/apache/solr/schema/SortableLongField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/SortableLongField.java rename to solr/core/src/java/org/apache/solr/schema/SortableLongField.java diff --git a/solr/src/java/org/apache/solr/schema/SpatialQueryable.java b/solr/core/src/java/org/apache/solr/schema/SpatialQueryable.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/SpatialQueryable.java rename to solr/core/src/java/org/apache/solr/schema/SpatialQueryable.java diff --git a/solr/src/java/org/apache/solr/schema/StrField.java b/solr/core/src/java/org/apache/solr/schema/StrField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/StrField.java rename to solr/core/src/java/org/apache/solr/schema/StrField.java diff --git a/solr/src/java/org/apache/solr/schema/StrFieldSource.java b/solr/core/src/java/org/apache/solr/schema/StrFieldSource.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/StrFieldSource.java rename to solr/core/src/java/org/apache/solr/schema/StrFieldSource.java diff --git a/solr/src/java/org/apache/solr/schema/TextField.java b/solr/core/src/java/org/apache/solr/schema/TextField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/TextField.java rename to solr/core/src/java/org/apache/solr/schema/TextField.java diff --git a/solr/src/java/org/apache/solr/schema/TrieDateField.java b/solr/core/src/java/org/apache/solr/schema/TrieDateField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/TrieDateField.java rename to solr/core/src/java/org/apache/solr/schema/TrieDateField.java diff --git a/solr/src/java/org/apache/solr/schema/TrieDoubleField.java b/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/TrieDoubleField.java rename to solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java diff --git a/solr/src/java/org/apache/solr/schema/TrieField.java b/solr/core/src/java/org/apache/solr/schema/TrieField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/TrieField.java rename to solr/core/src/java/org/apache/solr/schema/TrieField.java diff --git a/solr/src/java/org/apache/solr/schema/TrieFloatField.java b/solr/core/src/java/org/apache/solr/schema/TrieFloatField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/TrieFloatField.java rename to solr/core/src/java/org/apache/solr/schema/TrieFloatField.java diff --git a/solr/src/java/org/apache/solr/schema/TrieIntField.java b/solr/core/src/java/org/apache/solr/schema/TrieIntField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/TrieIntField.java rename to solr/core/src/java/org/apache/solr/schema/TrieIntField.java diff --git a/solr/src/java/org/apache/solr/schema/TrieLongField.java b/solr/core/src/java/org/apache/solr/schema/TrieLongField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/TrieLongField.java rename to solr/core/src/java/org/apache/solr/schema/TrieLongField.java diff --git a/solr/src/java/org/apache/solr/schema/UUIDField.java b/solr/core/src/java/org/apache/solr/schema/UUIDField.java similarity index 100% rename from solr/src/java/org/apache/solr/schema/UUIDField.java rename to solr/core/src/java/org/apache/solr/schema/UUIDField.java diff --git a/solr/src/java/org/apache/solr/search/BitDocSet.java b/solr/core/src/java/org/apache/solr/search/BitDocSet.java similarity index 100% rename from solr/src/java/org/apache/solr/search/BitDocSet.java rename to solr/core/src/java/org/apache/solr/search/BitDocSet.java diff --git a/solr/src/java/org/apache/solr/search/BoostQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/BoostQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/BoostQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/BoostQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/CacheConfig.java b/solr/core/src/java/org/apache/solr/search/CacheConfig.java similarity index 100% rename from solr/src/java/org/apache/solr/search/CacheConfig.java rename to solr/core/src/java/org/apache/solr/search/CacheConfig.java diff --git a/solr/src/java/org/apache/solr/search/CacheRegenerator.java b/solr/core/src/java/org/apache/solr/search/CacheRegenerator.java similarity index 100% rename from solr/src/java/org/apache/solr/search/CacheRegenerator.java rename to solr/core/src/java/org/apache/solr/search/CacheRegenerator.java diff --git a/solr/src/java/org/apache/solr/search/DelegatingCollector.java b/solr/core/src/java/org/apache/solr/search/DelegatingCollector.java similarity index 100% rename from solr/src/java/org/apache/solr/search/DelegatingCollector.java rename to solr/core/src/java/org/apache/solr/search/DelegatingCollector.java diff --git a/solr/src/java/org/apache/solr/search/DisMaxQParser.java b/solr/core/src/java/org/apache/solr/search/DisMaxQParser.java similarity index 100% rename from solr/src/java/org/apache/solr/search/DisMaxQParser.java rename to solr/core/src/java/org/apache/solr/search/DisMaxQParser.java diff --git a/solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/DisMaxQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/DisMaxQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/DisMaxQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/DocIterator.java b/solr/core/src/java/org/apache/solr/search/DocIterator.java similarity index 100% rename from solr/src/java/org/apache/solr/search/DocIterator.java rename to solr/core/src/java/org/apache/solr/search/DocIterator.java diff --git a/solr/src/java/org/apache/solr/search/DocList.java b/solr/core/src/java/org/apache/solr/search/DocList.java similarity index 100% rename from solr/src/java/org/apache/solr/search/DocList.java rename to solr/core/src/java/org/apache/solr/search/DocList.java diff --git a/solr/src/java/org/apache/solr/search/DocListAndSet.java b/solr/core/src/java/org/apache/solr/search/DocListAndSet.java similarity index 100% rename from solr/src/java/org/apache/solr/search/DocListAndSet.java rename to solr/core/src/java/org/apache/solr/search/DocListAndSet.java diff --git a/solr/src/java/org/apache/solr/search/DocSet.java b/solr/core/src/java/org/apache/solr/search/DocSet.java similarity index 100% rename from solr/src/java/org/apache/solr/search/DocSet.java rename to solr/core/src/java/org/apache/solr/search/DocSet.java diff --git a/solr/src/java/org/apache/solr/search/DocSetHitCollector.java b/solr/core/src/java/org/apache/solr/search/DocSetHitCollector.java similarity index 100% rename from solr/src/java/org/apache/solr/search/DocSetHitCollector.java rename to solr/core/src/java/org/apache/solr/search/DocSetHitCollector.java diff --git a/solr/src/java/org/apache/solr/search/DocSlice.java b/solr/core/src/java/org/apache/solr/search/DocSlice.java similarity index 100% rename from solr/src/java/org/apache/solr/search/DocSlice.java rename to solr/core/src/java/org/apache/solr/search/DocSlice.java diff --git a/solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/ExtendedQuery.java b/solr/core/src/java/org/apache/solr/search/ExtendedQuery.java similarity index 100% rename from solr/src/java/org/apache/solr/search/ExtendedQuery.java rename to solr/core/src/java/org/apache/solr/search/ExtendedQuery.java diff --git a/solr/src/java/org/apache/solr/search/ExtendedQueryBase.java b/solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java similarity index 100% rename from solr/src/java/org/apache/solr/search/ExtendedQueryBase.java rename to solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java diff --git a/solr/src/java/org/apache/solr/search/FastLRUCache.java b/solr/core/src/java/org/apache/solr/search/FastLRUCache.java similarity index 100% rename from solr/src/java/org/apache/solr/search/FastLRUCache.java rename to solr/core/src/java/org/apache/solr/search/FastLRUCache.java diff --git a/solr/src/java/org/apache/solr/search/FieldQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/FieldQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/FieldQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/FieldQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/FunctionQParser.java b/solr/core/src/java/org/apache/solr/search/FunctionQParser.java similarity index 100% rename from solr/src/java/org/apache/solr/search/FunctionQParser.java rename to solr/core/src/java/org/apache/solr/search/FunctionQParser.java diff --git a/solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/FunctionQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/FunctionQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/FunctionQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/Grouping.java b/solr/core/src/java/org/apache/solr/search/Grouping.java similarity index 100% rename from solr/src/java/org/apache/solr/search/Grouping.java rename to solr/core/src/java/org/apache/solr/search/Grouping.java diff --git a/solr/src/java/org/apache/solr/search/HashDocSet.java b/solr/core/src/java/org/apache/solr/search/HashDocSet.java similarity index 100% rename from solr/src/java/org/apache/solr/search/HashDocSet.java rename to solr/core/src/java/org/apache/solr/search/HashDocSet.java diff --git a/solr/src/java/org/apache/solr/search/JoinQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/JoinQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/LRUCache.java b/solr/core/src/java/org/apache/solr/search/LRUCache.java similarity index 100% rename from solr/src/java/org/apache/solr/search/LRUCache.java rename to solr/core/src/java/org/apache/solr/search/LRUCache.java diff --git a/solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java b/solr/core/src/java/org/apache/solr/search/LuceneQueryOptimizer.java similarity index 100% rename from solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java rename to solr/core/src/java/org/apache/solr/search/LuceneQueryOptimizer.java diff --git a/solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java b/solr/core/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java similarity index 100% rename from solr/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java rename to solr/core/src/java/org/apache/solr/search/MissingStringLastComparatorSource.java diff --git a/solr/src/java/org/apache/solr/search/NestedQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/NestedQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/NestedQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/OldLuceneQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/PostFilter.java b/solr/core/src/java/org/apache/solr/search/PostFilter.java similarity index 100% rename from solr/src/java/org/apache/solr/search/PostFilter.java rename to solr/core/src/java/org/apache/solr/search/PostFilter.java diff --git a/solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/PrefixQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/PrefixQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/QParser.java b/solr/core/src/java/org/apache/solr/search/QParser.java similarity index 100% rename from solr/src/java/org/apache/solr/search/QParser.java rename to solr/core/src/java/org/apache/solr/search/QParser.java diff --git a/solr/src/java/org/apache/solr/search/QParserPlugin.java b/solr/core/src/java/org/apache/solr/search/QParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/QParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/QParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/QueryParsing.java b/solr/core/src/java/org/apache/solr/search/QueryParsing.java similarity index 100% rename from solr/src/java/org/apache/solr/search/QueryParsing.java rename to solr/core/src/java/org/apache/solr/search/QueryParsing.java diff --git a/solr/src/java/org/apache/solr/search/QueryResultKey.java b/solr/core/src/java/org/apache/solr/search/QueryResultKey.java similarity index 100% rename from solr/src/java/org/apache/solr/search/QueryResultKey.java rename to solr/core/src/java/org/apache/solr/search/QueryResultKey.java diff --git a/solr/src/java/org/apache/solr/search/QueryUtils.java b/solr/core/src/java/org/apache/solr/search/QueryUtils.java similarity index 100% rename from solr/src/java/org/apache/solr/search/QueryUtils.java rename to solr/core/src/java/org/apache/solr/search/QueryUtils.java diff --git a/solr/src/java/org/apache/solr/search/RawQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/RawQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/RawQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/RawQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/ReturnFields.java b/solr/core/src/java/org/apache/solr/search/ReturnFields.java similarity index 100% rename from solr/src/java/org/apache/solr/search/ReturnFields.java rename to solr/core/src/java/org/apache/solr/search/ReturnFields.java diff --git a/solr/src/java/org/apache/solr/search/SolrCache.java b/solr/core/src/java/org/apache/solr/search/SolrCache.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SolrCache.java rename to solr/core/src/java/org/apache/solr/search/SolrCache.java diff --git a/solr/src/java/org/apache/solr/search/SolrCacheBase.java b/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SolrCacheBase.java rename to solr/core/src/java/org/apache/solr/search/SolrCacheBase.java diff --git a/solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java b/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SolrConstantScoreQuery.java rename to solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java diff --git a/solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java rename to solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java diff --git a/solr/src/java/org/apache/solr/search/SolrFilter.java b/solr/core/src/java/org/apache/solr/search/SolrFilter.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SolrFilter.java rename to solr/core/src/java/org/apache/solr/search/SolrFilter.java diff --git a/solr/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SolrIndexSearcher.java rename to solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java diff --git a/solr/src/java/org/apache/solr/search/SolrQueryParser.java b/solr/core/src/java/org/apache/solr/search/SolrQueryParser.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SolrQueryParser.java rename to solr/core/src/java/org/apache/solr/search/SolrQueryParser.java diff --git a/solr/src/java/org/apache/solr/search/SolrSimilarityProvider.java b/solr/core/src/java/org/apache/solr/search/SolrSimilarityProvider.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SolrSimilarityProvider.java rename to solr/core/src/java/org/apache/solr/search/SolrSimilarityProvider.java diff --git a/solr/src/java/org/apache/solr/search/SolrSortField.java b/solr/core/src/java/org/apache/solr/search/SolrSortField.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SolrSortField.java rename to solr/core/src/java/org/apache/solr/search/SolrSortField.java diff --git a/solr/src/java/org/apache/solr/search/SortSpec.java b/solr/core/src/java/org/apache/solr/search/SortSpec.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SortSpec.java rename to solr/core/src/java/org/apache/solr/search/SortSpec.java diff --git a/solr/src/java/org/apache/solr/search/SortedIntDocSet.java b/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SortedIntDocSet.java rename to solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java diff --git a/solr/src/java/org/apache/solr/search/Sorting.java b/solr/core/src/java/org/apache/solr/search/Sorting.java similarity index 100% rename from solr/src/java/org/apache/solr/search/Sorting.java rename to solr/core/src/java/org/apache/solr/search/Sorting.java diff --git a/solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/SpatialFilterQParser.java b/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SpatialFilterQParser.java rename to solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java diff --git a/solr/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/SpatialOptions.java b/solr/core/src/java/org/apache/solr/search/SpatialOptions.java similarity index 100% rename from solr/src/java/org/apache/solr/search/SpatialOptions.java rename to solr/core/src/java/org/apache/solr/search/SpatialOptions.java diff --git a/solr/src/java/org/apache/solr/search/TermQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/search/TermQParserPlugin.java rename to solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java diff --git a/solr/src/java/org/apache/solr/search/ValueSourceParser.java b/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java similarity index 100% rename from solr/src/java/org/apache/solr/search/ValueSourceParser.java rename to solr/core/src/java/org/apache/solr/search/ValueSourceParser.java diff --git a/solr/src/java/org/apache/solr/search/WrappedQuery.java b/solr/core/src/java/org/apache/solr/search/WrappedQuery.java similarity index 100% rename from solr/src/java/org/apache/solr/search/WrappedQuery.java rename to solr/core/src/java/org/apache/solr/search/WrappedQuery.java diff --git a/solr/src/java/org/apache/solr/search/function/FileFloatSource.java b/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java similarity index 100% rename from solr/src/java/org/apache/solr/search/function/FileFloatSource.java rename to solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java diff --git a/solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java b/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java similarity index 100% rename from solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java rename to solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java diff --git a/solr/src/java/org/apache/solr/search/function/distance/GeohashFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java similarity index 100% rename from solr/src/java/org/apache/solr/search/function/distance/GeohashFunction.java rename to solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java diff --git a/solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java similarity index 100% rename from solr/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java rename to solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java diff --git a/solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java similarity index 100% rename from solr/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java rename to solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java diff --git a/solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java similarity index 100% rename from solr/src/java/org/apache/solr/search/function/distance/HaversineFunction.java rename to solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java diff --git a/solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java similarity index 100% rename from solr/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java rename to solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java diff --git a/solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java similarity index 100% rename from solr/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java rename to solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java diff --git a/solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java similarity index 100% rename from solr/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java rename to solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java diff --git a/solr/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java b/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java similarity index 100% rename from solr/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java rename to solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java diff --git a/solr/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java b/solr/core/src/java/org/apache/solr/servlet/LogLevelSelection.java similarity index 100% rename from solr/src/webapp/src/org/apache/solr/servlet/LogLevelSelection.java rename to solr/core/src/java/org/apache/solr/servlet/LogLevelSelection.java diff --git a/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java similarity index 100% rename from solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java rename to solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java diff --git a/solr/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java similarity index 100% rename from solr/src/webapp/src/org/apache/solr/servlet/SolrRequestParsers.java rename to solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java diff --git a/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java b/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java similarity index 100% rename from solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java rename to solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java diff --git a/solr/src/webapp/src/org/apache/solr/servlet/cache/Method.java b/solr/core/src/java/org/apache/solr/servlet/cache/Method.java similarity index 100% rename from solr/src/webapp/src/org/apache/solr/servlet/cache/Method.java rename to solr/core/src/java/org/apache/solr/servlet/cache/Method.java diff --git a/solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java rename to solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java diff --git a/solr/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java rename to solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java diff --git a/solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java rename to solr/core/src/java/org/apache/solr/spelling/FileBasedSpellChecker.java diff --git a/solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java rename to solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java diff --git a/solr/src/java/org/apache/solr/spelling/PossibilityIterator.java b/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/PossibilityIterator.java rename to solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java diff --git a/solr/src/java/org/apache/solr/spelling/QueryConverter.java b/solr/core/src/java/org/apache/solr/spelling/QueryConverter.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/QueryConverter.java rename to solr/core/src/java/org/apache/solr/spelling/QueryConverter.java diff --git a/solr/src/java/org/apache/solr/spelling/RankedSpellPossibility.java b/solr/core/src/java/org/apache/solr/spelling/RankedSpellPossibility.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/RankedSpellPossibility.java rename to solr/core/src/java/org/apache/solr/spelling/RankedSpellPossibility.java diff --git a/solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java rename to solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java diff --git a/solr/src/java/org/apache/solr/spelling/SpellCheckCollation.java b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollation.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/SpellCheckCollation.java rename to solr/core/src/java/org/apache/solr/spelling/SpellCheckCollation.java diff --git a/solr/src/java/org/apache/solr/spelling/SpellCheckCollator.java b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/SpellCheckCollator.java rename to solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java diff --git a/solr/src/java/org/apache/solr/spelling/SpellCheckCorrection.java b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCorrection.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/SpellCheckCorrection.java rename to solr/core/src/java/org/apache/solr/spelling/SpellCheckCorrection.java diff --git a/solr/src/java/org/apache/solr/spelling/SpellingOptions.java b/solr/core/src/java/org/apache/solr/spelling/SpellingOptions.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/SpellingOptions.java rename to solr/core/src/java/org/apache/solr/spelling/SpellingOptions.java diff --git a/solr/src/java/org/apache/solr/spelling/SpellingQueryConverter.java b/solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/SpellingQueryConverter.java rename to solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java diff --git a/solr/src/java/org/apache/solr/spelling/SpellingResult.java b/solr/core/src/java/org/apache/solr/spelling/SpellingResult.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/SpellingResult.java rename to solr/core/src/java/org/apache/solr/spelling/SpellingResult.java diff --git a/solr/src/java/org/apache/solr/spelling/suggest/LookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/LookupFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/suggest/LookupFactory.java rename to solr/core/src/java/org/apache/solr/spelling/suggest/LookupFactory.java diff --git a/solr/src/java/org/apache/solr/spelling/suggest/Suggester.java b/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/suggest/Suggester.java rename to solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java diff --git a/solr/src/java/org/apache/solr/spelling/suggest/fst/FSTLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FSTLookupFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/suggest/fst/FSTLookupFactory.java rename to solr/core/src/java/org/apache/solr/spelling/suggest/fst/FSTLookupFactory.java diff --git a/solr/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java rename to solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java diff --git a/solr/src/java/org/apache/solr/spelling/suggest/tst/TSTLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/tst/TSTLookupFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/spelling/suggest/tst/TSTLookupFactory.java rename to solr/core/src/java/org/apache/solr/spelling/suggest/tst/TSTLookupFactory.java diff --git a/solr/src/java/org/apache/solr/update/AddUpdateCommand.java b/solr/core/src/java/org/apache/solr/update/AddUpdateCommand.java similarity index 100% rename from solr/src/java/org/apache/solr/update/AddUpdateCommand.java rename to solr/core/src/java/org/apache/solr/update/AddUpdateCommand.java diff --git a/solr/src/java/org/apache/solr/update/CommitTracker.java b/solr/core/src/java/org/apache/solr/update/CommitTracker.java similarity index 100% rename from solr/src/java/org/apache/solr/update/CommitTracker.java rename to solr/core/src/java/org/apache/solr/update/CommitTracker.java diff --git a/solr/src/java/org/apache/solr/update/CommitUpdateCommand.java b/solr/core/src/java/org/apache/solr/update/CommitUpdateCommand.java similarity index 100% rename from solr/src/java/org/apache/solr/update/CommitUpdateCommand.java rename to solr/core/src/java/org/apache/solr/update/CommitUpdateCommand.java diff --git a/solr/src/java/org/apache/solr/update/DefaultIndexWriterProvider.java b/solr/core/src/java/org/apache/solr/update/DefaultIndexWriterProvider.java similarity index 100% rename from solr/src/java/org/apache/solr/update/DefaultIndexWriterProvider.java rename to solr/core/src/java/org/apache/solr/update/DefaultIndexWriterProvider.java diff --git a/solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java b/solr/core/src/java/org/apache/solr/update/DeleteUpdateCommand.java similarity index 100% rename from solr/src/java/org/apache/solr/update/DeleteUpdateCommand.java rename to solr/core/src/java/org/apache/solr/update/DeleteUpdateCommand.java diff --git a/solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java similarity index 100% rename from solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java rename to solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java diff --git a/solr/src/java/org/apache/solr/update/DocumentBuilder.java b/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java similarity index 100% rename from solr/src/java/org/apache/solr/update/DocumentBuilder.java rename to solr/core/src/java/org/apache/solr/update/DocumentBuilder.java diff --git a/solr/src/java/org/apache/solr/update/IndexWriterProvider.java b/solr/core/src/java/org/apache/solr/update/IndexWriterProvider.java similarity index 100% rename from solr/src/java/org/apache/solr/update/IndexWriterProvider.java rename to solr/core/src/java/org/apache/solr/update/IndexWriterProvider.java diff --git a/solr/src/java/org/apache/solr/update/MergeIndexesCommand.java b/solr/core/src/java/org/apache/solr/update/MergeIndexesCommand.java similarity index 100% rename from solr/src/java/org/apache/solr/update/MergeIndexesCommand.java rename to solr/core/src/java/org/apache/solr/update/MergeIndexesCommand.java diff --git a/solr/src/java/org/apache/solr/update/RollbackUpdateCommand.java b/solr/core/src/java/org/apache/solr/update/RollbackUpdateCommand.java similarity index 100% rename from solr/src/java/org/apache/solr/update/RollbackUpdateCommand.java rename to solr/core/src/java/org/apache/solr/update/RollbackUpdateCommand.java diff --git a/solr/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java similarity index 100% rename from solr/src/java/org/apache/solr/update/SolrIndexConfig.java rename to solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java diff --git a/solr/src/java/org/apache/solr/update/SolrIndexWriter.java b/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java similarity index 100% rename from solr/src/java/org/apache/solr/update/SolrIndexWriter.java rename to solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java diff --git a/solr/src/java/org/apache/solr/update/UpdateCommand.java b/solr/core/src/java/org/apache/solr/update/UpdateCommand.java similarity index 100% rename from solr/src/java/org/apache/solr/update/UpdateCommand.java rename to solr/core/src/java/org/apache/solr/update/UpdateCommand.java diff --git a/solr/src/java/org/apache/solr/update/UpdateHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java similarity index 100% rename from solr/src/java/org/apache/solr/update/UpdateHandler.java rename to solr/core/src/java/org/apache/solr/update/UpdateHandler.java diff --git a/solr/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java rename to solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java diff --git a/solr/src/java/org/apache/solr/update/processor/Lookup3Signature.java b/solr/core/src/java/org/apache/solr/update/processor/Lookup3Signature.java similarity index 100% rename from solr/src/java/org/apache/solr/update/processor/Lookup3Signature.java rename to solr/core/src/java/org/apache/solr/update/processor/Lookup3Signature.java diff --git a/solr/src/java/org/apache/solr/update/processor/MD5Signature.java b/solr/core/src/java/org/apache/solr/update/processor/MD5Signature.java similarity index 100% rename from solr/src/java/org/apache/solr/update/processor/MD5Signature.java rename to solr/core/src/java/org/apache/solr/update/processor/MD5Signature.java diff --git a/solr/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java rename to solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java diff --git a/solr/src/java/org/apache/solr/update/processor/Signature.java b/solr/core/src/java/org/apache/solr/update/processor/Signature.java similarity index 100% rename from solr/src/java/org/apache/solr/update/processor/Signature.java rename to solr/core/src/java/org/apache/solr/update/processor/Signature.java diff --git a/solr/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java rename to solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java diff --git a/solr/src/java/org/apache/solr/update/processor/TextProfileSignature.java b/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java similarity index 100% rename from solr/src/java/org/apache/solr/update/processor/TextProfileSignature.java rename to solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java diff --git a/solr/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java similarity index 100% rename from solr/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java rename to solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java diff --git a/solr/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java similarity index 100% rename from solr/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java rename to solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java diff --git a/solr/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java similarity index 100% rename from solr/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java rename to solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java diff --git a/solr/src/java/org/apache/solr/util/BCDUtils.java b/solr/core/src/java/org/apache/solr/util/BCDUtils.java similarity index 100% rename from solr/src/java/org/apache/solr/util/BCDUtils.java rename to solr/core/src/java/org/apache/solr/util/BCDUtils.java diff --git a/solr/src/java/org/apache/solr/util/BoundedTreeSet.java b/solr/core/src/java/org/apache/solr/util/BoundedTreeSet.java similarity index 100% rename from solr/src/java/org/apache/solr/util/BoundedTreeSet.java rename to solr/core/src/java/org/apache/solr/util/BoundedTreeSet.java diff --git a/solr/src/java/org/apache/solr/util/DateMathParser.java b/solr/core/src/java/org/apache/solr/util/DateMathParser.java similarity index 100% rename from solr/src/java/org/apache/solr/util/DateMathParser.java rename to solr/core/src/java/org/apache/solr/util/DateMathParser.java diff --git a/solr/src/java/org/apache/solr/util/LongPriorityQueue.java b/solr/core/src/java/org/apache/solr/util/LongPriorityQueue.java similarity index 100% rename from solr/src/java/org/apache/solr/util/LongPriorityQueue.java rename to solr/core/src/java/org/apache/solr/util/LongPriorityQueue.java diff --git a/solr/src/java/org/apache/solr/util/NumberUtils.java b/solr/core/src/java/org/apache/solr/util/NumberUtils.java similarity index 100% rename from solr/src/java/org/apache/solr/util/NumberUtils.java rename to solr/core/src/java/org/apache/solr/util/NumberUtils.java diff --git a/solr/src/java/org/apache/solr/util/PrimUtils.java b/solr/core/src/java/org/apache/solr/util/PrimUtils.java similarity index 100% rename from solr/src/java/org/apache/solr/util/PrimUtils.java rename to solr/core/src/java/org/apache/solr/util/PrimUtils.java diff --git a/solr/src/java/org/apache/solr/util/RefCounted.java b/solr/core/src/java/org/apache/solr/util/RefCounted.java similarity index 100% rename from solr/src/java/org/apache/solr/util/RefCounted.java rename to solr/core/src/java/org/apache/solr/util/RefCounted.java diff --git a/solr/src/java/org/apache/solr/util/SentinelIntSet.java b/solr/core/src/java/org/apache/solr/util/SentinelIntSet.java similarity index 100% rename from solr/src/java/org/apache/solr/util/SentinelIntSet.java rename to solr/core/src/java/org/apache/solr/util/SentinelIntSet.java diff --git a/solr/src/java/org/apache/solr/util/SimplePostTool.java b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java similarity index 100% rename from solr/src/java/org/apache/solr/util/SimplePostTool.java rename to solr/core/src/java/org/apache/solr/util/SimplePostTool.java diff --git a/solr/src/java/org/apache/solr/util/SolrPluginUtils.java b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java similarity index 100% rename from solr/src/java/org/apache/solr/util/SolrPluginUtils.java rename to solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java diff --git a/solr/src/java/org/apache/solr/util/SuggestMissingFactories.java b/solr/core/src/java/org/apache/solr/util/SuggestMissingFactories.java similarity index 100% rename from solr/src/java/org/apache/solr/util/SuggestMissingFactories.java rename to solr/core/src/java/org/apache/solr/util/SuggestMissingFactories.java diff --git a/solr/src/java/org/apache/solr/util/VersionedFile.java b/solr/core/src/java/org/apache/solr/util/VersionedFile.java similarity index 100% rename from solr/src/java/org/apache/solr/util/VersionedFile.java rename to solr/core/src/java/org/apache/solr/util/VersionedFile.java diff --git a/solr/src/java/org/apache/solr/util/doc-files/min-should-match.html b/solr/core/src/java/org/apache/solr/util/doc-files/min-should-match.html similarity index 100% rename from solr/src/java/org/apache/solr/util/doc-files/min-should-match.html rename to solr/core/src/java/org/apache/solr/util/doc-files/min-should-match.html diff --git a/solr/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java b/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java similarity index 100% rename from solr/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java rename to solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java diff --git a/solr/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java b/solr/core/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java rename to solr/core/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java diff --git a/solr/src/java/org/apache/solr/util/plugin/MapPluginLoader.java b/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java similarity index 100% rename from solr/src/java/org/apache/solr/util/plugin/MapPluginLoader.java rename to solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java diff --git a/solr/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java b/solr/core/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java similarity index 100% rename from solr/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java rename to solr/core/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java diff --git a/solr/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java b/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java similarity index 100% rename from solr/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java rename to solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java diff --git a/solr/src/java/org/apache/solr/util/plugin/PluginInfoInitialized.java b/solr/core/src/java/org/apache/solr/util/plugin/PluginInfoInitialized.java similarity index 100% rename from solr/src/java/org/apache/solr/util/plugin/PluginInfoInitialized.java rename to solr/core/src/java/org/apache/solr/util/plugin/PluginInfoInitialized.java diff --git a/solr/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java b/solr/core/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java similarity index 100% rename from solr/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java rename to solr/core/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java diff --git a/solr/src/java/org/apache/solr/util/plugin/SolrCoreAware.java b/solr/core/src/java/org/apache/solr/util/plugin/SolrCoreAware.java similarity index 100% rename from solr/src/java/org/apache/solr/util/plugin/SolrCoreAware.java rename to solr/core/src/java/org/apache/solr/util/plugin/SolrCoreAware.java diff --git a/solr/src/java/org/apache/solr/util/xslt/TransformerProvider.java b/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java similarity index 100% rename from solr/src/java/org/apache/solr/util/xslt/TransformerProvider.java rename to solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java diff --git a/solr/src/test-files/README b/solr/core/src/test-files/README similarity index 100% rename from solr/src/test-files/README rename to solr/core/src/test-files/README diff --git a/solr/src/test-files/lib-dirs/README b/solr/core/src/test-files/lib-dirs/README similarity index 100% rename from solr/src/test-files/lib-dirs/README rename to solr/core/src/test-files/lib-dirs/README diff --git a/solr/src/test-files/lib-dirs/a/a1/empty-file-a1.txt b/solr/core/src/test-files/lib-dirs/a/a1/empty-file-a1.txt similarity index 100% rename from solr/src/test-files/lib-dirs/a/a1/empty-file-a1.txt rename to solr/core/src/test-files/lib-dirs/a/a1/empty-file-a1.txt diff --git a/solr/src/test-files/lib-dirs/a/a2/empty-file-a2.txt b/solr/core/src/test-files/lib-dirs/a/a2/empty-file-a2.txt similarity index 100% rename from solr/src/test-files/lib-dirs/a/a2/empty-file-a2.txt rename to solr/core/src/test-files/lib-dirs/a/a2/empty-file-a2.txt diff --git a/solr/src/test-files/lib-dirs/b/b1/empty-file-b1.txt b/solr/core/src/test-files/lib-dirs/b/b1/empty-file-b1.txt similarity index 100% rename from solr/src/test-files/lib-dirs/b/b1/empty-file-b1.txt rename to solr/core/src/test-files/lib-dirs/b/b1/empty-file-b1.txt diff --git a/solr/src/test-files/lib-dirs/b/b2/empty-file-b2.txt b/solr/core/src/test-files/lib-dirs/b/b2/empty-file-b2.txt similarity index 100% rename from solr/src/test-files/lib-dirs/b/b2/empty-file-b2.txt rename to solr/core/src/test-files/lib-dirs/b/b2/empty-file-b2.txt diff --git a/solr/src/test-files/lib-dirs/c/c1/empty-file-c1.txt b/solr/core/src/test-files/lib-dirs/c/c1/empty-file-c1.txt similarity index 100% rename from solr/src/test-files/lib-dirs/c/c1/empty-file-c1.txt rename to solr/core/src/test-files/lib-dirs/c/c1/empty-file-c1.txt diff --git a/solr/src/test-files/lib-dirs/c/c2/empty-file-c2.txt b/solr/core/src/test-files/lib-dirs/c/c2/empty-file-c2.txt similarity index 100% rename from solr/src/test-files/lib-dirs/c/c2/empty-file-c2.txt rename to solr/core/src/test-files/lib-dirs/c/c2/empty-file-c2.txt diff --git a/solr/src/test-files/lib-dirs/d/d1/empty-file-d1.txt b/solr/core/src/test-files/lib-dirs/d/d1/empty-file-d1.txt similarity index 100% rename from solr/src/test-files/lib-dirs/d/d1/empty-file-d1.txt rename to solr/core/src/test-files/lib-dirs/d/d1/empty-file-d1.txt diff --git a/solr/src/test-files/lib-dirs/d/d2/empty-file-d2.txt b/solr/core/src/test-files/lib-dirs/d/d2/empty-file-d2.txt similarity index 100% rename from solr/src/test-files/lib-dirs/d/d2/empty-file-d2.txt rename to solr/core/src/test-files/lib-dirs/d/d2/empty-file-d2.txt diff --git a/solr/src/test-files/mailing_lists.pdf b/solr/core/src/test-files/mailing_lists.pdf similarity index 100% rename from solr/src/test-files/mailing_lists.pdf rename to solr/core/src/test-files/mailing_lists.pdf diff --git a/solr/src/test-files/solr/conf/bad-schema-dup-dynamicField.xml b/solr/core/src/test-files/solr/conf/bad-schema-dup-dynamicField.xml similarity index 100% rename from solr/src/test-files/solr/conf/bad-schema-dup-dynamicField.xml rename to solr/core/src/test-files/solr/conf/bad-schema-dup-dynamicField.xml diff --git a/solr/src/test-files/solr/conf/bad-schema-dup-field.xml b/solr/core/src/test-files/solr/conf/bad-schema-dup-field.xml similarity index 100% rename from solr/src/test-files/solr/conf/bad-schema-dup-field.xml rename to solr/core/src/test-files/solr/conf/bad-schema-dup-field.xml diff --git a/solr/src/test-files/solr/conf/bad-schema-dup-fieldType.xml b/solr/core/src/test-files/solr/conf/bad-schema-dup-fieldType.xml similarity index 100% rename from solr/src/test-files/solr/conf/bad-schema-dup-fieldType.xml rename to solr/core/src/test-files/solr/conf/bad-schema-dup-fieldType.xml diff --git a/solr/src/test-files/solr/conf/bad-schema-nontext-analyzer.xml b/solr/core/src/test-files/solr/conf/bad-schema-nontext-analyzer.xml similarity index 100% rename from solr/src/test-files/solr/conf/bad-schema-nontext-analyzer.xml rename to solr/core/src/test-files/solr/conf/bad-schema-nontext-analyzer.xml diff --git a/solr/src/test-files/solr/conf/bad_solrconfig.xml b/solr/core/src/test-files/solr/conf/bad_solrconfig.xml similarity index 100% rename from solr/src/test-files/solr/conf/bad_solrconfig.xml rename to solr/core/src/test-files/solr/conf/bad_solrconfig.xml diff --git a/solr/src/test-files/solr/conf/compoundDictionary.txt b/solr/core/src/test-files/solr/conf/compoundDictionary.txt similarity index 100% rename from solr/src/test-files/solr/conf/compoundDictionary.txt rename to solr/core/src/test-files/solr/conf/compoundDictionary.txt diff --git a/solr/src/test-files/solr/conf/da_UTF8.xml b/solr/core/src/test-files/solr/conf/da_UTF8.xml similarity index 100% rename from solr/src/test-files/solr/conf/da_UTF8.xml rename to solr/core/src/test-files/solr/conf/da_UTF8.xml diff --git a/solr/src/test-files/solr/conf/da_compoundDictionary.txt b/solr/core/src/test-files/solr/conf/da_compoundDictionary.txt similarity index 100% rename from solr/src/test-files/solr/conf/da_compoundDictionary.txt rename to solr/core/src/test-files/solr/conf/da_compoundDictionary.txt diff --git a/solr/src/test-files/solr/conf/elevate.xml b/solr/core/src/test-files/solr/conf/elevate.xml similarity index 100% rename from solr/src/test-files/solr/conf/elevate.xml rename to solr/core/src/test-files/solr/conf/elevate.xml diff --git a/solr/src/test-files/solr/conf/frenchArticles.txt b/solr/core/src/test-files/solr/conf/frenchArticles.txt similarity index 100% rename from solr/src/test-files/solr/conf/frenchArticles.txt rename to solr/core/src/test-files/solr/conf/frenchArticles.txt diff --git a/solr/src/test-files/solr/conf/hyphenation.dtd b/solr/core/src/test-files/solr/conf/hyphenation.dtd similarity index 100% rename from solr/src/test-files/solr/conf/hyphenation.dtd rename to solr/core/src/test-files/solr/conf/hyphenation.dtd diff --git a/solr/src/test-files/solr/conf/keep-1.txt b/solr/core/src/test-files/solr/conf/keep-1.txt similarity index 100% rename from solr/src/test-files/solr/conf/keep-1.txt rename to solr/core/src/test-files/solr/conf/keep-1.txt diff --git a/solr/src/test-files/solr/conf/keep-2.txt b/solr/core/src/test-files/solr/conf/keep-2.txt similarity index 100% rename from solr/src/test-files/solr/conf/keep-2.txt rename to solr/core/src/test-files/solr/conf/keep-2.txt diff --git a/solr/src/test-files/solr/conf/mapping-ISOLatin1Accent.txt b/solr/core/src/test-files/solr/conf/mapping-ISOLatin1Accent.txt similarity index 100% rename from solr/src/test-files/solr/conf/mapping-ISOLatin1Accent.txt rename to solr/core/src/test-files/solr/conf/mapping-ISOLatin1Accent.txt diff --git a/solr/src/test-files/solr/conf/old_synonyms.txt b/solr/core/src/test-files/solr/conf/old_synonyms.txt similarity index 100% rename from solr/src/test-files/solr/conf/old_synonyms.txt rename to solr/core/src/test-files/solr/conf/old_synonyms.txt diff --git a/solr/src/test-files/solr/conf/protwords.txt b/solr/core/src/test-files/solr/conf/protwords.txt similarity index 100% rename from solr/src/test-files/solr/conf/protwords.txt rename to solr/core/src/test-files/solr/conf/protwords.txt diff --git a/solr/src/test-files/solr/conf/schema-binaryfield.xml b/solr/core/src/test-files/solr/conf/schema-binaryfield.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-binaryfield.xml rename to solr/core/src/test-files/solr/conf/schema-binaryfield.xml diff --git a/solr/src/test-files/solr/conf/schema-collate.xml b/solr/core/src/test-files/solr/conf/schema-collate.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-collate.xml rename to solr/core/src/test-files/solr/conf/schema-collate.xml diff --git a/solr/src/test-files/solr/conf/schema-copyfield-test.xml b/solr/core/src/test-files/solr/conf/schema-copyfield-test.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-copyfield-test.xml rename to solr/core/src/test-files/solr/conf/schema-copyfield-test.xml diff --git a/solr/src/test-files/solr/conf/schema-luceneMatchVersion.xml b/solr/core/src/test-files/solr/conf/schema-luceneMatchVersion.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-luceneMatchVersion.xml rename to solr/core/src/test-files/solr/conf/schema-luceneMatchVersion.xml diff --git a/solr/src/test-files/solr/conf/schema-minimal.xml b/solr/core/src/test-files/solr/conf/schema-minimal.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-minimal.xml rename to solr/core/src/test-files/solr/conf/schema-minimal.xml diff --git a/solr/src/test-files/solr/conf/schema-not-required-unique-key.xml b/solr/core/src/test-files/solr/conf/schema-not-required-unique-key.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-not-required-unique-key.xml rename to solr/core/src/test-files/solr/conf/schema-not-required-unique-key.xml diff --git a/solr/src/test-files/solr/conf/schema-numeric.xml b/solr/core/src/test-files/solr/conf/schema-numeric.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-numeric.xml rename to solr/core/src/test-files/solr/conf/schema-numeric.xml diff --git a/solr/src/test-files/solr/conf/schema-replication1.xml b/solr/core/src/test-files/solr/conf/schema-replication1.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-replication1.xml rename to solr/core/src/test-files/solr/conf/schema-replication1.xml diff --git a/solr/src/test-files/solr/conf/schema-replication2.xml b/solr/core/src/test-files/solr/conf/schema-replication2.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-replication2.xml rename to solr/core/src/test-files/solr/conf/schema-replication2.xml diff --git a/solr/src/test-files/solr/conf/schema-required-fields.xml b/solr/core/src/test-files/solr/conf/schema-required-fields.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-required-fields.xml rename to solr/core/src/test-files/solr/conf/schema-required-fields.xml diff --git a/solr/src/test-files/solr/conf/schema-reversed.xml b/solr/core/src/test-files/solr/conf/schema-reversed.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-reversed.xml rename to solr/core/src/test-files/solr/conf/schema-reversed.xml diff --git a/solr/src/test-files/solr/conf/schema-spellchecker.xml b/solr/core/src/test-files/solr/conf/schema-spellchecker.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-spellchecker.xml rename to solr/core/src/test-files/solr/conf/schema-spellchecker.xml diff --git a/solr/src/test-files/solr/conf/schema-stop-keep.xml b/solr/core/src/test-files/solr/conf/schema-stop-keep.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-stop-keep.xml rename to solr/core/src/test-files/solr/conf/schema-stop-keep.xml diff --git a/solr/src/test-files/solr/conf/schema-trie.xml b/solr/core/src/test-files/solr/conf/schema-trie.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema-trie.xml rename to solr/core/src/test-files/solr/conf/schema-trie.xml diff --git a/solr/src/test-files/solr/conf/schema.xml b/solr/core/src/test-files/solr/conf/schema.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema.xml rename to solr/core/src/test-files/solr/conf/schema.xml diff --git a/solr/src/test-files/solr/conf/schema11.xml b/solr/core/src/test-files/solr/conf/schema11.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema11.xml rename to solr/core/src/test-files/solr/conf/schema11.xml diff --git a/solr/src/test-files/solr/conf/schema12.xml b/solr/core/src/test-files/solr/conf/schema12.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema12.xml rename to solr/core/src/test-files/solr/conf/schema12.xml diff --git a/solr/src/test-files/solr/conf/schema_codec.xml b/solr/core/src/test-files/solr/conf/schema_codec.xml similarity index 100% rename from solr/src/test-files/solr/conf/schema_codec.xml rename to solr/core/src/test-files/solr/conf/schema_codec.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-SOLR-749.xml b/solr/core/src/test-files/solr/conf/solrconfig-SOLR-749.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-SOLR-749.xml rename to solr/core/src/test-files/solr/conf/solrconfig-SOLR-749.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-altdirectory.xml b/solr/core/src/test-files/solr/conf/solrconfig-altdirectory.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-altdirectory.xml rename to solr/core/src/test-files/solr/conf/solrconfig-altdirectory.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-collate.xml b/solr/core/src/test-files/solr/conf/solrconfig-collate.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-collate.xml rename to solr/core/src/test-files/solr/conf/solrconfig-collate.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-delpolicy1.xml b/solr/core/src/test-files/solr/conf/solrconfig-delpolicy1.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-delpolicy1.xml rename to solr/core/src/test-files/solr/conf/solrconfig-delpolicy1.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-delpolicy2.xml b/solr/core/src/test-files/solr/conf/solrconfig-delpolicy2.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-delpolicy2.xml rename to solr/core/src/test-files/solr/conf/solrconfig-delpolicy2.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-elevate.xml b/solr/core/src/test-files/solr/conf/solrconfig-elevate.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-elevate.xml rename to solr/core/src/test-files/solr/conf/solrconfig-elevate.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-enableplugin.xml b/solr/core/src/test-files/solr/conf/solrconfig-enableplugin.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-enableplugin.xml rename to solr/core/src/test-files/solr/conf/solrconfig-enableplugin.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-functionquery.xml b/solr/core/src/test-files/solr/conf/solrconfig-functionquery.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-functionquery.xml rename to solr/core/src/test-files/solr/conf/solrconfig-functionquery.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-highlight.xml b/solr/core/src/test-files/solr/conf/solrconfig-highlight.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-highlight.xml rename to solr/core/src/test-files/solr/conf/solrconfig-highlight.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-legacy.xml b/solr/core/src/test-files/solr/conf/solrconfig-legacy.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-legacy.xml rename to solr/core/src/test-files/solr/conf/solrconfig-legacy.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-master.xml b/solr/core/src/test-files/solr/conf/solrconfig-master.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-master.xml rename to solr/core/src/test-files/solr/conf/solrconfig-master.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-master1.xml b/solr/core/src/test-files/solr/conf/solrconfig-master1.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-master1.xml rename to solr/core/src/test-files/solr/conf/solrconfig-master1.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-master2.xml b/solr/core/src/test-files/solr/conf/solrconfig-master2.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-master2.xml rename to solr/core/src/test-files/solr/conf/solrconfig-master2.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-mergepolicy.xml b/solr/core/src/test-files/solr/conf/solrconfig-mergepolicy.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-mergepolicy.xml rename to solr/core/src/test-files/solr/conf/solrconfig-mergepolicy.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-nocache.xml b/solr/core/src/test-files/solr/conf/solrconfig-nocache.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-nocache.xml rename to solr/core/src/test-files/solr/conf/solrconfig-nocache.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml b/solr/core/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml rename to solr/core/src/test-files/solr/conf/solrconfig-propinject-indexdefault.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-propinject.xml b/solr/core/src/test-files/solr/conf/solrconfig-propinject.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-propinject.xml rename to solr/core/src/test-files/solr/conf/solrconfig-propinject.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-querysender-noquery.xml b/solr/core/src/test-files/solr/conf/solrconfig-querysender-noquery.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-querysender-noquery.xml rename to solr/core/src/test-files/solr/conf/solrconfig-querysender-noquery.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-querysender.xml b/solr/core/src/test-files/solr/conf/solrconfig-querysender.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-querysender.xml rename to solr/core/src/test-files/solr/conf/solrconfig-querysender.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-repeater.xml b/solr/core/src/test-files/solr/conf/solrconfig-repeater.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-repeater.xml rename to solr/core/src/test-files/solr/conf/solrconfig-repeater.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-reqHandler.incl b/solr/core/src/test-files/solr/conf/solrconfig-reqHandler.incl similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-reqHandler.incl rename to solr/core/src/test-files/solr/conf/solrconfig-reqHandler.incl diff --git a/solr/src/test-files/solr/conf/solrconfig-slave.xml b/solr/core/src/test-files/solr/conf/solrconfig-slave.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-slave.xml rename to solr/core/src/test-files/solr/conf/solrconfig-slave.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-slave1.xml b/solr/core/src/test-files/solr/conf/solrconfig-slave1.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-slave1.xml rename to solr/core/src/test-files/solr/conf/solrconfig-slave1.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml b/solr/core/src/test-files/solr/conf/solrconfig-solcoreproperties.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-solcoreproperties.xml rename to solr/core/src/test-files/solr/conf/solrconfig-solcoreproperties.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml b/solr/core/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml rename to solr/core/src/test-files/solr/conf/solrconfig-spellcheckcomponent.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-spellchecker.xml b/solr/core/src/test-files/solr/conf/solrconfig-spellchecker.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-spellchecker.xml rename to solr/core/src/test-files/solr/conf/solrconfig-spellchecker.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-termindex.xml b/solr/core/src/test-files/solr/conf/solrconfig-termindex.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-termindex.xml rename to solr/core/src/test-files/solr/conf/solrconfig-termindex.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-transformers.xml b/solr/core/src/test-files/solr/conf/solrconfig-transformers.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-transformers.xml rename to solr/core/src/test-files/solr/conf/solrconfig-transformers.xml diff --git a/solr/src/test-files/solr/conf/solrconfig-xinclude.xml b/solr/core/src/test-files/solr/conf/solrconfig-xinclude.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig-xinclude.xml rename to solr/core/src/test-files/solr/conf/solrconfig-xinclude.xml diff --git a/solr/src/test-files/solr/conf/solrconfig.xml b/solr/core/src/test-files/solr/conf/solrconfig.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig.xml rename to solr/core/src/test-files/solr/conf/solrconfig.xml diff --git a/solr/src/test-files/solr/conf/solrconfig_codec.xml b/solr/core/src/test-files/solr/conf/solrconfig_codec.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig_codec.xml rename to solr/core/src/test-files/solr/conf/solrconfig_codec.xml diff --git a/solr/src/test-files/solr/conf/solrconfig_perf.xml b/solr/core/src/test-files/solr/conf/solrconfig_perf.xml similarity index 100% rename from solr/src/test-files/solr/conf/solrconfig_perf.xml rename to solr/core/src/test-files/solr/conf/solrconfig_perf.xml diff --git a/solr/src/test-files/solr/conf/stemdict.txt b/solr/core/src/test-files/solr/conf/stemdict.txt similarity index 100% rename from solr/src/test-files/solr/conf/stemdict.txt rename to solr/core/src/test-files/solr/conf/stemdict.txt diff --git a/solr/src/test-files/solr/conf/stop-1.txt b/solr/core/src/test-files/solr/conf/stop-1.txt similarity index 100% rename from solr/src/test-files/solr/conf/stop-1.txt rename to solr/core/src/test-files/solr/conf/stop-1.txt diff --git a/solr/src/test-files/solr/conf/stop-2.txt b/solr/core/src/test-files/solr/conf/stop-2.txt similarity index 100% rename from solr/src/test-files/solr/conf/stop-2.txt rename to solr/core/src/test-files/solr/conf/stop-2.txt diff --git a/solr/src/test-files/solr/conf/stopwithbom.txt b/solr/core/src/test-files/solr/conf/stopwithbom.txt similarity index 100% rename from solr/src/test-files/solr/conf/stopwithbom.txt rename to solr/core/src/test-files/solr/conf/stopwithbom.txt diff --git a/solr/src/test-files/solr/conf/stopwords.txt b/solr/core/src/test-files/solr/conf/stopwords.txt similarity index 100% rename from solr/src/test-files/solr/conf/stopwords.txt rename to solr/core/src/test-files/solr/conf/stopwords.txt diff --git a/solr/src/test-files/solr/conf/stopwordsWrongEncoding.txt b/solr/core/src/test-files/solr/conf/stopwordsWrongEncoding.txt similarity index 100% rename from solr/src/test-files/solr/conf/stopwordsWrongEncoding.txt rename to solr/core/src/test-files/solr/conf/stopwordsWrongEncoding.txt diff --git a/solr/src/test-files/solr/conf/synonyms.txt b/solr/core/src/test-files/solr/conf/synonyms.txt similarity index 100% rename from solr/src/test-files/solr/conf/synonyms.txt rename to solr/core/src/test-files/solr/conf/synonyms.txt diff --git a/solr/src/test-files/solr/conf/velocity/VM_global_library.vm b/solr/core/src/test-files/solr/conf/velocity/VM_global_library.vm similarity index 100% rename from solr/src/test-files/solr/conf/velocity/VM_global_library.vm rename to solr/core/src/test-files/solr/conf/velocity/VM_global_library.vm diff --git a/solr/src/test-files/solr/conf/wdftypes.txt b/solr/core/src/test-files/solr/conf/wdftypes.txt similarity index 100% rename from solr/src/test-files/solr/conf/wdftypes.txt rename to solr/core/src/test-files/solr/conf/wdftypes.txt diff --git a/solr/src/test-files/solr/conf/xslt/dummy-using-include.xsl b/solr/core/src/test-files/solr/conf/xslt/dummy-using-include.xsl similarity index 100% rename from solr/src/test-files/solr/conf/xslt/dummy-using-include.xsl rename to solr/core/src/test-files/solr/conf/xslt/dummy-using-include.xsl diff --git a/solr/src/test-files/solr/conf/xslt/dummy.xsl b/solr/core/src/test-files/solr/conf/xslt/dummy.xsl similarity index 100% rename from solr/src/test-files/solr/conf/xslt/dummy.xsl rename to solr/core/src/test-files/solr/conf/xslt/dummy.xsl diff --git a/solr/src/test-files/solr/conf/xslt/xsl-update-handler-test.xsl b/solr/core/src/test-files/solr/conf/xslt/xsl-update-handler-test.xsl similarity index 100% rename from solr/src/test-files/solr/conf/xslt/xsl-update-handler-test.xsl rename to solr/core/src/test-files/solr/conf/xslt/xsl-update-handler-test.xsl diff --git a/solr/src/test-files/solr/crazy-path-to-config.xml b/solr/core/src/test-files/solr/crazy-path-to-config.xml similarity index 100% rename from solr/src/test-files/solr/crazy-path-to-config.xml rename to solr/core/src/test-files/solr/crazy-path-to-config.xml diff --git a/solr/src/test-files/solr/crazy-path-to-schema.xml b/solr/core/src/test-files/solr/crazy-path-to-schema.xml similarity index 100% rename from solr/src/test-files/solr/crazy-path-to-schema.xml rename to solr/core/src/test-files/solr/crazy-path-to-schema.xml diff --git a/solr/src/test-files/solr/lib/README b/solr/core/src/test-files/solr/lib/README similarity index 100% rename from solr/src/test-files/solr/lib/README rename to solr/core/src/test-files/solr/lib/README diff --git a/solr/src/test-files/solr/lib/classes/empty-file-main-lib.txt b/solr/core/src/test-files/solr/lib/classes/empty-file-main-lib.txt similarity index 100% rename from solr/src/test-files/solr/lib/classes/empty-file-main-lib.txt rename to solr/core/src/test-files/solr/lib/classes/empty-file-main-lib.txt diff --git a/solr/src/test-files/solr/solr.xml b/solr/core/src/test-files/solr/solr.xml similarity index 100% rename from solr/src/test-files/solr/solr.xml rename to solr/core/src/test-files/solr/solr.xml diff --git a/solr/src/test-files/spellings.txt b/solr/core/src/test-files/spellings.txt similarity index 100% rename from solr/src/test-files/spellings.txt rename to solr/core/src/test-files/spellings.txt diff --git a/solr/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java similarity index 100% rename from solr/src/test/org/apache/solr/BasicFunctionalityTest.java rename to solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java diff --git a/solr/src/test/org/apache/solr/ConvertedLegacyTest.java b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java similarity index 100% rename from solr/src/test/org/apache/solr/ConvertedLegacyTest.java rename to solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java diff --git a/solr/src/test/org/apache/solr/DisMaxRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/DisMaxRequestHandlerTest.java rename to solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java diff --git a/solr/src/test/org/apache/solr/EchoParamsTest.java b/solr/core/src/test/org/apache/solr/EchoParamsTest.java similarity index 100% rename from solr/src/test/org/apache/solr/EchoParamsTest.java rename to solr/core/src/test/org/apache/solr/EchoParamsTest.java diff --git a/solr/src/test/org/apache/solr/MinimalSchemaTest.java b/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java similarity index 100% rename from solr/src/test/org/apache/solr/MinimalSchemaTest.java rename to solr/core/src/test/org/apache/solr/MinimalSchemaTest.java diff --git a/solr/src/test/org/apache/solr/OutputWriterTest.java b/solr/core/src/test/org/apache/solr/OutputWriterTest.java similarity index 100% rename from solr/src/test/org/apache/solr/OutputWriterTest.java rename to solr/core/src/test/org/apache/solr/OutputWriterTest.java diff --git a/solr/src/test/org/apache/solr/SampleTest.java b/solr/core/src/test/org/apache/solr/SampleTest.java similarity index 100% rename from solr/src/test/org/apache/solr/SampleTest.java rename to solr/core/src/test/org/apache/solr/SampleTest.java diff --git a/solr/src/test/org/apache/solr/SolrInfoMBeanTest.java b/solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java similarity index 100% rename from solr/src/test/org/apache/solr/SolrInfoMBeanTest.java rename to solr/core/src/test/org/apache/solr/SolrInfoMBeanTest.java diff --git a/solr/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java similarity index 100% rename from solr/src/test/org/apache/solr/TestDistributedSearch.java rename to solr/core/src/test/org/apache/solr/TestDistributedSearch.java diff --git a/solr/src/test/org/apache/solr/TestGroupingSearch.java b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java similarity index 100% rename from solr/src/test/org/apache/solr/TestGroupingSearch.java rename to solr/core/src/test/org/apache/solr/TestGroupingSearch.java diff --git a/solr/src/test/org/apache/solr/TestJoin.java b/solr/core/src/test/org/apache/solr/TestJoin.java similarity index 100% rename from solr/src/test/org/apache/solr/TestJoin.java rename to solr/core/src/test/org/apache/solr/TestJoin.java diff --git a/solr/src/test/org/apache/solr/TestPluginEnable.java b/solr/core/src/test/org/apache/solr/TestPluginEnable.java similarity index 100% rename from solr/src/test/org/apache/solr/TestPluginEnable.java rename to solr/core/src/test/org/apache/solr/TestPluginEnable.java diff --git a/solr/src/test/org/apache/solr/TestSolrCoreProperties.java b/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java similarity index 100% rename from solr/src/test/org/apache/solr/TestSolrCoreProperties.java rename to solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java diff --git a/solr/src/test/org/apache/solr/TestTrie.java b/solr/core/src/test/org/apache/solr/TestTrie.java similarity index 100% rename from solr/src/test/org/apache/solr/TestTrie.java rename to solr/core/src/test/org/apache/solr/TestTrie.java diff --git a/solr/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java rename to solr/core/src/test/org/apache/solr/analysis/CommonGramsFilterFactoryTest.java diff --git a/solr/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java rename to solr/core/src/test/org/apache/solr/analysis/CommonGramsQueryFilterFactoryTest.java diff --git a/solr/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java rename to solr/core/src/test/org/apache/solr/analysis/DoubleMetaphoneFilterFactoryTest.java diff --git a/solr/src/test/org/apache/solr/analysis/LengthFilterTest.java b/solr/core/src/test/org/apache/solr/analysis/LengthFilterTest.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/LengthFilterTest.java rename to solr/core/src/test/org/apache/solr/analysis/LengthFilterTest.java diff --git a/solr/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java rename to solr/core/src/test/org/apache/solr/analysis/SnowballPorterFilterFactoryTest.java diff --git a/solr/src/test/org/apache/solr/analysis/TestArabicFilters.java b/solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestArabicFilters.java rename to solr/core/src/test/org/apache/solr/analysis/TestArabicFilters.java diff --git a/solr/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestBrazilianStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestBulgarianStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestCJKTokenizerFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestCJKTokenizerFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestCJKTokenizerFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestCJKTokenizerFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestCapitalizationFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestCapitalizationFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestCapitalizationFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestCapitalizationFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestChineseFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestChineseTokenizerFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestChineseTokenizerFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestChineseTokenizerFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestChineseTokenizerFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestCollationKeyFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestCzechStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestDelimitedPayloadTokenFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestDictionaryCompoundWordTokenFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestElisionFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestEnglishMinimalStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestFinnishLightStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestFrenchLightStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestFrenchMinimalStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestGalicianStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestGalicianStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestGalicianStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestGalicianStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestGermanLightStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestGermanMinimalStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestGermanStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestGreekLowerCaseFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestGreekStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestHindiFilters.java b/solr/core/src/test/org/apache/solr/analysis/TestHindiFilters.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestHindiFilters.java rename to solr/core/src/test/org/apache/solr/analysis/TestHindiFilters.java diff --git a/solr/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestHungarianLightStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestHyphenationCompoundWordTokenFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestIndonesianStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestIndonesianStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestIndonesianStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestIndonesianStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestItalianLightStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestItalianLightStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestItalianLightStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestItalianLightStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestKStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestKStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestKStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestKStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestKeepFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestKeywordMarkerFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestLatvianStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestLatvianStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestLatvianStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestLatvianStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java b/solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java rename to solr/core/src/test/org/apache/solr/analysis/TestLuceneMatchVersion.java diff --git a/solr/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestMappingCharFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java b/solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java rename to solr/core/src/test/org/apache/solr/analysis/TestMultiWordSynonyms.java diff --git a/solr/src/test/org/apache/solr/analysis/TestNGramFilters.java b/solr/core/src/test/org/apache/solr/analysis/TestNGramFilters.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestNGramFilters.java rename to solr/core/src/test/org/apache/solr/analysis/TestNGramFilters.java diff --git a/solr/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceCharFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestPatternReplaceFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestPatternReplaceFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestPatternReplaceFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestPatternTokenizerFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestPersianNormalizationFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestPersianNormalizationFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestPersianNormalizationFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestPersianNormalizationFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestPhoneticFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestPorterStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestPorterStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestPorterStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestPorterStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestPortugueseLightStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestPortugueseLightStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestPortugueseLightStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestPortugueseLightStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestPortugueseMinimalStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestPortugueseMinimalStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestPortugueseMinimalStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestPortugueseMinimalStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestPortugueseStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestPortugueseStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestPortugueseStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestPortugueseStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestRemoveDuplicatesTokenFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestReverseStringFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestReverseStringFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestReverseStringFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestReverseStringFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestRussianFilters.java b/solr/core/src/test/org/apache/solr/analysis/TestRussianFilters.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestRussianFilters.java rename to solr/core/src/test/org/apache/solr/analysis/TestRussianFilters.java diff --git a/solr/src/test/org/apache/solr/analysis/TestRussianLightStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestRussianLightStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestRussianLightStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestRussianLightStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestShingleFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestShingleFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestShingleFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestShingleFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestSpanishLightStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestSpanishLightStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestSpanishLightStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestSpanishLightStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestStandardFactories.java b/solr/core/src/test/org/apache/solr/analysis/TestStandardFactories.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestStandardFactories.java rename to solr/core/src/test/org/apache/solr/analysis/TestStandardFactories.java diff --git a/solr/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestStemmerOverrideFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestStopFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestStopFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestStopFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestSwedishLightStemFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestSwedishLightStemFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestSwedishLightStemFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestSwedishLightStemFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestSynonymMap.java b/solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestSynonymMap.java rename to solr/core/src/test/org/apache/solr/analysis/TestSynonymMap.java diff --git a/solr/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestThaiWordFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestTrimFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestTrimFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestTrimFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestTrimFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestTurkishLowerCaseFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestTurkishLowerCaseFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestTurkishLowerCaseFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestTurkishLowerCaseFilterFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestUAX29URLEmailTokenizerFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestUAX29URLEmailTokenizerFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestUAX29URLEmailTokenizerFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestUAX29URLEmailTokenizerFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestWikipediaTokenizerFactory.java diff --git a/solr/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java rename to solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java diff --git a/solr/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java b/solr/core/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java similarity index 100% rename from solr/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java rename to solr/core/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java diff --git a/solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java b/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java similarity index 100% rename from solr/src/test/org/apache/solr/cloud/AbstractZkTestCase.java rename to solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java diff --git a/solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java similarity index 100% rename from solr/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java rename to solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java diff --git a/solr/src/test/org/apache/solr/cloud/BasicZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java similarity index 100% rename from solr/src/test/org/apache/solr/cloud/BasicZkTest.java rename to solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java diff --git a/solr/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java b/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java similarity index 100% rename from solr/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java rename to solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java diff --git a/solr/src/test/org/apache/solr/cloud/ZkControllerTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/cloud/ZkControllerTest.java rename to solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java diff --git a/solr/src/test/org/apache/solr/cloud/ZkNodePropsTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java similarity index 100% rename from solr/src/test/org/apache/solr/cloud/ZkNodePropsTest.java rename to solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java diff --git a/solr/src/test/org/apache/solr/cloud/ZkSolrClientTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java similarity index 100% rename from solr/src/test/org/apache/solr/cloud/ZkSolrClientTest.java rename to solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java diff --git a/solr/src/test/org/apache/solr/cloud/ZkTestServer.java b/solr/core/src/test/org/apache/solr/cloud/ZkTestServer.java similarity index 100% rename from solr/src/test/org/apache/solr/cloud/ZkTestServer.java rename to solr/core/src/test/org/apache/solr/cloud/ZkTestServer.java diff --git a/solr/src/test/org/apache/solr/core/AlternateDirectoryTest.java b/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java similarity index 100% rename from solr/src/test/org/apache/solr/core/AlternateDirectoryTest.java rename to solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java diff --git a/solr/src/test/org/apache/solr/core/DummyValueSourceParser.java b/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java similarity index 100% rename from solr/src/test/org/apache/solr/core/DummyValueSourceParser.java rename to solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java diff --git a/solr/src/test/org/apache/solr/core/FakeDeletionPolicy.java b/solr/core/src/test/org/apache/solr/core/FakeDeletionPolicy.java similarity index 100% rename from solr/src/test/org/apache/solr/core/FakeDeletionPolicy.java rename to solr/core/src/test/org/apache/solr/core/FakeDeletionPolicy.java diff --git a/solr/src/test/org/apache/solr/core/IndexReaderFactoryTest.java b/solr/core/src/test/org/apache/solr/core/IndexReaderFactoryTest.java similarity index 100% rename from solr/src/test/org/apache/solr/core/IndexReaderFactoryTest.java rename to solr/core/src/test/org/apache/solr/core/IndexReaderFactoryTest.java diff --git a/solr/src/test/org/apache/solr/core/MockCodecProviderFactory.java b/solr/core/src/test/org/apache/solr/core/MockCodecProviderFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/core/MockCodecProviderFactory.java rename to solr/core/src/test/org/apache/solr/core/MockCodecProviderFactory.java diff --git a/solr/src/test/org/apache/solr/core/MockEventListener.java b/solr/core/src/test/org/apache/solr/core/MockEventListener.java similarity index 100% rename from solr/src/test/org/apache/solr/core/MockEventListener.java rename to solr/core/src/test/org/apache/solr/core/MockEventListener.java diff --git a/solr/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java b/solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java similarity index 100% rename from solr/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java rename to solr/core/src/test/org/apache/solr/core/MockQuerySenderListenerReqHandler.java diff --git a/solr/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java similarity index 100% rename from solr/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java rename to solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java diff --git a/solr/src/test/org/apache/solr/core/RequestHandlersTest.java b/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java similarity index 100% rename from solr/src/test/org/apache/solr/core/RequestHandlersTest.java rename to solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java diff --git a/solr/src/test/org/apache/solr/core/ResourceLoaderTest.java b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java similarity index 100% rename from solr/src/test/org/apache/solr/core/ResourceLoaderTest.java rename to solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java diff --git a/solr/src/test/org/apache/solr/core/SOLR749Test.java b/solr/core/src/test/org/apache/solr/core/SOLR749Test.java similarity index 100% rename from solr/src/test/org/apache/solr/core/SOLR749Test.java rename to solr/core/src/test/org/apache/solr/core/SOLR749Test.java diff --git a/solr/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java similarity index 100% rename from solr/src/test/org/apache/solr/core/SolrCoreTest.java rename to solr/core/src/test/org/apache/solr/core/SolrCoreTest.java diff --git a/solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java b/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java rename to solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java diff --git a/solr/src/test/org/apache/solr/core/TestBadConfig.java b/solr/core/src/test/org/apache/solr/core/TestBadConfig.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestBadConfig.java rename to solr/core/src/test/org/apache/solr/core/TestBadConfig.java diff --git a/solr/src/test/org/apache/solr/core/TestCodecProviderSupport.java b/solr/core/src/test/org/apache/solr/core/TestCodecProviderSupport.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestCodecProviderSupport.java rename to solr/core/src/test/org/apache/solr/core/TestCodecProviderSupport.java diff --git a/solr/src/test/org/apache/solr/core/TestConfig.java b/solr/core/src/test/org/apache/solr/core/TestConfig.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestConfig.java rename to solr/core/src/test/org/apache/solr/core/TestConfig.java diff --git a/solr/src/test/org/apache/solr/core/TestJmxIntegration.java b/solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestJmxIntegration.java rename to solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java diff --git a/solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java b/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java rename to solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java diff --git a/solr/src/test/org/apache/solr/core/TestLegacyMergeSchedulerPolicyConfig.java b/solr/core/src/test/org/apache/solr/core/TestLegacyMergeSchedulerPolicyConfig.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestLegacyMergeSchedulerPolicyConfig.java rename to solr/core/src/test/org/apache/solr/core/TestLegacyMergeSchedulerPolicyConfig.java diff --git a/solr/src/test/org/apache/solr/core/TestMergePolicyConfig.java b/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestMergePolicyConfig.java rename to solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java diff --git a/solr/src/test/org/apache/solr/core/TestPropInject.java b/solr/core/src/test/org/apache/solr/core/TestPropInject.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestPropInject.java rename to solr/core/src/test/org/apache/solr/core/TestPropInject.java diff --git a/solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java b/solr/core/src/test/org/apache/solr/core/TestPropInjectDefaults.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestPropInjectDefaults.java rename to solr/core/src/test/org/apache/solr/core/TestPropInjectDefaults.java diff --git a/solr/src/test/org/apache/solr/core/TestQuerySenderListener.java b/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestQuerySenderListener.java rename to solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java diff --git a/solr/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java b/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java rename to solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java diff --git a/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java b/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java rename to solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java diff --git a/solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java b/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java rename to solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java diff --git a/solr/src/test/org/apache/solr/core/TestSolrXMLSerializer.java b/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestSolrXMLSerializer.java rename to solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java diff --git a/solr/src/test/org/apache/solr/core/TestXIncludeConfig.java b/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java similarity index 100% rename from solr/src/test/org/apache/solr/core/TestXIncludeConfig.java rename to solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java diff --git a/solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java b/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java rename to solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java diff --git a/solr/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java rename to solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java diff --git a/solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java rename to solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java diff --git a/solr/src/test/org/apache/solr/handler/JsonLoaderTest.java b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/JsonLoaderTest.java rename to solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java diff --git a/solr/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java rename to solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java diff --git a/solr/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java rename to solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java diff --git a/solr/src/test/org/apache/solr/handler/TestCSVLoader.java b/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/TestCSVLoader.java rename to solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java diff --git a/solr/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/TestReplicationHandler.java rename to solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java diff --git a/solr/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java rename to solr/core/src/test/org/apache/solr/handler/XmlUpdateRequestHandlerTest.java diff --git a/solr/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java rename to solr/core/src/test/org/apache/solr/handler/XsltUpdateRequestHandlerTest.java diff --git a/solr/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java rename to solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java diff --git a/solr/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java rename to solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java diff --git a/solr/src/test/org/apache/solr/handler/component/DebugComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/component/DebugComponentTest.java rename to solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java diff --git a/solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java rename to solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java diff --git a/solr/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java rename to solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java diff --git a/solr/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java b/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java rename to solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java diff --git a/solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java rename to solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java diff --git a/solr/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/component/SearchHandlerTest.java rename to solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java diff --git a/solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java rename to solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java diff --git a/solr/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/component/StatsComponentTest.java rename to solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java diff --git a/solr/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java rename to solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java diff --git a/solr/src/test/org/apache/solr/handler/component/TermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java similarity index 100% rename from solr/src/test/org/apache/solr/handler/component/TermsComponentTest.java rename to solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java diff --git a/solr/src/test/org/apache/solr/highlight/DummyHighlighter.java b/solr/core/src/test/org/apache/solr/highlight/DummyHighlighter.java similarity index 100% rename from solr/src/test/org/apache/solr/highlight/DummyHighlighter.java rename to solr/core/src/test/org/apache/solr/highlight/DummyHighlighter.java diff --git a/solr/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java b/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java similarity index 100% rename from solr/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java rename to solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java diff --git a/solr/src/test/org/apache/solr/highlight/HighlighterConfigTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java similarity index 100% rename from solr/src/test/org/apache/solr/highlight/HighlighterConfigTest.java rename to solr/core/src/test/org/apache/solr/highlight/HighlighterConfigTest.java diff --git a/solr/src/test/org/apache/solr/highlight/HighlighterTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java similarity index 100% rename from solr/src/test/org/apache/solr/highlight/HighlighterTest.java rename to solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java diff --git a/solr/src/test/org/apache/solr/request/JSONWriterTest.java b/solr/core/src/test/org/apache/solr/request/JSONWriterTest.java similarity index 100% rename from solr/src/test/org/apache/solr/request/JSONWriterTest.java rename to solr/core/src/test/org/apache/solr/request/JSONWriterTest.java diff --git a/solr/src/test/org/apache/solr/request/SimpleFacetsTest.java b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java similarity index 100% rename from solr/src/test/org/apache/solr/request/SimpleFacetsTest.java rename to solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java diff --git a/solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java b/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java similarity index 100% rename from solr/src/test/org/apache/solr/request/TestBinaryResponseWriter.java rename to solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java diff --git a/solr/src/test/org/apache/solr/request/TestFaceting.java b/solr/core/src/test/org/apache/solr/request/TestFaceting.java similarity index 100% rename from solr/src/test/org/apache/solr/request/TestFaceting.java rename to solr/core/src/test/org/apache/solr/request/TestFaceting.java diff --git a/solr/src/test/org/apache/solr/request/TestWriterPerf.java b/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java similarity index 100% rename from solr/src/test/org/apache/solr/request/TestWriterPerf.java rename to solr/core/src/test/org/apache/solr/request/TestWriterPerf.java diff --git a/solr/src/test/org/apache/solr/response/TestCSVResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java similarity index 100% rename from solr/src/test/org/apache/solr/response/TestCSVResponseWriter.java rename to solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java diff --git a/solr/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java similarity index 100% rename from solr/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java rename to solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java diff --git a/solr/src/test/org/apache/solr/schema/BadIndexSchemaTest.java b/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/BadIndexSchemaTest.java rename to solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java diff --git a/solr/src/test/org/apache/solr/schema/CopyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/CopyFieldTest.java rename to solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java diff --git a/solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java b/solr/core/src/test/org/apache/solr/schema/CustomSimilarityFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/CustomSimilarityFactory.java rename to solr/core/src/test/org/apache/solr/schema/CustomSimilarityFactory.java diff --git a/solr/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java b/solr/core/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java rename to solr/core/src/test/org/apache/solr/schema/CustomSimilarityProviderFactory.java diff --git a/solr/src/test/org/apache/solr/schema/DateFieldTest.java b/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/DateFieldTest.java rename to solr/core/src/test/org/apache/solr/schema/DateFieldTest.java diff --git a/solr/src/test/org/apache/solr/schema/IndexSchemaTest.java b/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/IndexSchemaTest.java rename to solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java diff --git a/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java b/solr/core/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java rename to solr/core/src/test/org/apache/solr/schema/MockConfigurableSimilarity.java diff --git a/solr/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java b/solr/core/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java rename to solr/core/src/test/org/apache/solr/schema/MockConfigurableSimilarityProvider.java diff --git a/solr/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java b/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java rename to solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java diff --git a/solr/src/test/org/apache/solr/schema/NumericFieldsTest.java b/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/NumericFieldsTest.java rename to solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java diff --git a/solr/src/test/org/apache/solr/schema/PolyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/PolyFieldTest.java rename to solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java diff --git a/solr/src/test/org/apache/solr/schema/RequiredFieldsTest.java b/solr/core/src/test/org/apache/solr/schema/RequiredFieldsTest.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/RequiredFieldsTest.java rename to solr/core/src/test/org/apache/solr/schema/RequiredFieldsTest.java diff --git a/solr/src/test/org/apache/solr/schema/TestBinaryField.java b/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/TestBinaryField.java rename to solr/core/src/test/org/apache/solr/schema/TestBinaryField.java diff --git a/solr/src/test/org/apache/solr/schema/TestCollationField.java b/solr/core/src/test/org/apache/solr/schema/TestCollationField.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/TestCollationField.java rename to solr/core/src/test/org/apache/solr/schema/TestCollationField.java diff --git a/solr/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java b/solr/core/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java rename to solr/core/src/test/org/apache/solr/schema/TestPerFieldSimilarity.java diff --git a/solr/src/test/org/apache/solr/schema/UUIDFieldTest.java b/solr/core/src/test/org/apache/solr/schema/UUIDFieldTest.java similarity index 100% rename from solr/src/test/org/apache/solr/schema/UUIDFieldTest.java rename to solr/core/src/test/org/apache/solr/schema/UUIDFieldTest.java diff --git a/solr/src/test/org/apache/solr/search/DocSetPerf.java b/solr/core/src/test/org/apache/solr/search/DocSetPerf.java similarity index 100% rename from solr/src/test/org/apache/solr/search/DocSetPerf.java rename to solr/core/src/test/org/apache/solr/search/DocSetPerf.java diff --git a/solr/src/test/org/apache/solr/search/FooQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/FooQParserPlugin.java similarity index 100% rename from solr/src/test/org/apache/solr/search/FooQParserPlugin.java rename to solr/core/src/test/org/apache/solr/search/FooQParserPlugin.java diff --git a/solr/src/test/org/apache/solr/search/QueryParsingTest.java b/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java similarity index 100% rename from solr/src/test/org/apache/solr/search/QueryParsingTest.java rename to solr/core/src/test/org/apache/solr/search/QueryParsingTest.java diff --git a/solr/src/test/org/apache/solr/search/SpatialFilterTest.java b/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java similarity index 100% rename from solr/src/test/org/apache/solr/search/SpatialFilterTest.java rename to solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java diff --git a/solr/src/test/org/apache/solr/search/TestDocSet.java b/solr/core/src/test/org/apache/solr/search/TestDocSet.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestDocSet.java rename to solr/core/src/test/org/apache/solr/search/TestDocSet.java diff --git a/solr/src/test/org/apache/solr/search/TestExtendedDismaxParser.java b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestExtendedDismaxParser.java rename to solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java diff --git a/solr/src/test/org/apache/solr/search/TestFastLRUCache.java b/solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestFastLRUCache.java rename to solr/core/src/test/org/apache/solr/search/TestFastLRUCache.java diff --git a/solr/src/test/org/apache/solr/search/TestFiltering.java b/solr/core/src/test/org/apache/solr/search/TestFiltering.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestFiltering.java rename to solr/core/src/test/org/apache/solr/search/TestFiltering.java diff --git a/solr/src/test/org/apache/solr/search/TestIndexSearcher.java b/solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestIndexSearcher.java rename to solr/core/src/test/org/apache/solr/search/TestIndexSearcher.java diff --git a/solr/src/test/org/apache/solr/search/TestLRUCache.java b/solr/core/src/test/org/apache/solr/search/TestLRUCache.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestLRUCache.java rename to solr/core/src/test/org/apache/solr/search/TestLRUCache.java diff --git a/solr/src/test/org/apache/solr/search/TestQueryTypes.java b/solr/core/src/test/org/apache/solr/search/TestQueryTypes.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestQueryTypes.java rename to solr/core/src/test/org/apache/solr/search/TestQueryTypes.java diff --git a/solr/src/test/org/apache/solr/search/TestQueryUtils.java b/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestQueryUtils.java rename to solr/core/src/test/org/apache/solr/search/TestQueryUtils.java diff --git a/solr/src/test/org/apache/solr/search/TestRangeQuery.java b/solr/core/src/test/org/apache/solr/search/TestRangeQuery.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestRangeQuery.java rename to solr/core/src/test/org/apache/solr/search/TestRangeQuery.java diff --git a/solr/src/test/org/apache/solr/search/TestSearchPerf.java b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestSearchPerf.java rename to solr/core/src/test/org/apache/solr/search/TestSearchPerf.java diff --git a/solr/src/test/org/apache/solr/search/TestSolrQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestSolrQueryParser.java rename to solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java diff --git a/solr/src/test/org/apache/solr/search/TestSort.java b/solr/core/src/test/org/apache/solr/search/TestSort.java similarity index 100% rename from solr/src/test/org/apache/solr/search/TestSort.java rename to solr/core/src/test/org/apache/solr/search/TestSort.java diff --git a/solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java b/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java similarity index 100% rename from solr/src/test/org/apache/solr/search/function/NvlValueSourceParser.java rename to solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java diff --git a/solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java b/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java similarity index 100% rename from solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java rename to solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java diff --git a/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java b/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java similarity index 100% rename from solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java rename to solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java diff --git a/solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java b/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java similarity index 100% rename from solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java rename to solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java diff --git a/solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java similarity index 100% rename from solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java rename to solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java diff --git a/solr/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java b/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java similarity index 100% rename from solr/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java rename to solr/core/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java diff --git a/solr/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java b/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java similarity index 100% rename from solr/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java rename to solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java diff --git a/solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java b/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java similarity index 100% rename from solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java rename to solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java diff --git a/solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java b/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java similarity index 100% rename from solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java rename to solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java diff --git a/solr/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java rename to solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java diff --git a/solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java rename to solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java diff --git a/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java rename to solr/core/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java diff --git a/solr/src/test/org/apache/solr/spelling/SampleComparator.java b/solr/core/src/test/org/apache/solr/spelling/SampleComparator.java similarity index 100% rename from solr/src/test/org/apache/solr/spelling/SampleComparator.java rename to solr/core/src/test/org/apache/solr/spelling/SampleComparator.java diff --git a/solr/src/test/org/apache/solr/spelling/SimpleQueryConverter.java b/solr/core/src/test/org/apache/solr/spelling/SimpleQueryConverter.java similarity index 100% rename from solr/src/test/org/apache/solr/spelling/SimpleQueryConverter.java rename to solr/core/src/test/org/apache/solr/spelling/SimpleQueryConverter.java diff --git a/solr/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java similarity index 100% rename from solr/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java rename to solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java diff --git a/solr/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java similarity index 100% rename from solr/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java rename to solr/core/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java diff --git a/solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java similarity index 100% rename from solr/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java rename to solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java diff --git a/solr/src/test/org/apache/solr/spelling/suggest/SuggesterFSTTest.java b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterFSTTest.java similarity index 100% rename from solr/src/test/org/apache/solr/spelling/suggest/SuggesterFSTTest.java rename to solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterFSTTest.java diff --git a/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTSTTest.java b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTSTTest.java similarity index 100% rename from solr/src/test/org/apache/solr/spelling/suggest/SuggesterTSTTest.java rename to solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTSTTest.java diff --git a/solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java similarity index 100% rename from solr/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java rename to solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java diff --git a/solr/src/test/org/apache/solr/update/AutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java similarity index 100% rename from solr/src/test/org/apache/solr/update/AutoCommitTest.java rename to solr/core/src/test/org/apache/solr/update/AutoCommitTest.java diff --git a/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java similarity index 100% rename from solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java rename to solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java diff --git a/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java similarity index 100% rename from solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java rename to solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java diff --git a/solr/src/test/org/apache/solr/update/DocumentBuilderTest.java b/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java similarity index 100% rename from solr/src/test/org/apache/solr/update/DocumentBuilderTest.java rename to solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java diff --git a/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java b/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java similarity index 100% rename from solr/src/test/org/apache/solr/update/TestIndexingPerformance.java rename to solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java diff --git a/solr/src/test/org/apache/solr/update/UpdateParamsTest.java b/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java similarity index 100% rename from solr/src/test/org/apache/solr/update/UpdateParamsTest.java rename to solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java diff --git a/solr/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java similarity index 100% rename from solr/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java rename to solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java diff --git a/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java similarity index 100% rename from solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java rename to solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java diff --git a/solr/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java similarity index 100% rename from solr/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java rename to solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java diff --git a/solr/src/test/org/apache/solr/util/BitSetPerf.java b/solr/core/src/test/org/apache/solr/util/BitSetPerf.java similarity index 100% rename from solr/src/test/org/apache/solr/util/BitSetPerf.java rename to solr/core/src/test/org/apache/solr/util/BitSetPerf.java diff --git a/solr/src/test/org/apache/solr/util/DateMathParserTest.java b/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java similarity index 100% rename from solr/src/test/org/apache/solr/util/DateMathParserTest.java rename to solr/core/src/test/org/apache/solr/util/DateMathParserTest.java diff --git a/solr/src/test/org/apache/solr/util/PrimUtilsTest.java b/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java similarity index 100% rename from solr/src/test/org/apache/solr/util/PrimUtilsTest.java rename to solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java diff --git a/solr/src/test/org/apache/solr/util/SolrPluginUtilsTest.java b/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java similarity index 100% rename from solr/src/test/org/apache/solr/util/SolrPluginUtilsTest.java rename to solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java diff --git a/solr/src/test/org/apache/solr/util/TestNumberUtils.java b/solr/core/src/test/org/apache/solr/util/TestNumberUtils.java similarity index 100% rename from solr/src/test/org/apache/solr/util/TestNumberUtils.java rename to solr/core/src/test/org/apache/solr/util/TestNumberUtils.java diff --git a/solr/src/test/org/apache/solr/util/TestUtils.java b/solr/core/src/test/org/apache/solr/util/TestUtils.java similarity index 100% rename from solr/src/test/org/apache/solr/util/TestUtils.java rename to solr/core/src/test/org/apache/solr/util/TestUtils.java diff --git a/solr/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java b/solr/core/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java similarity index 100% rename from solr/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java rename to solr/core/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java diff --git a/solr/src/dev-tools/stub-analysis-factory-maker.pl b/solr/dev-tools/stub-analysis-factory-maker.pl similarity index 100% rename from solr/src/dev-tools/stub-analysis-factory-maker.pl rename to solr/dev-tools/stub-analysis-factory-maker.pl diff --git a/solr/src/scripts/abc b/solr/scripts/abc similarity index 100% rename from solr/src/scripts/abc rename to solr/scripts/abc diff --git a/solr/src/scripts/abo b/solr/scripts/abo similarity index 100% rename from solr/src/scripts/abo rename to solr/scripts/abo diff --git a/solr/src/scripts/backup b/solr/scripts/backup similarity index 100% rename from solr/src/scripts/backup rename to solr/scripts/backup diff --git a/solr/src/scripts/backupcleaner b/solr/scripts/backupcleaner similarity index 100% rename from solr/src/scripts/backupcleaner rename to solr/scripts/backupcleaner diff --git a/solr/src/scripts/commit b/solr/scripts/commit similarity index 100% rename from solr/src/scripts/commit rename to solr/scripts/commit diff --git a/solr/src/scripts/optimize b/solr/scripts/optimize similarity index 100% rename from solr/src/scripts/optimize rename to solr/scripts/optimize diff --git a/solr/src/scripts/rsyncd-disable b/solr/scripts/rsyncd-disable similarity index 100% rename from solr/src/scripts/rsyncd-disable rename to solr/scripts/rsyncd-disable diff --git a/solr/src/scripts/rsyncd-enable b/solr/scripts/rsyncd-enable similarity index 100% rename from solr/src/scripts/rsyncd-enable rename to solr/scripts/rsyncd-enable diff --git a/solr/src/scripts/rsyncd-start b/solr/scripts/rsyncd-start similarity index 100% rename from solr/src/scripts/rsyncd-start rename to solr/scripts/rsyncd-start diff --git a/solr/src/scripts/rsyncd-stop b/solr/scripts/rsyncd-stop similarity index 100% rename from solr/src/scripts/rsyncd-stop rename to solr/scripts/rsyncd-stop diff --git a/solr/src/scripts/scripts-util b/solr/scripts/scripts-util similarity index 100% rename from solr/src/scripts/scripts-util rename to solr/scripts/scripts-util diff --git a/solr/src/scripts/snapcleaner b/solr/scripts/snapcleaner similarity index 100% rename from solr/src/scripts/snapcleaner rename to solr/scripts/snapcleaner diff --git a/solr/src/scripts/snapinstaller b/solr/scripts/snapinstaller similarity index 100% rename from solr/src/scripts/snapinstaller rename to solr/scripts/snapinstaller diff --git a/solr/src/scripts/snappuller b/solr/scripts/snappuller similarity index 100% rename from solr/src/scripts/snappuller rename to solr/scripts/snappuller diff --git a/solr/src/scripts/snappuller-disable b/solr/scripts/snappuller-disable similarity index 100% rename from solr/src/scripts/snappuller-disable rename to solr/scripts/snappuller-disable diff --git a/solr/src/scripts/snappuller-enable b/solr/scripts/snappuller-enable similarity index 100% rename from solr/src/scripts/snappuller-enable rename to solr/scripts/snappuller-enable diff --git a/solr/src/scripts/snapshooter b/solr/scripts/snapshooter similarity index 100% rename from solr/src/scripts/snapshooter rename to solr/scripts/snapshooter diff --git a/solr/src/site/README.txt b/solr/site-src/README.txt similarity index 100% rename from solr/src/site/README.txt rename to solr/site-src/README.txt diff --git a/solr/src/site/forrest.properties b/solr/site-src/forrest.properties similarity index 100% rename from solr/src/site/forrest.properties rename to solr/site-src/forrest.properties diff --git a/solr/src/site/src/documentation/classes/CatalogManager.properties b/solr/site-src/src/documentation/classes/CatalogManager.properties similarity index 100% rename from solr/src/site/src/documentation/classes/CatalogManager.properties rename to solr/site-src/src/documentation/classes/CatalogManager.properties diff --git a/solr/src/site/src/documentation/content/.htaccess b/solr/site-src/src/documentation/content/.htaccess similarity index 100% rename from solr/src/site/src/documentation/content/.htaccess rename to solr/site-src/src/documentation/content/.htaccess diff --git a/solr/src/site/src/documentation/content/xdocs/features.xml b/solr/site-src/src/documentation/content/xdocs/features.xml similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/features.xml rename to solr/site-src/src/documentation/content/xdocs/features.xml diff --git a/solr/src/site/src/documentation/content/xdocs/images/favicon.ico b/solr/site-src/src/documentation/content/xdocs/images/favicon.ico similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/images/favicon.ico rename to solr/site-src/src/documentation/content/xdocs/images/favicon.ico diff --git a/solr/src/site/src/documentation/content/xdocs/images/lucene_green_150.gif b/solr/site-src/src/documentation/content/xdocs/images/lucene_green_150.gif similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/images/lucene_green_150.gif rename to solr/site-src/src/documentation/content/xdocs/images/lucene_green_150.gif diff --git a/solr/src/site/src/documentation/content/xdocs/images/lucidworks_reference_guide.png b/solr/site-src/src/documentation/content/xdocs/images/lucidworks_reference_guide.png similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/images/lucidworks_reference_guide.png rename to solr/site-src/src/documentation/content/xdocs/images/lucidworks_reference_guide.png diff --git a/solr/src/site/src/documentation/content/xdocs/images/powered_by_solr.ai b/solr/site-src/src/documentation/content/xdocs/images/powered_by_solr.ai similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/images/powered_by_solr.ai rename to solr/site-src/src/documentation/content/xdocs/images/powered_by_solr.ai diff --git a/solr/src/site/src/documentation/content/xdocs/images/powered_by_solr.eps b/solr/site-src/src/documentation/content/xdocs/images/powered_by_solr.eps similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/images/powered_by_solr.eps rename to solr/site-src/src/documentation/content/xdocs/images/powered_by_solr.eps diff --git a/solr/src/site/src/documentation/content/xdocs/images/powered_by_solr.png b/solr/site-src/src/documentation/content/xdocs/images/powered_by_solr.png similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/images/powered_by_solr.png rename to solr/site-src/src/documentation/content/xdocs/images/powered_by_solr.png diff --git a/solr/src/site/src/documentation/content/xdocs/images/powered_by_solr.svg b/solr/site-src/src/documentation/content/xdocs/images/powered_by_solr.svg similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/images/powered_by_solr.svg rename to solr/site-src/src/documentation/content/xdocs/images/powered_by_solr.svg diff --git a/solr/src/site/src/documentation/content/xdocs/images/solr-book-image.jpg b/solr/site-src/src/documentation/content/xdocs/images/solr-book-image.jpg similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/images/solr-book-image.jpg rename to solr/site-src/src/documentation/content/xdocs/images/solr-book-image.jpg diff --git a/solr/src/site/src/documentation/content/xdocs/images/solr.jpg b/solr/site-src/src/documentation/content/xdocs/images/solr.jpg similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/images/solr.jpg rename to solr/site-src/src/documentation/content/xdocs/images/solr.jpg diff --git a/solr/src/site/src/documentation/content/xdocs/images/solr_FC.eps b/solr/site-src/src/documentation/content/xdocs/images/solr_FC.eps similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/images/solr_FC.eps rename to solr/site-src/src/documentation/content/xdocs/images/solr_FC.eps diff --git a/solr/src/site/src/documentation/content/xdocs/images/solr_FC.svg b/solr/site-src/src/documentation/content/xdocs/images/solr_FC.svg similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/images/solr_FC.svg rename to solr/site-src/src/documentation/content/xdocs/images/solr_FC.svg diff --git a/solr/src/site/src/documentation/content/xdocs/index.xml b/solr/site-src/src/documentation/content/xdocs/index.xml similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/index.xml rename to solr/site-src/src/documentation/content/xdocs/index.xml diff --git a/solr/src/site/src/documentation/content/xdocs/issue_tracking.xml b/solr/site-src/src/documentation/content/xdocs/issue_tracking.xml similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/issue_tracking.xml rename to solr/site-src/src/documentation/content/xdocs/issue_tracking.xml diff --git a/solr/src/site/src/documentation/content/xdocs/mailing_lists.xml b/solr/site-src/src/documentation/content/xdocs/mailing_lists.xml similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/mailing_lists.xml rename to solr/site-src/src/documentation/content/xdocs/mailing_lists.xml diff --git a/solr/src/site/src/documentation/content/xdocs/site.xml b/solr/site-src/src/documentation/content/xdocs/site.xml similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/site.xml rename to solr/site-src/src/documentation/content/xdocs/site.xml diff --git a/solr/src/site/src/documentation/content/xdocs/tabs.xml b/solr/site-src/src/documentation/content/xdocs/tabs.xml similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/tabs.xml rename to solr/site-src/src/documentation/content/xdocs/tabs.xml diff --git a/solr/src/site/src/documentation/content/xdocs/tutorial.xml b/solr/site-src/src/documentation/content/xdocs/tutorial.xml similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/tutorial.xml rename to solr/site-src/src/documentation/content/xdocs/tutorial.xml diff --git a/solr/src/site/src/documentation/content/xdocs/version_control.xml b/solr/site-src/src/documentation/content/xdocs/version_control.xml similarity index 100% rename from solr/src/site/src/documentation/content/xdocs/version_control.xml rename to solr/site-src/src/documentation/content/xdocs/version_control.xml diff --git a/solr/src/site/src/documentation/resources/schema/catalog.xcat b/solr/site-src/src/documentation/resources/schema/catalog.xcat similarity index 100% rename from solr/src/site/src/documentation/resources/schema/catalog.xcat rename to solr/site-src/src/documentation/resources/schema/catalog.xcat diff --git a/solr/src/site/src/documentation/skinconf.xml b/solr/site-src/src/documentation/skinconf.xml similarity index 100% rename from solr/src/site/src/documentation/skinconf.xml rename to solr/site-src/src/documentation/skinconf.xml diff --git a/solr/src/site/src/documentation/skins/common/css/forrest.css.xslt b/solr/site-src/src/documentation/skins/common/css/forrest.css.xslt similarity index 100% rename from solr/src/site/src/documentation/skins/common/css/forrest.css.xslt rename to solr/site-src/src/documentation/skins/common/css/forrest.css.xslt diff --git a/solr/src/site/src/documentation/skins/common/images/README.txt b/solr/site-src/src/documentation/skins/common/images/README.txt similarity index 100% rename from solr/src/site/src/documentation/skins/common/images/README.txt rename to solr/site-src/src/documentation/skins/common/images/README.txt diff --git a/solr/src/site/src/documentation/skins/common/images/corner-imports.svg.xslt b/solr/site-src/src/documentation/skins/common/images/corner-imports.svg.xslt similarity index 100% rename from solr/src/site/src/documentation/skins/common/images/corner-imports.svg.xslt rename to solr/site-src/src/documentation/skins/common/images/corner-imports.svg.xslt diff --git a/solr/src/site/src/documentation/skins/common/images/dc.svg.xslt b/solr/site-src/src/documentation/skins/common/images/dc.svg.xslt similarity index 100% rename from solr/src/site/src/documentation/skins/common/images/dc.svg.xslt rename to solr/site-src/src/documentation/skins/common/images/dc.svg.xslt diff --git a/solr/src/site/src/documentation/skins/common/images/poddoc.svg.xslt b/solr/site-src/src/documentation/skins/common/images/poddoc.svg.xslt similarity index 100% rename from solr/src/site/src/documentation/skins/common/images/poddoc.svg.xslt rename to solr/site-src/src/documentation/skins/common/images/poddoc.svg.xslt diff --git a/solr/src/site/src/documentation/skins/common/images/rc.svg.xslt b/solr/site-src/src/documentation/skins/common/images/rc.svg.xslt similarity index 100% rename from solr/src/site/src/documentation/skins/common/images/rc.svg.xslt rename to solr/site-src/src/documentation/skins/common/images/rc.svg.xslt diff --git a/solr/src/site/src/documentation/skins/common/images/txtdoc.svg.xslt b/solr/site-src/src/documentation/skins/common/images/txtdoc.svg.xslt similarity index 100% rename from solr/src/site/src/documentation/skins/common/images/txtdoc.svg.xslt rename to solr/site-src/src/documentation/skins/common/images/txtdoc.svg.xslt diff --git a/solr/src/site/src/documentation/skins/common/scripts/breadcrumbs-optimized.js b/solr/site-src/src/documentation/skins/common/scripts/breadcrumbs-optimized.js similarity index 100% rename from solr/src/site/src/documentation/skins/common/scripts/breadcrumbs-optimized.js rename to solr/site-src/src/documentation/skins/common/scripts/breadcrumbs-optimized.js diff --git a/solr/src/site/src/documentation/skins/common/scripts/breadcrumbs.js b/solr/site-src/src/documentation/skins/common/scripts/breadcrumbs.js similarity index 100% rename from solr/src/site/src/documentation/skins/common/scripts/breadcrumbs.js rename to solr/site-src/src/documentation/skins/common/scripts/breadcrumbs.js diff --git a/solr/src/site/src/documentation/skins/common/scripts/fontsize.js b/solr/site-src/src/documentation/skins/common/scripts/fontsize.js similarity index 100% rename from solr/src/site/src/documentation/skins/common/scripts/fontsize.js rename to solr/site-src/src/documentation/skins/common/scripts/fontsize.js diff --git a/solr/src/site/src/documentation/skins/common/scripts/getBlank.js b/solr/site-src/src/documentation/skins/common/scripts/getBlank.js similarity index 100% rename from solr/src/site/src/documentation/skins/common/scripts/getBlank.js rename to solr/site-src/src/documentation/skins/common/scripts/getBlank.js diff --git a/solr/src/site/src/documentation/skins/common/scripts/getMenu.js b/solr/site-src/src/documentation/skins/common/scripts/getMenu.js similarity index 100% rename from solr/src/site/src/documentation/skins/common/scripts/getMenu.js rename to solr/site-src/src/documentation/skins/common/scripts/getMenu.js diff --git a/solr/src/site/src/documentation/skins/common/scripts/menu.js b/solr/site-src/src/documentation/skins/common/scripts/menu.js similarity index 100% rename from solr/src/site/src/documentation/skins/common/scripts/menu.js rename to solr/site-src/src/documentation/skins/common/scripts/menu.js diff --git a/solr/src/site/src/documentation/skins/common/scripts/prototype.js b/solr/site-src/src/documentation/skins/common/scripts/prototype.js similarity index 100% rename from solr/src/site/src/documentation/skins/common/scripts/prototype.js rename to solr/site-src/src/documentation/skins/common/scripts/prototype.js diff --git a/solr/src/site/src/documentation/skins/common/skinconf.xsl b/solr/site-src/src/documentation/skins/common/skinconf.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/skinconf.xsl rename to solr/site-src/src/documentation/skins/common/skinconf.xsl diff --git a/solr/src/site/src/documentation/skins/common/translations/CommonMessages_de.xml b/solr/site-src/src/documentation/skins/common/translations/CommonMessages_de.xml similarity index 100% rename from solr/src/site/src/documentation/skins/common/translations/CommonMessages_de.xml rename to solr/site-src/src/documentation/skins/common/translations/CommonMessages_de.xml diff --git a/solr/src/site/src/documentation/skins/common/translations/CommonMessages_en_US.xml b/solr/site-src/src/documentation/skins/common/translations/CommonMessages_en_US.xml similarity index 100% rename from solr/src/site/src/documentation/skins/common/translations/CommonMessages_en_US.xml rename to solr/site-src/src/documentation/skins/common/translations/CommonMessages_en_US.xml diff --git a/solr/src/site/src/documentation/skins/common/translations/CommonMessages_es.xml b/solr/site-src/src/documentation/skins/common/translations/CommonMessages_es.xml similarity index 100% rename from solr/src/site/src/documentation/skins/common/translations/CommonMessages_es.xml rename to solr/site-src/src/documentation/skins/common/translations/CommonMessages_es.xml diff --git a/solr/src/site/src/documentation/skins/common/translations/CommonMessages_fr.xml b/solr/site-src/src/documentation/skins/common/translations/CommonMessages_fr.xml similarity index 100% rename from solr/src/site/src/documentation/skins/common/translations/CommonMessages_fr.xml rename to solr/site-src/src/documentation/skins/common/translations/CommonMessages_fr.xml diff --git a/solr/src/site/src/documentation/skins/common/xslt/fo/document-to-fo.xsl b/solr/site-src/src/documentation/skins/common/xslt/fo/document-to-fo.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/fo/document-to-fo.xsl rename to solr/site-src/src/documentation/skins/common/xslt/fo/document-to-fo.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/fo/footerinfo.xsl b/solr/site-src/src/documentation/skins/common/xslt/fo/footerinfo.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/fo/footerinfo.xsl rename to solr/site-src/src/documentation/skins/common/xslt/fo/footerinfo.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/fo/pdfoutline.xsl b/solr/site-src/src/documentation/skins/common/xslt/fo/pdfoutline.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/fo/pdfoutline.xsl rename to solr/site-src/src/documentation/skins/common/xslt/fo/pdfoutline.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/html/book-to-menu.xsl b/solr/site-src/src/documentation/skins/common/xslt/html/book-to-menu.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/html/book-to-menu.xsl rename to solr/site-src/src/documentation/skins/common/xslt/html/book-to-menu.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/html/document-to-html.xsl b/solr/site-src/src/documentation/skins/common/xslt/html/document-to-html.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/html/document-to-html.xsl rename to solr/site-src/src/documentation/skins/common/xslt/html/document-to-html.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/html/dotdots.xsl b/solr/site-src/src/documentation/skins/common/xslt/html/dotdots.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/html/dotdots.xsl rename to solr/site-src/src/documentation/skins/common/xslt/html/dotdots.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/html/pathutils.xsl b/solr/site-src/src/documentation/skins/common/xslt/html/pathutils.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/html/pathutils.xsl rename to solr/site-src/src/documentation/skins/common/xslt/html/pathutils.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/html/renderlogo.xsl b/solr/site-src/src/documentation/skins/common/xslt/html/renderlogo.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/html/renderlogo.xsl rename to solr/site-src/src/documentation/skins/common/xslt/html/renderlogo.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/html/site-to-xhtml.xsl b/solr/site-src/src/documentation/skins/common/xslt/html/site-to-xhtml.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/html/site-to-xhtml.xsl rename to solr/site-src/src/documentation/skins/common/xslt/html/site-to-xhtml.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/html/split.xsl b/solr/site-src/src/documentation/skins/common/xslt/html/split.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/html/split.xsl rename to solr/site-src/src/documentation/skins/common/xslt/html/split.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/html/strip_namespaces.xsl b/solr/site-src/src/documentation/skins/common/xslt/html/strip_namespaces.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/html/strip_namespaces.xsl rename to solr/site-src/src/documentation/skins/common/xslt/html/strip_namespaces.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/html/tab-to-menu.xsl b/solr/site-src/src/documentation/skins/common/xslt/html/tab-to-menu.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/html/tab-to-menu.xsl rename to solr/site-src/src/documentation/skins/common/xslt/html/tab-to-menu.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/html/tabutils.xsl b/solr/site-src/src/documentation/skins/common/xslt/html/tabutils.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/html/tabutils.xsl rename to solr/site-src/src/documentation/skins/common/xslt/html/tabutils.xsl diff --git a/solr/src/site/src/documentation/skins/common/xslt/svg/document-to-svg.xsl b/solr/site-src/src/documentation/skins/common/xslt/svg/document-to-svg.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/common/xslt/svg/document-to-svg.xsl rename to solr/site-src/src/documentation/skins/common/xslt/svg/document-to-svg.xsl diff --git a/solr/src/site/src/documentation/skins/lucene/css/basic.css b/solr/site-src/src/documentation/skins/lucene/css/basic.css similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/css/basic.css rename to solr/site-src/src/documentation/skins/lucene/css/basic.css diff --git a/solr/src/site/src/documentation/skins/lucene/css/print.css b/solr/site-src/src/documentation/skins/lucene/css/print.css similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/css/print.css rename to solr/site-src/src/documentation/skins/lucene/css/print.css diff --git a/solr/src/site/src/documentation/skins/lucene/css/profile.css.xslt b/solr/site-src/src/documentation/skins/lucene/css/profile.css.xslt similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/css/profile.css.xslt rename to solr/site-src/src/documentation/skins/lucene/css/profile.css.xslt diff --git a/solr/src/site/src/documentation/skins/lucene/css/screen.css b/solr/site-src/src/documentation/skins/lucene/css/screen.css similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/css/screen.css rename to solr/site-src/src/documentation/skins/lucene/css/screen.css diff --git a/solr/src/site/src/documentation/skins/lucene/images/chapter.gif b/solr/site-src/src/documentation/skins/lucene/images/chapter.gif similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/chapter.gif rename to solr/site-src/src/documentation/skins/lucene/images/chapter.gif diff --git a/solr/src/site/src/documentation/skins/lucene/images/chapter_open.gif b/solr/site-src/src/documentation/skins/lucene/images/chapter_open.gif similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/chapter_open.gif rename to solr/site-src/src/documentation/skins/lucene/images/chapter_open.gif diff --git a/solr/src/site/src/documentation/skins/lucene/images/current.gif b/solr/site-src/src/documentation/skins/lucene/images/current.gif similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/current.gif rename to solr/site-src/src/documentation/skins/lucene/images/current.gif diff --git a/solr/src/site/src/documentation/skins/lucene/images/error.png b/solr/site-src/src/documentation/skins/lucene/images/error.png similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/error.png rename to solr/site-src/src/documentation/skins/lucene/images/error.png diff --git a/solr/src/site/src/documentation/skins/lucene/images/header_white_line.gif b/solr/site-src/src/documentation/skins/lucene/images/header_white_line.gif similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/header_white_line.gif rename to solr/site-src/src/documentation/skins/lucene/images/header_white_line.gif diff --git a/solr/src/site/src/documentation/skins/lucene/images/info.png b/solr/site-src/src/documentation/skins/lucene/images/info.png similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/info.png rename to solr/site-src/src/documentation/skins/lucene/images/info.png diff --git a/solr/src/site/src/documentation/skins/lucene/images/instruction_arrow.png b/solr/site-src/src/documentation/skins/lucene/images/instruction_arrow.png similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/instruction_arrow.png rename to solr/site-src/src/documentation/skins/lucene/images/instruction_arrow.png diff --git a/solr/src/site/src/documentation/skins/lucene/images/label.gif b/solr/site-src/src/documentation/skins/lucene/images/label.gif similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/label.gif rename to solr/site-src/src/documentation/skins/lucene/images/label.gif diff --git a/solr/src/site/src/documentation/skins/lucene/images/page.gif b/solr/site-src/src/documentation/skins/lucene/images/page.gif similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/page.gif rename to solr/site-src/src/documentation/skins/lucene/images/page.gif diff --git a/solr/src/site/src/documentation/skins/lucene/images/pdfdoc.gif b/solr/site-src/src/documentation/skins/lucene/images/pdfdoc.gif similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/pdfdoc.gif rename to solr/site-src/src/documentation/skins/lucene/images/pdfdoc.gif diff --git a/solr/src/site/src/documentation/skins/lucene/images/printer.gif b/solr/site-src/src/documentation/skins/lucene/images/printer.gif similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/printer.gif rename to solr/site-src/src/documentation/skins/lucene/images/printer.gif diff --git a/solr/src/site/src/documentation/skins/lucene/images/success.png b/solr/site-src/src/documentation/skins/lucene/images/success.png similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/success.png rename to solr/site-src/src/documentation/skins/lucene/images/success.png diff --git a/solr/src/site/src/documentation/skins/lucene/images/warning.png b/solr/site-src/src/documentation/skins/lucene/images/warning.png similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/warning.png rename to solr/site-src/src/documentation/skins/lucene/images/warning.png diff --git a/solr/src/site/src/documentation/skins/lucene/images/xmldoc.gif b/solr/site-src/src/documentation/skins/lucene/images/xmldoc.gif similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/images/xmldoc.gif rename to solr/site-src/src/documentation/skins/lucene/images/xmldoc.gif diff --git a/solr/src/site/src/documentation/skins/lucene/note.txt b/solr/site-src/src/documentation/skins/lucene/note.txt similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/note.txt rename to solr/site-src/src/documentation/skins/lucene/note.txt diff --git a/solr/src/site/src/documentation/skins/lucene/skinconf.xsl b/solr/site-src/src/documentation/skins/lucene/skinconf.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/skinconf.xsl rename to solr/site-src/src/documentation/skins/lucene/skinconf.xsl diff --git a/solr/src/site/src/documentation/skins/lucene/xslt/fo/document-to-fo.xsl b/solr/site-src/src/documentation/skins/lucene/xslt/fo/document-to-fo.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/xslt/fo/document-to-fo.xsl rename to solr/site-src/src/documentation/skins/lucene/xslt/fo/document-to-fo.xsl diff --git a/solr/src/site/src/documentation/skins/lucene/xslt/html/book-to-menu.xsl b/solr/site-src/src/documentation/skins/lucene/xslt/html/book-to-menu.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/xslt/html/book-to-menu.xsl rename to solr/site-src/src/documentation/skins/lucene/xslt/html/book-to-menu.xsl diff --git a/solr/src/site/src/documentation/skins/lucene/xslt/html/document-to-html.xsl b/solr/site-src/src/documentation/skins/lucene/xslt/html/document-to-html.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/xslt/html/document-to-html.xsl rename to solr/site-src/src/documentation/skins/lucene/xslt/html/document-to-html.xsl diff --git a/solr/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl b/solr/site-src/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl rename to solr/site-src/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl diff --git a/solr/src/site/src/documentation/skins/lucene/xslt/html/tab-to-menu.xsl b/solr/site-src/src/documentation/skins/lucene/xslt/html/tab-to-menu.xsl similarity index 100% rename from solr/src/site/src/documentation/skins/lucene/xslt/html/tab-to-menu.xsl rename to solr/site-src/src/documentation/skins/lucene/xslt/html/tab-to-menu.xsl diff --git a/solr/src/solrj/org/apache/solr/client/solrj/ResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/ResponseParser.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/SolrQuery.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/SolrQuery.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/SolrRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/SolrRequest.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/SolrResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrResponse.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/SolrResponse.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/SolrResponse.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/SolrServer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/SolrServer.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/SolrServer.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/SolrServerException.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServerException.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/SolrServerException.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/SolrServerException.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/StreamingResponseCallback.java b/solr/solrj/src/java/org/apache/solr/client/solrj/StreamingResponseCallback.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/StreamingResponseCallback.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/StreamingResponseCallback.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/beans/DocumentObjectBinder.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/beans/Field.java b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/Field.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/beans/Field.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/beans/Field.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryResponseParser.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/impl/BinaryResponseParser.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryResponseParser.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/CloudSolrServer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/impl/CloudSolrServer.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingBinaryResponseParser.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/impl/XMLResponseParser.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/CoreAdminRequest.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/DirectXmlRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/DirectXmlRequest.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/LukeRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/LukeRequest.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/LukeRequest.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/LukeRequest.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/QueryRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/QueryRequest.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/QueryRequest.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/QueryRequest.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/RequestWriter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/RequestWriter.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/SolrPing.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrPing.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/SolrPing.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrPing.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/request/UpdateRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/request/UpdateRequest.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/AnalysisResponseBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/AnalysisResponseBase.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/AnalysisResponseBase.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/AnalysisResponseBase.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/CoreAdminResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/CoreAdminResponse.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/FacetField.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/FacetField.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/FacetField.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/FacetField.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldStatsInfo.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/FieldStatsInfo.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldStatsInfo.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/LukeResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/LukeResponse.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/LukeResponse.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/LukeResponse.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/PivotField.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/PivotField.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/PivotField.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/PivotField.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/QueryResponse.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/SolrPingResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrPingResponse.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/SolrPingResponse.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrPingResponse.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/SolrResponseBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrResponseBase.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/SolrResponseBase.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrResponseBase.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/SpellCheckResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/SpellCheckResponse.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/TermsResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/TermsResponse.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/TermsResponse.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/TermsResponse.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/response/UpdateResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/UpdateResponse.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/response/UpdateResponse.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/response/UpdateResponse.java diff --git a/solr/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java b/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java similarity index 100% rename from solr/src/solrj/org/apache/solr/client/solrj/util/ClientUtils.java rename to solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java diff --git a/solr/src/common/org/apache/solr/common/ResourceLoader.java b/solr/solrj/src/java/org/apache/solr/common/ResourceLoader.java similarity index 100% rename from solr/src/common/org/apache/solr/common/ResourceLoader.java rename to solr/solrj/src/java/org/apache/solr/common/ResourceLoader.java diff --git a/solr/src/common/org/apache/solr/common/SolrDocument.java b/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java similarity index 100% rename from solr/src/common/org/apache/solr/common/SolrDocument.java rename to solr/solrj/src/java/org/apache/solr/common/SolrDocument.java diff --git a/solr/src/common/org/apache/solr/common/SolrDocumentList.java b/solr/solrj/src/java/org/apache/solr/common/SolrDocumentList.java similarity index 100% rename from solr/src/common/org/apache/solr/common/SolrDocumentList.java rename to solr/solrj/src/java/org/apache/solr/common/SolrDocumentList.java diff --git a/solr/src/common/org/apache/solr/common/SolrException.java b/solr/solrj/src/java/org/apache/solr/common/SolrException.java similarity index 100% rename from solr/src/common/org/apache/solr/common/SolrException.java rename to solr/solrj/src/java/org/apache/solr/common/SolrException.java diff --git a/solr/src/common/org/apache/solr/common/SolrInputDocument.java b/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java similarity index 100% rename from solr/src/common/org/apache/solr/common/SolrInputDocument.java rename to solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java diff --git a/solr/src/common/org/apache/solr/common/SolrInputField.java b/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java similarity index 100% rename from solr/src/common/org/apache/solr/common/SolrInputField.java rename to solr/solrj/src/java/org/apache/solr/common/SolrInputField.java diff --git a/solr/src/common/org/apache/solr/common/cloud/CloudState.java b/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java similarity index 100% rename from solr/src/common/org/apache/solr/common/cloud/CloudState.java rename to solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java diff --git a/solr/src/common/org/apache/solr/common/cloud/ConnectionManager.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java similarity index 100% rename from solr/src/common/org/apache/solr/common/cloud/ConnectionManager.java rename to solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java diff --git a/solr/src/common/org/apache/solr/common/cloud/DefaultConnectionStrategy.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java similarity index 100% rename from solr/src/common/org/apache/solr/common/cloud/DefaultConnectionStrategy.java rename to solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java diff --git a/solr/src/common/org/apache/solr/common/cloud/OnReconnect.java b/solr/solrj/src/java/org/apache/solr/common/cloud/OnReconnect.java similarity index 100% rename from solr/src/common/org/apache/solr/common/cloud/OnReconnect.java rename to solr/solrj/src/java/org/apache/solr/common/cloud/OnReconnect.java diff --git a/solr/src/common/org/apache/solr/common/cloud/Slice.java b/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java similarity index 100% rename from solr/src/common/org/apache/solr/common/cloud/Slice.java rename to solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java diff --git a/solr/src/common/org/apache/solr/common/cloud/SolrZkClient.java b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java similarity index 100% rename from solr/src/common/org/apache/solr/common/cloud/SolrZkClient.java rename to solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java diff --git a/solr/src/common/org/apache/solr/common/cloud/SolrZooKeeper.java b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java similarity index 100% rename from solr/src/common/org/apache/solr/common/cloud/SolrZooKeeper.java rename to solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java diff --git a/solr/src/common/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java similarity index 100% rename from solr/src/common/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java rename to solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java diff --git a/solr/src/common/org/apache/solr/common/cloud/ZkNodeProps.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java similarity index 100% rename from solr/src/common/org/apache/solr/common/cloud/ZkNodeProps.java rename to solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java diff --git a/solr/src/common/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java similarity index 100% rename from solr/src/common/org/apache/solr/common/cloud/ZkStateReader.java rename to solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java diff --git a/solr/src/common/org/apache/solr/common/cloud/ZooKeeperException.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZooKeeperException.java similarity index 100% rename from solr/src/common/org/apache/solr/common/cloud/ZooKeeperException.java rename to solr/solrj/src/java/org/apache/solr/common/cloud/ZooKeeperException.java diff --git a/solr/src/common/org/apache/solr/common/luke/FieldFlag.java b/solr/solrj/src/java/org/apache/solr/common/luke/FieldFlag.java similarity index 100% rename from solr/src/common/org/apache/solr/common/luke/FieldFlag.java rename to solr/solrj/src/java/org/apache/solr/common/luke/FieldFlag.java diff --git a/solr/src/common/org/apache/solr/common/params/AnalysisParams.java b/solr/solrj/src/java/org/apache/solr/common/params/AnalysisParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/AnalysisParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/AnalysisParams.java diff --git a/solr/src/common/org/apache/solr/common/params/AppendedSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/AppendedSolrParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/AppendedSolrParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/AppendedSolrParams.java diff --git a/solr/src/common/org/apache/solr/common/params/CommonParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/CommonParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java diff --git a/solr/src/common/org/apache/solr/common/params/CoreAdminParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/CoreAdminParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java diff --git a/solr/src/common/org/apache/solr/common/params/DefaultSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/DefaultSolrParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/DefaultSolrParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/DefaultSolrParams.java diff --git a/solr/src/common/org/apache/solr/common/params/DisMaxParams.java b/solr/solrj/src/java/org/apache/solr/common/params/DisMaxParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/DisMaxParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/DisMaxParams.java diff --git a/solr/src/common/org/apache/solr/common/params/EventParams.java b/solr/solrj/src/java/org/apache/solr/common/params/EventParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/EventParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/EventParams.java diff --git a/solr/src/common/org/apache/solr/common/params/FacetParams.java b/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/FacetParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java diff --git a/solr/src/common/org/apache/solr/common/params/GroupParams.java b/solr/solrj/src/java/org/apache/solr/common/params/GroupParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/GroupParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/GroupParams.java diff --git a/solr/src/common/org/apache/solr/common/params/HighlightParams.java b/solr/solrj/src/java/org/apache/solr/common/params/HighlightParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/HighlightParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/HighlightParams.java diff --git a/solr/src/common/org/apache/solr/common/params/MapSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/MapSolrParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/MapSolrParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/MapSolrParams.java diff --git a/solr/src/common/org/apache/solr/common/params/ModifiableSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/ModifiableSolrParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/ModifiableSolrParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/ModifiableSolrParams.java diff --git a/solr/src/common/org/apache/solr/common/params/MoreLikeThisParams.java b/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/MoreLikeThisParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java diff --git a/solr/src/common/org/apache/solr/common/params/MultiMapSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/MultiMapSolrParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/MultiMapSolrParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/MultiMapSolrParams.java diff --git a/solr/src/common/org/apache/solr/common/params/QueryElevationParams.java b/solr/solrj/src/java/org/apache/solr/common/params/QueryElevationParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/QueryElevationParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/QueryElevationParams.java diff --git a/solr/src/common/org/apache/solr/common/params/RequiredSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/RequiredSolrParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/RequiredSolrParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/RequiredSolrParams.java diff --git a/solr/src/common/org/apache/solr/common/params/ShardParams.java b/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/ShardParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java diff --git a/solr/src/common/org/apache/solr/common/params/SolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/SolrParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/SolrParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/SolrParams.java diff --git a/solr/src/common/org/apache/solr/common/params/SpatialParams.java b/solr/solrj/src/java/org/apache/solr/common/params/SpatialParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/SpatialParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/SpatialParams.java diff --git a/solr/src/common/org/apache/solr/common/params/SpellingParams.java b/solr/solrj/src/java/org/apache/solr/common/params/SpellingParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/SpellingParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/SpellingParams.java diff --git a/solr/src/common/org/apache/solr/common/params/StatsParams.java b/solr/solrj/src/java/org/apache/solr/common/params/StatsParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/StatsParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/StatsParams.java diff --git a/solr/src/common/org/apache/solr/common/params/TermVectorParams.java b/solr/solrj/src/java/org/apache/solr/common/params/TermVectorParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/TermVectorParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/TermVectorParams.java diff --git a/solr/src/common/org/apache/solr/common/params/TermsParams.java b/solr/solrj/src/java/org/apache/solr/common/params/TermsParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/TermsParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/TermsParams.java diff --git a/solr/src/common/org/apache/solr/common/params/UpdateParams.java b/solr/solrj/src/java/org/apache/solr/common/params/UpdateParams.java similarity index 100% rename from solr/src/common/org/apache/solr/common/params/UpdateParams.java rename to solr/solrj/src/java/org/apache/solr/common/params/UpdateParams.java diff --git a/solr/src/common/org/apache/solr/common/util/Base64.java b/solr/solrj/src/java/org/apache/solr/common/util/Base64.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/Base64.java rename to solr/solrj/src/java/org/apache/solr/common/util/Base64.java diff --git a/solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java b/solr/solrj/src/java/org/apache/solr/common/util/ConcurrentLRUCache.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/ConcurrentLRUCache.java rename to solr/solrj/src/java/org/apache/solr/common/util/ConcurrentLRUCache.java diff --git a/solr/src/common/org/apache/solr/common/util/ContentStream.java b/solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/ContentStream.java rename to solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java diff --git a/solr/src/common/org/apache/solr/common/util/ContentStreamBase.java b/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/ContentStreamBase.java rename to solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java diff --git a/solr/src/common/org/apache/solr/common/util/DOMUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/DOMUtil.java rename to solr/solrj/src/java/org/apache/solr/common/util/DOMUtil.java diff --git a/solr/src/common/org/apache/solr/common/util/DateUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/DateUtil.java rename to solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java diff --git a/solr/src/common/org/apache/solr/common/util/FastInputStream.java b/solr/solrj/src/java/org/apache/solr/common/util/FastInputStream.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/FastInputStream.java rename to solr/solrj/src/java/org/apache/solr/common/util/FastInputStream.java diff --git a/solr/src/common/org/apache/solr/common/util/FastOutputStream.java b/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/FastOutputStream.java rename to solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java diff --git a/solr/src/common/org/apache/solr/common/util/FastWriter.java b/solr/solrj/src/java/org/apache/solr/common/util/FastWriter.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/FastWriter.java rename to solr/solrj/src/java/org/apache/solr/common/util/FastWriter.java diff --git a/solr/src/common/org/apache/solr/common/util/FileUtils.java b/solr/solrj/src/java/org/apache/solr/common/util/FileUtils.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/FileUtils.java rename to solr/solrj/src/java/org/apache/solr/common/util/FileUtils.java diff --git a/solr/src/common/org/apache/solr/common/util/Hash.java b/solr/solrj/src/java/org/apache/solr/common/util/Hash.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/Hash.java rename to solr/solrj/src/java/org/apache/solr/common/util/Hash.java diff --git a/solr/src/common/org/apache/solr/common/util/IteratorChain.java b/solr/solrj/src/java/org/apache/solr/common/util/IteratorChain.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/IteratorChain.java rename to solr/solrj/src/java/org/apache/solr/common/util/IteratorChain.java diff --git a/solr/src/common/org/apache/solr/common/util/JavaBinCodec.java b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/JavaBinCodec.java rename to solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java diff --git a/solr/src/common/org/apache/solr/common/util/NamedList.java b/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/NamedList.java rename to solr/solrj/src/java/org/apache/solr/common/util/NamedList.java diff --git a/solr/src/common/org/apache/solr/common/util/RTimer.java b/solr/solrj/src/java/org/apache/solr/common/util/RTimer.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/RTimer.java rename to solr/solrj/src/java/org/apache/solr/common/util/RTimer.java diff --git a/solr/src/common/org/apache/solr/common/util/RegexFileFilter.java b/solr/solrj/src/java/org/apache/solr/common/util/RegexFileFilter.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/RegexFileFilter.java rename to solr/solrj/src/java/org/apache/solr/common/util/RegexFileFilter.java diff --git a/solr/src/common/org/apache/solr/common/util/SimpleOrderedMap.java b/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/SimpleOrderedMap.java rename to solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java diff --git a/solr/src/common/org/apache/solr/common/util/StrUtils.java b/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/StrUtils.java rename to solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java diff --git a/solr/src/common/org/apache/solr/common/util/SystemIdResolver.java b/solr/solrj/src/java/org/apache/solr/common/util/SystemIdResolver.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/SystemIdResolver.java rename to solr/solrj/src/java/org/apache/solr/common/util/SystemIdResolver.java diff --git a/solr/src/common/org/apache/solr/common/util/XML.java b/solr/solrj/src/java/org/apache/solr/common/util/XML.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/XML.java rename to solr/solrj/src/java/org/apache/solr/common/util/XML.java diff --git a/solr/src/common/org/apache/solr/common/util/XMLErrorLogger.java b/solr/solrj/src/java/org/apache/solr/common/util/XMLErrorLogger.java similarity index 100% rename from solr/src/common/org/apache/solr/common/util/XMLErrorLogger.java rename to solr/solrj/src/java/org/apache/solr/common/util/XMLErrorLogger.java diff --git a/solr/solrj/src/test-files/README b/solr/solrj/src/test-files/README new file mode 100644 index 00000000000..10f878acccb --- /dev/null +++ b/solr/solrj/src/test-files/README @@ -0,0 +1,21 @@ + + +This directory is where any non-transient, non-java files needed +for the execution of tests should live. + +It is used as the CWD when running JUnit tests. diff --git a/solr/src/test-files/books.csv b/solr/solrj/src/test-files/books.csv similarity index 100% rename from solr/src/test-files/books.csv rename to solr/solrj/src/test-files/books.csv diff --git a/solr/src/test-files/sampleDateFacetResponse.xml b/solr/solrj/src/test-files/sampleDateFacetResponse.xml similarity index 100% rename from solr/src/test-files/sampleDateFacetResponse.xml rename to solr/solrj/src/test-files/sampleDateFacetResponse.xml diff --git a/solr/solrj/src/test-files/solr/conf/schema-replication1.xml b/solr/solrj/src/test-files/solr/conf/schema-replication1.xml new file mode 100644 index 00000000000..48ecd9fd2b7 --- /dev/null +++ b/solr/solrj/src/test-files/solr/conf/schema-replication1.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + id + + diff --git a/solr/solrj/src/test-files/solr/conf/schema.xml b/solr/solrj/src/test-files/solr/conf/schema.xml new file mode 100644 index 00000000000..f0fa272ff2b --- /dev/null +++ b/solr/solrj/src/test-files/solr/conf/schema.xml @@ -0,0 +1,657 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + is there an echo? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text + id + + + + + + + + + + + + + + + + + + + + + + + + + + + + + is there an echo? + + + + + I am your default sim + + diff --git a/solr/solrj/src/test-files/solr/conf/solrconfig-slave1.xml b/solr/solrj/src/test-files/solr/conf/solrconfig-slave1.xml new file mode 100644 index 00000000000..46c1cb49e6f --- /dev/null +++ b/solr/solrj/src/test-files/solr/conf/solrconfig-slave1.xml @@ -0,0 +1,88 @@ + + + + + + + + ${tests.luceneMatchVersion:LUCENE_CURRENT} + ${solr.data.dir:} + + + false + 10 + 32 + 2147483647 + 10000 + 1000 + 10000 + + 1000 + 10000 + + single + + + + false + 10 + 32 + 2147483647 + 10000 + + true + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + max-age=30, public + + + + diff --git a/solr/solrj/src/test-files/solr/crazy-path-to-schema.xml b/solr/solrj/src/test-files/solr/crazy-path-to-schema.xml new file mode 100644 index 00000000000..b71c9f4eb94 --- /dev/null +++ b/solr/solrj/src/test-files/solr/crazy-path-to-schema.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + subject + id + diff --git a/solr/src/test-files/solr/shared/conf/schema.xml b/solr/solrj/src/test-files/solr/shared/conf/schema.xml similarity index 100% rename from solr/src/test-files/solr/shared/conf/schema.xml rename to solr/solrj/src/test-files/solr/shared/conf/schema.xml diff --git a/solr/src/test-files/solr/shared/conf/solrconfig.xml b/solr/solrj/src/test-files/solr/shared/conf/solrconfig.xml similarity index 100% rename from solr/src/test-files/solr/shared/conf/solrconfig.xml rename to solr/solrj/src/test-files/solr/shared/conf/solrconfig.xml diff --git a/solr/src/test-files/solr/shared/conf/stopwords-en.txt b/solr/solrj/src/test-files/solr/shared/conf/stopwords-en.txt similarity index 100% rename from solr/src/test-files/solr/shared/conf/stopwords-en.txt rename to solr/solrj/src/test-files/solr/shared/conf/stopwords-en.txt diff --git a/solr/src/test-files/solr/shared/conf/stopwords-fr.txt b/solr/solrj/src/test-files/solr/shared/conf/stopwords-fr.txt similarity index 100% rename from solr/src/test-files/solr/shared/conf/stopwords-fr.txt rename to solr/solrj/src/test-files/solr/shared/conf/stopwords-fr.txt diff --git a/solr/src/test-files/solr/shared/solr.xml b/solr/solrj/src/test-files/solr/shared/solr.xml similarity index 100% rename from solr/src/test-files/solr/shared/solr.xml rename to solr/solrj/src/test-files/solr/shared/solr.xml diff --git a/solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java diff --git a/solr/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java diff --git a/solr/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java diff --git a/solr/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java diff --git a/solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java diff --git a/solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/SolrQueryTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/StartSolrJetty.java b/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/StartSolrJetty.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java diff --git a/solr/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java diff --git a/solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java diff --git a/solr/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java b/solr/solrj/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java diff --git a/solr/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java diff --git a/solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java diff --git a/solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java diff --git a/solr/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java rename to solr/solrj/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java diff --git a/solr/src/test/org/apache/solr/common/SolrDocumentTest.java b/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java similarity index 100% rename from solr/src/test/org/apache/solr/common/SolrDocumentTest.java rename to solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java diff --git a/solr/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java b/solr/solrj/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java similarity index 100% rename from solr/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java rename to solr/solrj/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java diff --git a/solr/src/test/org/apache/solr/common/params/SolrParamTest.java b/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java similarity index 100% rename from solr/src/test/org/apache/solr/common/params/SolrParamTest.java rename to solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java diff --git a/solr/src/test/org/apache/solr/common/util/ContentStreamTest.java b/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java similarity index 100% rename from solr/src/test/org/apache/solr/common/util/ContentStreamTest.java rename to solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java diff --git a/solr/src/test/org/apache/solr/common/util/DOMUtilTest.java b/solr/solrj/src/test/org/apache/solr/common/util/DOMUtilTest.java similarity index 100% rename from solr/src/test/org/apache/solr/common/util/DOMUtilTest.java rename to solr/solrj/src/test/org/apache/solr/common/util/DOMUtilTest.java diff --git a/solr/src/test/org/apache/solr/common/util/FileUtilsTest.java b/solr/solrj/src/test/org/apache/solr/common/util/FileUtilsTest.java similarity index 100% rename from solr/src/test/org/apache/solr/common/util/FileUtilsTest.java rename to solr/solrj/src/test/org/apache/solr/common/util/FileUtilsTest.java diff --git a/solr/src/test/org/apache/solr/common/util/IteratorChainTest.java b/solr/solrj/src/test/org/apache/solr/common/util/IteratorChainTest.java similarity index 100% rename from solr/src/test/org/apache/solr/common/util/IteratorChainTest.java rename to solr/solrj/src/test/org/apache/solr/common/util/IteratorChainTest.java diff --git a/solr/src/test/org/apache/solr/common/util/NamedListTest.java b/solr/solrj/src/test/org/apache/solr/common/util/NamedListTest.java similarity index 100% rename from solr/src/test/org/apache/solr/common/util/NamedListTest.java rename to solr/solrj/src/test/org/apache/solr/common/util/NamedListTest.java diff --git a/solr/src/test/org/apache/solr/common/util/TestFastInputStream.java b/solr/solrj/src/test/org/apache/solr/common/util/TestFastInputStream.java similarity index 100% rename from solr/src/test/org/apache/solr/common/util/TestFastInputStream.java rename to solr/solrj/src/test/org/apache/solr/common/util/TestFastInputStream.java diff --git a/solr/src/test/org/apache/solr/common/util/TestHash.java b/solr/solrj/src/test/org/apache/solr/common/util/TestHash.java similarity index 100% rename from solr/src/test/org/apache/solr/common/util/TestHash.java rename to solr/solrj/src/test/org/apache/solr/common/util/TestHash.java diff --git a/solr/src/test/org/apache/solr/common/util/TestJavaBinCodec.java b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java similarity index 100% rename from solr/src/test/org/apache/solr/common/util/TestJavaBinCodec.java rename to solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java diff --git a/solr/src/test/org/apache/solr/common/util/TestNamedListCodec.java b/solr/solrj/src/test/org/apache/solr/common/util/TestNamedListCodec.java similarity index 100% rename from solr/src/test/org/apache/solr/common/util/TestNamedListCodec.java rename to solr/solrj/src/test/org/apache/solr/common/util/TestNamedListCodec.java diff --git a/solr/src/test/org/apache/solr/common/util/TestSystemIdResolver.java b/solr/solrj/src/test/org/apache/solr/common/util/TestSystemIdResolver.java similarity index 100% rename from solr/src/test/org/apache/solr/common/util/TestSystemIdResolver.java rename to solr/solrj/src/test/org/apache/solr/common/util/TestSystemIdResolver.java diff --git a/solr/src/test/org/apache/solr/common/util/TestXMLEscaping.java b/solr/solrj/src/test/org/apache/solr/common/util/TestXMLEscaping.java similarity index 100% rename from solr/src/test/org/apache/solr/common/util/TestXMLEscaping.java rename to solr/solrj/src/test/org/apache/solr/common/util/TestXMLEscaping.java diff --git a/solr/src/test-framework/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java similarity index 100% rename from solr/src/test-framework/org/apache/solr/BaseDistributedSearchTestCase.java rename to solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java diff --git a/solr/src/test-framework/org/apache/solr/JSONTestUtil.java b/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java similarity index 100% rename from solr/src/test-framework/org/apache/solr/JSONTestUtil.java rename to solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java diff --git a/solr/src/test/org/apache/solr/client/solrj/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java similarity index 100% rename from solr/src/test/org/apache/solr/client/solrj/SolrJettyTestBase.java rename to solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java diff --git a/solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java similarity index 100% rename from solr/src/test-framework/org/apache/solr/SolrTestCaseJ4.java rename to solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java diff --git a/solr/src/test-framework/org/apache/solr/analysis/BaseTokenTestCase.java b/solr/test-framework/src/java/org/apache/solr/analysis/BaseTokenTestCase.java similarity index 100% rename from solr/src/test-framework/org/apache/solr/analysis/BaseTokenTestCase.java rename to solr/test-framework/src/java/org/apache/solr/analysis/BaseTokenTestCase.java diff --git a/solr/src/test-framework/org/apache/solr/core/MockDirectoryFactory.java b/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java similarity index 100% rename from solr/src/test-framework/org/apache/solr/core/MockDirectoryFactory.java rename to solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java diff --git a/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java similarity index 100% rename from solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java rename to solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java diff --git a/solr/src/test/org/apache/solr/util/ExternalPaths.java b/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java similarity index 100% rename from solr/src/test/org/apache/solr/util/ExternalPaths.java rename to solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java diff --git a/solr/src/test-framework/org/apache/solr/util/TestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java similarity index 100% rename from solr/src/test-framework/org/apache/solr/util/TestHarness.java rename to solr/test-framework/src/java/org/apache/solr/util/TestHarness.java diff --git a/solr/src/webapp/web/WEB-INF/web.xml b/solr/webapp/web/WEB-INF/web.xml similarity index 100% rename from solr/src/webapp/web/WEB-INF/web.xml rename to solr/webapp/web/WEB-INF/web.xml diff --git a/solr/src/webapp/web/WEB-INF/weblogic.xml b/solr/webapp/web/WEB-INF/weblogic.xml similarity index 100% rename from solr/src/webapp/web/WEB-INF/weblogic.xml rename to solr/webapp/web/WEB-INF/weblogic.xml diff --git a/solr/src/webapp/web/admin/_info.jsp b/solr/webapp/web/admin/_info.jsp similarity index 100% rename from solr/src/webapp/web/admin/_info.jsp rename to solr/webapp/web/admin/_info.jsp diff --git a/solr/src/webapp/web/admin/action.jsp b/solr/webapp/web/admin/action.jsp similarity index 100% rename from solr/src/webapp/web/admin/action.jsp rename to solr/webapp/web/admin/action.jsp diff --git a/solr/src/webapp/web/admin/analysis.jsp b/solr/webapp/web/admin/analysis.jsp similarity index 100% rename from solr/src/webapp/web/admin/analysis.jsp rename to solr/webapp/web/admin/analysis.jsp diff --git a/solr/src/webapp/web/admin/analysis.xsl b/solr/webapp/web/admin/analysis.xsl similarity index 100% rename from solr/src/webapp/web/admin/analysis.xsl rename to solr/webapp/web/admin/analysis.xsl diff --git a/solr/src/webapp/web/admin/distributiondump.jsp b/solr/webapp/web/admin/distributiondump.jsp similarity index 100% rename from solr/src/webapp/web/admin/distributiondump.jsp rename to solr/webapp/web/admin/distributiondump.jsp diff --git a/solr/src/webapp/web/admin/favicon.ico b/solr/webapp/web/admin/favicon.ico similarity index 100% rename from solr/src/webapp/web/admin/favicon.ico rename to solr/webapp/web/admin/favicon.ico diff --git a/solr/src/webapp/web/admin/form.jsp b/solr/webapp/web/admin/form.jsp similarity index 100% rename from solr/src/webapp/web/admin/form.jsp rename to solr/webapp/web/admin/form.jsp diff --git a/solr/src/webapp/web/admin/get-properties.jsp b/solr/webapp/web/admin/get-properties.jsp similarity index 100% rename from solr/src/webapp/web/admin/get-properties.jsp rename to solr/webapp/web/admin/get-properties.jsp diff --git a/solr/src/webapp/web/admin/header.jsp b/solr/webapp/web/admin/header.jsp similarity index 100% rename from solr/src/webapp/web/admin/header.jsp rename to solr/webapp/web/admin/header.jsp diff --git a/solr/src/webapp/web/admin/index.jsp b/solr/webapp/web/admin/index.jsp similarity index 100% rename from solr/src/webapp/web/admin/index.jsp rename to solr/webapp/web/admin/index.jsp diff --git a/solr/src/webapp/web/admin/jquery-1.4.3.min.js b/solr/webapp/web/admin/jquery-1.4.3.min.js similarity index 100% rename from solr/src/webapp/web/admin/jquery-1.4.3.min.js rename to solr/webapp/web/admin/jquery-1.4.3.min.js diff --git a/solr/src/webapp/web/admin/meta.xsl b/solr/webapp/web/admin/meta.xsl similarity index 100% rename from solr/src/webapp/web/admin/meta.xsl rename to solr/webapp/web/admin/meta.xsl diff --git a/solr/src/webapp/web/admin/registry.jsp b/solr/webapp/web/admin/registry.jsp similarity index 100% rename from solr/src/webapp/web/admin/registry.jsp rename to solr/webapp/web/admin/registry.jsp diff --git a/solr/src/webapp/web/admin/registry.xsl b/solr/webapp/web/admin/registry.xsl similarity index 100% rename from solr/src/webapp/web/admin/registry.xsl rename to solr/webapp/web/admin/registry.xsl diff --git a/solr/src/webapp/web/admin/replication/header.jsp b/solr/webapp/web/admin/replication/header.jsp similarity index 100% rename from solr/src/webapp/web/admin/replication/header.jsp rename to solr/webapp/web/admin/replication/header.jsp diff --git a/solr/src/webapp/web/admin/replication/index.jsp b/solr/webapp/web/admin/replication/index.jsp similarity index 100% rename from solr/src/webapp/web/admin/replication/index.jsp rename to solr/webapp/web/admin/replication/index.jsp diff --git a/solr/src/webapp/web/admin/schema.jsp b/solr/webapp/web/admin/schema.jsp similarity index 100% rename from solr/src/webapp/web/admin/schema.jsp rename to solr/webapp/web/admin/schema.jsp diff --git a/solr/src/webapp/web/admin/solr-admin.css b/solr/webapp/web/admin/solr-admin.css similarity index 100% rename from solr/src/webapp/web/admin/solr-admin.css rename to solr/webapp/web/admin/solr-admin.css diff --git a/solr/src/webapp/web/admin/solr_small.png b/solr/webapp/web/admin/solr_small.png similarity index 100% rename from solr/src/webapp/web/admin/solr_small.png rename to solr/webapp/web/admin/solr_small.png diff --git a/solr/src/webapp/web/admin/stats.jsp b/solr/webapp/web/admin/stats.jsp similarity index 100% rename from solr/src/webapp/web/admin/stats.jsp rename to solr/webapp/web/admin/stats.jsp diff --git a/solr/src/webapp/web/admin/stats.xsl b/solr/webapp/web/admin/stats.xsl similarity index 100% rename from solr/src/webapp/web/admin/stats.xsl rename to solr/webapp/web/admin/stats.xsl diff --git a/solr/src/webapp/web/admin/tabular.xsl b/solr/webapp/web/admin/tabular.xsl similarity index 100% rename from solr/src/webapp/web/admin/tabular.xsl rename to solr/webapp/web/admin/tabular.xsl diff --git a/solr/src/webapp/web/admin/threaddump.jsp b/solr/webapp/web/admin/threaddump.jsp similarity index 100% rename from solr/src/webapp/web/admin/threaddump.jsp rename to solr/webapp/web/admin/threaddump.jsp diff --git a/solr/src/webapp/web/admin/threaddump.xsl b/solr/webapp/web/admin/threaddump.xsl similarity index 100% rename from solr/src/webapp/web/admin/threaddump.xsl rename to solr/webapp/web/admin/threaddump.xsl diff --git a/solr/src/webapp/web/admin/zookeeper.jsp b/solr/webapp/web/admin/zookeeper.jsp similarity index 100% rename from solr/src/webapp/web/admin/zookeeper.jsp rename to solr/webapp/web/admin/zookeeper.jsp diff --git a/solr/src/webapp/web/css/screen.css b/solr/webapp/web/css/screen.css similarity index 100% rename from solr/src/webapp/web/css/screen.css rename to solr/webapp/web/css/screen.css diff --git a/solr/src/webapp/web/favicon.ico b/solr/webapp/web/favicon.ico similarity index 100% rename from solr/src/webapp/web/favicon.ico rename to solr/webapp/web/favicon.ico diff --git a/solr/src/webapp/web/img/div.gif b/solr/webapp/web/img/div.gif similarity index 100% rename from solr/src/webapp/web/img/div.gif rename to solr/webapp/web/img/div.gif diff --git a/solr/src/webapp/web/img/favicon.ico b/solr/webapp/web/img/favicon.ico similarity index 100% rename from solr/src/webapp/web/img/favicon.ico rename to solr/webapp/web/img/favicon.ico diff --git a/solr/src/webapp/web/img/ico/arrow-000-small.png b/solr/webapp/web/img/ico/arrow-000-small.png similarity index 100% rename from solr/src/webapp/web/img/ico/arrow-000-small.png rename to solr/webapp/web/img/ico/arrow-000-small.png diff --git a/solr/src/webapp/web/img/ico/arrow-circle.png b/solr/webapp/web/img/ico/arrow-circle.png similarity index 100% rename from solr/src/webapp/web/img/ico/arrow-circle.png rename to solr/webapp/web/img/ico/arrow-circle.png diff --git a/solr/src/webapp/web/img/ico/arrow-switch.png b/solr/webapp/web/img/ico/arrow-switch.png similarity index 100% rename from solr/src/webapp/web/img/ico/arrow-switch.png rename to solr/webapp/web/img/ico/arrow-switch.png diff --git a/solr/src/webapp/web/img/ico/battery.png b/solr/webapp/web/img/ico/battery.png similarity index 100% rename from solr/src/webapp/web/img/ico/battery.png rename to solr/webapp/web/img/ico/battery.png diff --git a/solr/src/webapp/web/img/ico/block-small.png b/solr/webapp/web/img/ico/block-small.png similarity index 100% rename from solr/src/webapp/web/img/ico/block-small.png rename to solr/webapp/web/img/ico/block-small.png diff --git a/solr/src/webapp/web/img/ico/block.png b/solr/webapp/web/img/ico/block.png similarity index 100% rename from solr/src/webapp/web/img/ico/block.png rename to solr/webapp/web/img/ico/block.png diff --git a/solr/src/webapp/web/img/ico/book-open-text.png b/solr/webapp/web/img/ico/book-open-text.png similarity index 100% rename from solr/src/webapp/web/img/ico/book-open-text.png rename to solr/webapp/web/img/ico/book-open-text.png diff --git a/solr/src/webapp/web/img/ico/box.png b/solr/webapp/web/img/ico/box.png similarity index 100% rename from solr/src/webapp/web/img/ico/box.png rename to solr/webapp/web/img/ico/box.png diff --git a/solr/src/webapp/web/img/ico/bug.png b/solr/webapp/web/img/ico/bug.png similarity index 100% rename from solr/src/webapp/web/img/ico/bug.png rename to solr/webapp/web/img/ico/bug.png diff --git a/solr/src/webapp/web/img/ico/chart.png b/solr/webapp/web/img/ico/chart.png similarity index 100% rename from solr/src/webapp/web/img/ico/chart.png rename to solr/webapp/web/img/ico/chart.png diff --git a/solr/src/webapp/web/img/ico/chevron-small-expand.png b/solr/webapp/web/img/ico/chevron-small-expand.png similarity index 100% rename from solr/src/webapp/web/img/ico/chevron-small-expand.png rename to solr/webapp/web/img/ico/chevron-small-expand.png diff --git a/solr/src/webapp/web/img/ico/chevron-small.png b/solr/webapp/web/img/ico/chevron-small.png similarity index 100% rename from solr/src/webapp/web/img/ico/chevron-small.png rename to solr/webapp/web/img/ico/chevron-small.png diff --git a/solr/src/webapp/web/img/ico/clipboard-list.png b/solr/webapp/web/img/ico/clipboard-list.png similarity index 100% rename from solr/src/webapp/web/img/ico/clipboard-list.png rename to solr/webapp/web/img/ico/clipboard-list.png diff --git a/solr/src/webapp/web/img/ico/clock-select.png b/solr/webapp/web/img/ico/clock-select.png similarity index 100% rename from solr/src/webapp/web/img/ico/clock-select.png rename to solr/webapp/web/img/ico/clock-select.png diff --git a/solr/src/webapp/web/img/ico/construction.png b/solr/webapp/web/img/ico/construction.png similarity index 100% rename from solr/src/webapp/web/img/ico/construction.png rename to solr/webapp/web/img/ico/construction.png diff --git a/solr/src/webapp/web/img/ico/cross-0.png b/solr/webapp/web/img/ico/cross-0.png similarity index 100% rename from solr/src/webapp/web/img/ico/cross-0.png rename to solr/webapp/web/img/ico/cross-0.png diff --git a/solr/src/webapp/web/img/ico/cross-1.png b/solr/webapp/web/img/ico/cross-1.png similarity index 100% rename from solr/src/webapp/web/img/ico/cross-1.png rename to solr/webapp/web/img/ico/cross-1.png diff --git a/solr/src/webapp/web/img/ico/cross.png b/solr/webapp/web/img/ico/cross.png similarity index 100% rename from solr/src/webapp/web/img/ico/cross.png rename to solr/webapp/web/img/ico/cross.png diff --git a/solr/src/webapp/web/img/ico/dashboard.png b/solr/webapp/web/img/ico/dashboard.png similarity index 100% rename from solr/src/webapp/web/img/ico/dashboard.png rename to solr/webapp/web/img/ico/dashboard.png diff --git a/solr/src/webapp/web/img/ico/database.png b/solr/webapp/web/img/ico/database.png similarity index 100% rename from solr/src/webapp/web/img/ico/database.png rename to solr/webapp/web/img/ico/database.png diff --git a/solr/src/webapp/web/img/ico/databases.png b/solr/webapp/web/img/ico/databases.png similarity index 100% rename from solr/src/webapp/web/img/ico/databases.png rename to solr/webapp/web/img/ico/databases.png diff --git a/solr/src/webapp/web/img/ico/disk-black.png b/solr/webapp/web/img/ico/disk-black.png similarity index 100% rename from solr/src/webapp/web/img/ico/disk-black.png rename to solr/webapp/web/img/ico/disk-black.png diff --git a/solr/src/webapp/web/img/ico/document-convert.png b/solr/webapp/web/img/ico/document-convert.png similarity index 100% rename from solr/src/webapp/web/img/ico/document-convert.png rename to solr/webapp/web/img/ico/document-convert.png diff --git a/solr/src/webapp/web/img/ico/document-import.png b/solr/webapp/web/img/ico/document-import.png similarity index 100% rename from solr/src/webapp/web/img/ico/document-import.png rename to solr/webapp/web/img/ico/document-import.png diff --git a/solr/src/webapp/web/img/ico/document-list.png b/solr/webapp/web/img/ico/document-list.png similarity index 100% rename from solr/src/webapp/web/img/ico/document-list.png rename to solr/webapp/web/img/ico/document-list.png diff --git a/solr/src/webapp/web/img/ico/document-text.png b/solr/webapp/web/img/ico/document-text.png similarity index 100% rename from solr/src/webapp/web/img/ico/document-text.png rename to solr/webapp/web/img/ico/document-text.png diff --git a/solr/src/webapp/web/img/ico/folder-export.png b/solr/webapp/web/img/ico/folder-export.png similarity index 100% rename from solr/src/webapp/web/img/ico/folder-export.png rename to solr/webapp/web/img/ico/folder-export.png diff --git a/solr/src/webapp/web/img/ico/folder.png b/solr/webapp/web/img/ico/folder.png similarity index 100% rename from solr/src/webapp/web/img/ico/folder.png rename to solr/webapp/web/img/ico/folder.png diff --git a/solr/src/webapp/web/img/ico/funnel-small.png b/solr/webapp/web/img/ico/funnel-small.png similarity index 100% rename from solr/src/webapp/web/img/ico/funnel-small.png rename to solr/webapp/web/img/ico/funnel-small.png diff --git a/solr/src/webapp/web/img/ico/funnel.png b/solr/webapp/web/img/ico/funnel.png similarity index 100% rename from solr/src/webapp/web/img/ico/funnel.png rename to solr/webapp/web/img/ico/funnel.png diff --git a/solr/src/webapp/web/img/ico/gear.png b/solr/webapp/web/img/ico/gear.png similarity index 100% rename from solr/src/webapp/web/img/ico/gear.png rename to solr/webapp/web/img/ico/gear.png diff --git a/solr/src/webapp/web/img/ico/globe.png b/solr/webapp/web/img/ico/globe.png similarity index 100% rename from solr/src/webapp/web/img/ico/globe.png rename to solr/webapp/web/img/ico/globe.png diff --git a/solr/src/webapp/web/img/ico/hammer-screwdriver.png b/solr/webapp/web/img/ico/hammer-screwdriver.png similarity index 100% rename from solr/src/webapp/web/img/ico/hammer-screwdriver.png rename to solr/webapp/web/img/ico/hammer-screwdriver.png diff --git a/solr/src/webapp/web/img/ico/hand.png b/solr/webapp/web/img/ico/hand.png similarity index 100% rename from solr/src/webapp/web/img/ico/hand.png rename to solr/webapp/web/img/ico/hand.png diff --git a/solr/src/webapp/web/img/ico/highlighter-text.png b/solr/webapp/web/img/ico/highlighter-text.png similarity index 100% rename from solr/src/webapp/web/img/ico/highlighter-text.png rename to solr/webapp/web/img/ico/highlighter-text.png diff --git a/solr/src/webapp/web/img/ico/hourglass--exclamation.png b/solr/webapp/web/img/ico/hourglass--exclamation.png similarity index 100% rename from solr/src/webapp/web/img/ico/hourglass--exclamation.png rename to solr/webapp/web/img/ico/hourglass--exclamation.png diff --git a/solr/src/webapp/web/img/ico/hourglass.png b/solr/webapp/web/img/ico/hourglass.png similarity index 100% rename from solr/src/webapp/web/img/ico/hourglass.png rename to solr/webapp/web/img/ico/hourglass.png diff --git a/solr/src/webapp/web/img/ico/inbox-document-text.png b/solr/webapp/web/img/ico/inbox-document-text.png similarity index 100% rename from solr/src/webapp/web/img/ico/inbox-document-text.png rename to solr/webapp/web/img/ico/inbox-document-text.png diff --git a/solr/src/webapp/web/img/ico/information-button.png b/solr/webapp/web/img/ico/information-button.png similarity index 100% rename from solr/src/webapp/web/img/ico/information-button.png rename to solr/webapp/web/img/ico/information-button.png diff --git a/solr/src/webapp/web/img/ico/information-small.png b/solr/webapp/web/img/ico/information-small.png similarity index 100% rename from solr/src/webapp/web/img/ico/information-small.png rename to solr/webapp/web/img/ico/information-small.png diff --git a/solr/src/webapp/web/img/ico/information.png b/solr/webapp/web/img/ico/information.png similarity index 100% rename from solr/src/webapp/web/img/ico/information.png rename to solr/webapp/web/img/ico/information.png diff --git a/solr/src/webapp/web/img/ico/jar.png b/solr/webapp/web/img/ico/jar.png similarity index 100% rename from solr/src/webapp/web/img/ico/jar.png rename to solr/webapp/web/img/ico/jar.png diff --git a/solr/src/webapp/web/img/ico/magnifier.png b/solr/webapp/web/img/ico/magnifier.png similarity index 100% rename from solr/src/webapp/web/img/ico/magnifier.png rename to solr/webapp/web/img/ico/magnifier.png diff --git a/solr/src/webapp/web/img/ico/mail.png b/solr/webapp/web/img/ico/mail.png similarity index 100% rename from solr/src/webapp/web/img/ico/mail.png rename to solr/webapp/web/img/ico/mail.png diff --git a/solr/src/webapp/web/img/ico/network-cloud.png b/solr/webapp/web/img/ico/network-cloud.png similarity index 100% rename from solr/src/webapp/web/img/ico/network-cloud.png rename to solr/webapp/web/img/ico/network-cloud.png diff --git a/solr/src/webapp/web/img/ico/network-status-away.png b/solr/webapp/web/img/ico/network-status-away.png similarity index 100% rename from solr/src/webapp/web/img/ico/network-status-away.png rename to solr/webapp/web/img/ico/network-status-away.png diff --git a/solr/src/webapp/web/img/ico/network-status-busy.png b/solr/webapp/web/img/ico/network-status-busy.png similarity index 100% rename from solr/src/webapp/web/img/ico/network-status-busy.png rename to solr/webapp/web/img/ico/network-status-busy.png diff --git a/solr/src/webapp/web/img/ico/network-status-offline.png b/solr/webapp/web/img/ico/network-status-offline.png similarity index 100% rename from solr/src/webapp/web/img/ico/network-status-offline.png rename to solr/webapp/web/img/ico/network-status-offline.png diff --git a/solr/src/webapp/web/img/ico/network-status.png b/solr/webapp/web/img/ico/network-status.png similarity index 100% rename from solr/src/webapp/web/img/ico/network-status.png rename to solr/webapp/web/img/ico/network-status.png diff --git a/solr/src/webapp/web/img/ico/node-design.png b/solr/webapp/web/img/ico/node-design.png similarity index 100% rename from solr/src/webapp/web/img/ico/node-design.png rename to solr/webapp/web/img/ico/node-design.png diff --git a/solr/src/webapp/web/img/ico/node-master.png b/solr/webapp/web/img/ico/node-master.png similarity index 100% rename from solr/src/webapp/web/img/ico/node-master.png rename to solr/webapp/web/img/ico/node-master.png diff --git a/solr/src/webapp/web/img/ico/node-select.png b/solr/webapp/web/img/ico/node-select.png similarity index 100% rename from solr/src/webapp/web/img/ico/node-select.png rename to solr/webapp/web/img/ico/node-select.png diff --git a/solr/src/webapp/web/img/ico/node-slave.png b/solr/webapp/web/img/ico/node-slave.png similarity index 100% rename from solr/src/webapp/web/img/ico/node-slave.png rename to solr/webapp/web/img/ico/node-slave.png diff --git a/solr/src/webapp/web/img/ico/node.png b/solr/webapp/web/img/ico/node.png similarity index 100% rename from solr/src/webapp/web/img/ico/node.png rename to solr/webapp/web/img/ico/node.png diff --git a/solr/src/webapp/web/img/ico/pencil-small.png b/solr/webapp/web/img/ico/pencil-small.png similarity index 100% rename from solr/src/webapp/web/img/ico/pencil-small.png rename to solr/webapp/web/img/ico/pencil-small.png diff --git a/solr/src/webapp/web/img/ico/plus-button.png b/solr/webapp/web/img/ico/plus-button.png similarity index 100% rename from solr/src/webapp/web/img/ico/plus-button.png rename to solr/webapp/web/img/ico/plus-button.png diff --git a/solr/src/webapp/web/img/ico/question-small-white.png b/solr/webapp/web/img/ico/question-small-white.png similarity index 100% rename from solr/src/webapp/web/img/ico/question-small-white.png rename to solr/webapp/web/img/ico/question-small-white.png diff --git a/solr/src/webapp/web/img/ico/receipt-invoice.png b/solr/webapp/web/img/ico/receipt-invoice.png similarity index 100% rename from solr/src/webapp/web/img/ico/receipt-invoice.png rename to solr/webapp/web/img/ico/receipt-invoice.png diff --git a/solr/src/webapp/web/img/ico/receipt.png b/solr/webapp/web/img/ico/receipt.png similarity index 100% rename from solr/src/webapp/web/img/ico/receipt.png rename to solr/webapp/web/img/ico/receipt.png diff --git a/solr/src/webapp/web/img/ico/script-code.png b/solr/webapp/web/img/ico/script-code.png similarity index 100% rename from solr/src/webapp/web/img/ico/script-code.png rename to solr/webapp/web/img/ico/script-code.png diff --git a/solr/src/webapp/web/img/ico/server-cast.png b/solr/webapp/web/img/ico/server-cast.png similarity index 100% rename from solr/src/webapp/web/img/ico/server-cast.png rename to solr/webapp/web/img/ico/server-cast.png diff --git a/solr/src/webapp/web/img/ico/server.png b/solr/webapp/web/img/ico/server.png similarity index 100% rename from solr/src/webapp/web/img/ico/server.png rename to solr/webapp/web/img/ico/server.png diff --git a/solr/src/webapp/web/img/ico/sitemap.png b/solr/webapp/web/img/ico/sitemap.png similarity index 100% rename from solr/src/webapp/web/img/ico/sitemap.png rename to solr/webapp/web/img/ico/sitemap.png diff --git a/solr/src/webapp/web/img/ico/slash.png b/solr/webapp/web/img/ico/slash.png similarity index 100% rename from solr/src/webapp/web/img/ico/slash.png rename to solr/webapp/web/img/ico/slash.png diff --git a/solr/src/webapp/web/img/ico/status-away.png b/solr/webapp/web/img/ico/status-away.png similarity index 100% rename from solr/src/webapp/web/img/ico/status-away.png rename to solr/webapp/web/img/ico/status-away.png diff --git a/solr/src/webapp/web/img/ico/status-busy.png b/solr/webapp/web/img/ico/status-busy.png similarity index 100% rename from solr/src/webapp/web/img/ico/status-busy.png rename to solr/webapp/web/img/ico/status-busy.png diff --git a/solr/src/webapp/web/img/ico/status-offline.png b/solr/webapp/web/img/ico/status-offline.png similarity index 100% rename from solr/src/webapp/web/img/ico/status-offline.png rename to solr/webapp/web/img/ico/status-offline.png diff --git a/solr/src/webapp/web/img/ico/status.png b/solr/webapp/web/img/ico/status.png similarity index 100% rename from solr/src/webapp/web/img/ico/status.png rename to solr/webapp/web/img/ico/status.png diff --git a/solr/src/webapp/web/img/ico/system-monitor--exclamation.png b/solr/webapp/web/img/ico/system-monitor--exclamation.png similarity index 100% rename from solr/src/webapp/web/img/ico/system-monitor--exclamation.png rename to solr/webapp/web/img/ico/system-monitor--exclamation.png diff --git a/solr/src/webapp/web/img/ico/system-monitor.png b/solr/webapp/web/img/ico/system-monitor.png similarity index 100% rename from solr/src/webapp/web/img/ico/system-monitor.png rename to solr/webapp/web/img/ico/system-monitor.png diff --git a/solr/src/webapp/web/img/ico/table.png b/solr/webapp/web/img/ico/table.png similarity index 100% rename from solr/src/webapp/web/img/ico/table.png rename to solr/webapp/web/img/ico/table.png diff --git a/solr/src/webapp/web/img/ico/terminal.png b/solr/webapp/web/img/ico/terminal.png similarity index 100% rename from solr/src/webapp/web/img/ico/terminal.png rename to solr/webapp/web/img/ico/terminal.png diff --git a/solr/src/webapp/web/img/ico/tick-circle.png b/solr/webapp/web/img/ico/tick-circle.png similarity index 100% rename from solr/src/webapp/web/img/ico/tick-circle.png rename to solr/webapp/web/img/ico/tick-circle.png diff --git a/solr/src/webapp/web/img/ico/tick-red.png b/solr/webapp/web/img/ico/tick-red.png similarity index 100% rename from solr/src/webapp/web/img/ico/tick-red.png rename to solr/webapp/web/img/ico/tick-red.png diff --git a/solr/src/webapp/web/img/ico/tick.png b/solr/webapp/web/img/ico/tick.png similarity index 100% rename from solr/src/webapp/web/img/ico/tick.png rename to solr/webapp/web/img/ico/tick.png diff --git a/solr/src/webapp/web/img/ico/toggle-small-expand.png b/solr/webapp/web/img/ico/toggle-small-expand.png similarity index 100% rename from solr/src/webapp/web/img/ico/toggle-small-expand.png rename to solr/webapp/web/img/ico/toggle-small-expand.png diff --git a/solr/src/webapp/web/img/ico/toggle-small.png b/solr/webapp/web/img/ico/toggle-small.png similarity index 100% rename from solr/src/webapp/web/img/ico/toggle-small.png rename to solr/webapp/web/img/ico/toggle-small.png diff --git a/solr/src/webapp/web/img/ico/toolbox.png b/solr/webapp/web/img/ico/toolbox.png similarity index 100% rename from solr/src/webapp/web/img/ico/toolbox.png rename to solr/webapp/web/img/ico/toolbox.png diff --git a/solr/src/webapp/web/img/ico/ui-accordion.png b/solr/webapp/web/img/ico/ui-accordion.png similarity index 100% rename from solr/src/webapp/web/img/ico/ui-accordion.png rename to solr/webapp/web/img/ico/ui-accordion.png diff --git a/solr/src/webapp/web/img/ico/ui-address-bar.png b/solr/webapp/web/img/ico/ui-address-bar.png similarity index 100% rename from solr/src/webapp/web/img/ico/ui-address-bar.png rename to solr/webapp/web/img/ico/ui-address-bar.png diff --git a/solr/src/webapp/web/img/ico/ui-check-box-uncheck.png b/solr/webapp/web/img/ico/ui-check-box-uncheck.png similarity index 100% rename from solr/src/webapp/web/img/ico/ui-check-box-uncheck.png rename to solr/webapp/web/img/ico/ui-check-box-uncheck.png diff --git a/solr/src/webapp/web/img/ico/ui-check-box.png b/solr/webapp/web/img/ico/ui-check-box.png similarity index 100% rename from solr/src/webapp/web/img/ico/ui-check-box.png rename to solr/webapp/web/img/ico/ui-check-box.png diff --git a/solr/src/webapp/web/img/ico/ui-radio-button-uncheck.png b/solr/webapp/web/img/ico/ui-radio-button-uncheck.png similarity index 100% rename from solr/src/webapp/web/img/ico/ui-radio-button-uncheck.png rename to solr/webapp/web/img/ico/ui-radio-button-uncheck.png diff --git a/solr/src/webapp/web/img/ico/ui-radio-button.png b/solr/webapp/web/img/ico/ui-radio-button.png similarity index 100% rename from solr/src/webapp/web/img/ico/ui-radio-button.png rename to solr/webapp/web/img/ico/ui-radio-button.png diff --git a/solr/src/webapp/web/img/ico/ui-text-field-select.png b/solr/webapp/web/img/ico/ui-text-field-select.png similarity index 100% rename from solr/src/webapp/web/img/ico/ui-text-field-select.png rename to solr/webapp/web/img/ico/ui-text-field-select.png diff --git a/solr/src/webapp/web/img/ico/users.png b/solr/webapp/web/img/ico/users.png similarity index 100% rename from solr/src/webapp/web/img/ico/users.png rename to solr/webapp/web/img/ico/users.png diff --git a/solr/src/webapp/web/img/ico/zone.png b/solr/webapp/web/img/ico/zone.png similarity index 100% rename from solr/src/webapp/web/img/ico/zone.png rename to solr/webapp/web/img/ico/zone.png diff --git a/solr/src/webapp/web/img/loader-light.gif b/solr/webapp/web/img/loader-light.gif similarity index 100% rename from solr/src/webapp/web/img/loader-light.gif rename to solr/webapp/web/img/loader-light.gif diff --git a/solr/src/webapp/web/img/loader.gif b/solr/webapp/web/img/loader.gif similarity index 100% rename from solr/src/webapp/web/img/loader.gif rename to solr/webapp/web/img/loader.gif diff --git a/solr/src/webapp/web/img/lucene-ico.png b/solr/webapp/web/img/lucene-ico.png similarity index 100% rename from solr/src/webapp/web/img/lucene-ico.png rename to solr/webapp/web/img/lucene-ico.png diff --git a/solr/src/webapp/web/img/solr.png b/solr/webapp/web/img/solr.png similarity index 100% rename from solr/src/webapp/web/img/solr.png rename to solr/webapp/web/img/solr.png diff --git a/solr/src/webapp/web/img/tree.png b/solr/webapp/web/img/tree.png similarity index 100% rename from solr/src/webapp/web/img/tree.png rename to solr/webapp/web/img/tree.png diff --git a/solr/src/webapp/web/index.jsp b/solr/webapp/web/index.jsp similarity index 100% rename from solr/src/webapp/web/index.jsp rename to solr/webapp/web/index.jsp diff --git a/solr/src/webapp/web/js/0_console.js b/solr/webapp/web/js/0_console.js similarity index 100% rename from solr/src/webapp/web/js/0_console.js rename to solr/webapp/web/js/0_console.js diff --git a/solr/src/webapp/web/js/1_jquery.js b/solr/webapp/web/js/1_jquery.js similarity index 100% rename from solr/src/webapp/web/js/1_jquery.js rename to solr/webapp/web/js/1_jquery.js diff --git a/solr/src/webapp/web/js/highlight.js b/solr/webapp/web/js/highlight.js similarity index 100% rename from solr/src/webapp/web/js/highlight.js rename to solr/webapp/web/js/highlight.js diff --git a/solr/src/webapp/web/js/jquery.form.js b/solr/webapp/web/js/jquery.form.js similarity index 100% rename from solr/src/webapp/web/js/jquery.form.js rename to solr/webapp/web/js/jquery.form.js diff --git a/solr/src/webapp/web/js/jquery.jstree.js b/solr/webapp/web/js/jquery.jstree.js similarity index 100% rename from solr/src/webapp/web/js/jquery.jstree.js rename to solr/webapp/web/js/jquery.jstree.js diff --git a/solr/src/webapp/web/js/jquery.sammy.js b/solr/webapp/web/js/jquery.sammy.js similarity index 100% rename from solr/src/webapp/web/js/jquery.sammy.js rename to solr/webapp/web/js/jquery.sammy.js diff --git a/solr/src/webapp/web/js/jquery.sparkline.js b/solr/webapp/web/js/jquery.sparkline.js similarity index 100% rename from solr/src/webapp/web/js/jquery.sparkline.js rename to solr/webapp/web/js/jquery.sparkline.js diff --git a/solr/src/webapp/web/js/jquery.timeago.js b/solr/webapp/web/js/jquery.timeago.js similarity index 100% rename from solr/src/webapp/web/js/jquery.timeago.js rename to solr/webapp/web/js/jquery.timeago.js diff --git a/solr/src/webapp/web/js/script.js b/solr/webapp/web/js/script.js similarity index 100% rename from solr/src/webapp/web/js/script.js rename to solr/webapp/web/js/script.js diff --git a/solr/src/webapp/web/logging.json b/solr/webapp/web/logging.json similarity index 100% rename from solr/src/webapp/web/logging.json rename to solr/webapp/web/logging.json diff --git a/solr/src/webapp/web/tpl/analysis.html b/solr/webapp/web/tpl/analysis.html similarity index 100% rename from solr/src/webapp/web/tpl/analysis.html rename to solr/webapp/web/tpl/analysis.html diff --git a/solr/src/webapp/web/tpl/cloud.html b/solr/webapp/web/tpl/cloud.html similarity index 100% rename from solr/src/webapp/web/tpl/cloud.html rename to solr/webapp/web/tpl/cloud.html diff --git a/solr/src/webapp/web/tpl/cores.html b/solr/webapp/web/tpl/cores.html similarity index 100% rename from solr/src/webapp/web/tpl/cores.html rename to solr/webapp/web/tpl/cores.html diff --git a/solr/src/webapp/web/tpl/dashboard.html b/solr/webapp/web/tpl/dashboard.html similarity index 100% rename from solr/src/webapp/web/tpl/dashboard.html rename to solr/webapp/web/tpl/dashboard.html diff --git a/solr/src/webapp/web/tpl/dataimport.html b/solr/webapp/web/tpl/dataimport.html similarity index 100% rename from solr/src/webapp/web/tpl/dataimport.html rename to solr/webapp/web/tpl/dataimport.html diff --git a/solr/src/webapp/web/tpl/index.html b/solr/webapp/web/tpl/index.html similarity index 100% rename from solr/src/webapp/web/tpl/index.html rename to solr/webapp/web/tpl/index.html diff --git a/solr/src/webapp/web/tpl/plugins.html b/solr/webapp/web/tpl/plugins.html similarity index 100% rename from solr/src/webapp/web/tpl/plugins.html rename to solr/webapp/web/tpl/plugins.html diff --git a/solr/src/webapp/web/tpl/query.html b/solr/webapp/web/tpl/query.html similarity index 100% rename from solr/src/webapp/web/tpl/query.html rename to solr/webapp/web/tpl/query.html diff --git a/solr/src/webapp/web/tpl/replication.html b/solr/webapp/web/tpl/replication.html similarity index 100% rename from solr/src/webapp/web/tpl/replication.html rename to solr/webapp/web/tpl/replication.html diff --git a/solr/src/webapp/web/tpl/schema-browser.html b/solr/webapp/web/tpl/schema-browser.html similarity index 100% rename from solr/src/webapp/web/tpl/schema-browser.html rename to solr/webapp/web/tpl/schema-browser.html diff --git a/solr/src/webapp/web/tpl/schema-browser_dynamic-field.html b/solr/webapp/web/tpl/schema-browser_dynamic-field.html similarity index 100% rename from solr/src/webapp/web/tpl/schema-browser_dynamic-field.html rename to solr/webapp/web/tpl/schema-browser_dynamic-field.html diff --git a/solr/src/webapp/web/tpl/schema-browser_type.html b/solr/webapp/web/tpl/schema-browser_type.html similarity index 100% rename from solr/src/webapp/web/tpl/schema-browser_type.html rename to solr/webapp/web/tpl/schema-browser_type.html diff --git a/solr/src/webapp/web/tpl/threads.html b/solr/webapp/web/tpl/threads.html similarity index 100% rename from solr/src/webapp/web/tpl/threads.html rename to solr/webapp/web/tpl/threads.html diff --git a/solr/src/webapp/web/zookeeper.jsp b/solr/webapp/web/zookeeper.jsp similarity index 100% rename from solr/src/webapp/web/zookeeper.jsp rename to solr/webapp/web/zookeeper.jsp