svn commit: r1444026 [1/3] - in /lucene/dev/trunk/lucene: ./ demo/src/java/org/apache/lucene/demo/facet/ demo/src/java/org/apache/lucene/demo/facet/adaptive/ demo/src/java/org/apache/lucene/demo/facet/association/ demo/src/java/org/apache/lucene/demo/f...

[sh...@apache.org]

Author: shaie
Date: Fri Feb  8 14:35:50 2013
New Revision: 1444026

URL: http://svn.apache.org/r1444026
Log:
LUCENE-4761: Facets package reorganization

Added:
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationFloatSumAggregator.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/associations/AssociationFloatSumAggregator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationFloatSumFacetRequest.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/associations/AssociationFloatSumFacetRequest.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumAggregator.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/associations/AssociationIntSumAggregator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumFacetRequest.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/associations/AssociationIntSumFacetRequest.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumFacetsAggregator.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/search/AssociationIntSumFacetsAggregator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/
      - copied from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/util/collections/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/ComplementCountingAggregator.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ComplementCountingAggregator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/TotalFacetCounts.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/TotalFacetCountsCache.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCountsCache.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/package.html   (with props)
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/
      - copied from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/util/encoding/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/
      - copied from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/params/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetSearchParams.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/FacetSearchParams.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/IntermediateFacetResult.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/search/IntermediateFacetResult.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/PartitionsFacetResultsHandler.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/search/PartitionsFacetResultsHandler.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/package.html
      - copied unchanged from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/search/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/
      - copied from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingWrapper.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SamplingWrapper.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/Aggregator.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/Aggregator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountFacetRequest.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/CountFacetRequest.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountingAggregator.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/CountingAggregator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetRequest.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/FacetRequest.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResult.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/results/FacetResult.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResultNode.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/results/FacetResultNode.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/PerCategoryListAggregator.java   (with props)
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/ScoringAggregator.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ScoringAggregator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SumScoreFacetRequest.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/SumScoreFacetRequest.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/FacetsPayloadMigrationReader.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/FacetsPayloadMigrationReader.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/OrdinalMappingAtomicReader.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/OrdinalMappingAtomicReader.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/SlowRAMDirectory.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/associations/
      - copied from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/associations/
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/
      - copied from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/util/collections/
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/complements/
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/complements/TestFacetsAccumulatorWithComplement.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestFacetsAccumulatorWithComplement.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/complements/TestTotalFacetCounts.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/complements/TestTotalFacetCountsCache.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/encoding/
      - copied from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/util/encoding/
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/params/
      - copied from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/index/params/
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/params/FacetSearchParamsTest.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/params/FacetSearchParamsTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sampling/
      - copied from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sampling/SamplingWrapperTest.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/SamplingWrapperTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/FacetRequestTest.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/params/FacetRequestTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/MultiCategoryListIteratorTest.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/params/MultiCategoryListIteratorTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/util/OrdinalMappingReaderTest.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/index/OrdinalMappingReaderTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/util/TestFacetsPayloadMigrationReader.java
      - copied, changed from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/index/TestFacetsPayloadMigrationReader.java
Removed:
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/FacetException.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/search/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/FacetsPayloadMigrationReader.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/OrdinalMappingAtomicReader.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/params/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/search/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SamplingWrapper.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCountsCache.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/results/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/util/
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/index/
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/SamplingWrapperTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestFacetsAccumulatorWithComplement.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/associations/
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/params/
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/util/
Modified:
    lucene/dev/trunk/lucene/CHANGES.txt
    lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java
    lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java
    lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java
    lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java
    lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java
    lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java
    lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java
    lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java
    lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java
    lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java
    lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationExample.java
    lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCLExample.java
    lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleExample.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsDrillDownStream.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsFacetFields.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/FloatAssociationsIterator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/IntAssociationsIterator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ArrayHashMap.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/DoubleIterator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/FloatIterator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/FloatToObjectMap.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntArray.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntHashSet.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntIterator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToDoubleMap.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToFloatMap.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToIntMap.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToObjectMap.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/LRUHashMap.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ObjectToFloatMap.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ObjectToIntMap.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/ChunksIntEncoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapIntDecoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapIntEncoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapVInt8IntDecoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapVInt8IntEncoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/EightFlagsIntDecoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/EightFlagsIntEncoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/FourFlagsIntDecoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/FourFlagsIntEncoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntDecoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntEncoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntEncoderFilter.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/NOnesIntDecoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/NOnesIntEncoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SimpleIntDecoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SimpleIntEncoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SortingIntEncoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/UniqueValuesIntEncoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/VInt8IntDecoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/VInt8IntEncoder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CountingListBuilder.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/DrillDownStream.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/FacetFields.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/CategoryListParams.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetIndexingParams.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/PerDimensionIndexingParams.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/PerDimensionOrdinalPolicy.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/RandomSampler.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/RepeatableSampler.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SampleFixer.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/Sampler.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingAccumulator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingParams.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/TakmiSampleFixer.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/AdaptiveFacetsAccumulator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountingFacetsAggregator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DepthOneFacetResultsHandler.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DocValuesCategoryListIterator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillDown.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResultsHandler.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAggregator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FastCountingFacetsAggregator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FloatFacetResultsHandler.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/IntFacetResultsHandler.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/StandardFacetsAccumulator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SumScoreFacetsAggregator.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TopKFacetResultsHandler.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TopKInEachNodeHandler.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/package.html
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/PartitionsUtils.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/ResultSortUtils.java
    lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/associations/AssociationsFacetRequestTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/ArrayHashMapTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/FloatToObjectMapTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/IntArrayTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/IntHashSetTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/IntToDoubleMapTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/IntToFloatMapTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/IntToIntMapTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/IntToObjectMapTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/ObjectToFloatMapTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/ObjectToIntMapTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/TestLRUHashMap.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/encoding/EncodingSpeed.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/encoding/EncodingTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/params/CategoryListParamsTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/params/FacetIndexingParamsTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/params/PerDimensionIndexingParamsTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sampling/BaseSampleTestTopK.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sampling/OversampleWithDepthTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sampling/SamplingAccumulatorTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/AdaptiveAccumulatorTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/CountingFacetsAggregatorTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestDemoFacets.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestFacetsCollector.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestSameRequestAccumulation.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestStandardFacetsAccumulator.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandler.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java
    lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Fri Feb  8 14:35:50 2013
@@ -63,6 +63,9 @@ Changes in backwards compatibility polic
   FacetsAggregator. You can still use StandardFacetsAccumulator, which works
   with the old API (for now). (Shai Erera) 
 
+* LUCENE-4761: Facet packages reorganized. Should be easy to fix your import
+  statements, if you use an IDE such as Eclipse. (Shai Erera)
+
 Optimizations
 
 * LUCENE-4687: BloomFilterPostingsFormat now lazily initializes delegate

Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java Fri Feb  8 14:35:50 2013
@@ -2,7 +2,7 @@ package org.apache.lucene.demo.facet;
 
 import java.util.List;
 
-import org.apache.lucene.facet.search.results.FacetResult;
+import org.apache.lucene.facet.search.FacetResult;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java Fri Feb  8 14:35:50 2013
@@ -10,7 +10,7 @@ import org.apache.lucene.demo.facet.Exam
 import org.apache.lucene.demo.facet.simple.SimpleIndexer;
 import org.apache.lucene.demo.facet.simple.SimpleSearcher;
 import org.apache.lucene.facet.search.AdaptiveFacetsAccumulator;
-import org.apache.lucene.facet.search.results.FacetResult;
+import org.apache.lucene.facet.search.FacetResult;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java Fri Feb  8 14:35:50 2013
@@ -4,11 +4,11 @@ import java.util.List;
 
 import org.apache.lucene.demo.facet.ExampleUtils;
 import org.apache.lucene.demo.facet.simple.SimpleUtils;
+import org.apache.lucene.facet.params.FacetSearchParams;
 import org.apache.lucene.facet.search.AdaptiveFacetsAccumulator;
+import org.apache.lucene.facet.search.CountFacetRequest;
+import org.apache.lucene.facet.search.FacetResult;
 import org.apache.lucene.facet.search.FacetsCollector;
-import org.apache.lucene.facet.search.params.CountFacetRequest;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.results.FacetResult;
 import org.apache.lucene.facet.taxonomy.CategoryPath;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;

Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java Fri Feb  8 14:35:50 2013
@@ -7,7 +7,7 @@ import org.apache.lucene.store.RAMDirect
 
 import org.apache.lucene.demo.facet.ExampleResult;
 import org.apache.lucene.demo.facet.ExampleUtils;
-import org.apache.lucene.facet.search.results.FacetResult;
+import org.apache.lucene.facet.search.FacetResult;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java Fri Feb  8 14:35:50 2013
@@ -7,9 +7,9 @@ import org.apache.lucene.index.IndexRead
 import org.apache.lucene.store.Directory;
 
 import org.apache.lucene.demo.facet.simple.SimpleSearcher;
-import org.apache.lucene.facet.search.params.associations.AssociationFloatSumFacetRequest;
-import org.apache.lucene.facet.search.params.associations.AssociationIntSumFacetRequest;
-import org.apache.lucene.facet.search.results.FacetResult;
+import org.apache.lucene.facet.associations.AssociationFloatSumFacetRequest;
+import org.apache.lucene.facet.associations.AssociationIntSumFacetRequest;
+import org.apache.lucene.facet.search.FacetResult;
 import org.apache.lucene.facet.taxonomy.CategoryPath;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;

Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java Fri Feb  8 14:35:50 2013
@@ -12,9 +12,9 @@ import org.apache.lucene.document.Docume
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.TextField;
 import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
-import org.apache.lucene.facet.index.params.PerDimensionIndexingParams;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.PerDimensionIndexingParams;
 import org.apache.lucene.facet.taxonomy.CategoryPath;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
 import org.apache.lucene.index.IndexWriter;

Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java Fri Feb  8 14:35:50 2013
@@ -7,7 +7,7 @@ import org.apache.lucene.store.RAMDirect
 
 import org.apache.lucene.demo.facet.ExampleResult;
 import org.apache.lucene.demo.facet.ExampleUtils;
-import org.apache.lucene.facet.search.results.FacetResult;
+import org.apache.lucene.facet.search.FacetResult;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java Fri Feb  8 14:35:50 2013
@@ -15,12 +15,12 @@ import org.apache.lucene.store.Directory
 import org.apache.lucene.search.MultiCollector;
 import org.apache.lucene.demo.facet.ExampleUtils;
 import org.apache.lucene.demo.facet.simple.SimpleUtils;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.FacetSearchParams;
+import org.apache.lucene.facet.search.CountFacetRequest;
+import org.apache.lucene.facet.search.FacetRequest;
+import org.apache.lucene.facet.search.FacetResult;
 import org.apache.lucene.facet.search.FacetsCollector;
-import org.apache.lucene.facet.search.params.CountFacetRequest;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.results.FacetResult;
 import org.apache.lucene.facet.taxonomy.CategoryPath;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;

Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java Fri Feb  8 14:35:50 2013
@@ -9,7 +9,7 @@ import org.apache.lucene.store.RAMDirect
 
 import org.apache.lucene.demo.facet.ExampleResult;
 import org.apache.lucene.demo.facet.ExampleUtils;
-import org.apache.lucene.facet.search.results.FacetResult;
+import org.apache.lucene.facet.search.FacetResult;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
 import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
 

Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java Fri Feb  8 14:35:50 2013
@@ -4,14 +4,14 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.lucene.demo.facet.ExampleUtils;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.FacetSearchParams;
+import org.apache.lucene.facet.search.CountFacetRequest;
 import org.apache.lucene.facet.search.DrillDown;
+import org.apache.lucene.facet.search.FacetRequest;
+import org.apache.lucene.facet.search.FacetResult;
+import org.apache.lucene.facet.search.FacetResultNode;
 import org.apache.lucene.facet.search.FacetsCollector;
-import org.apache.lucene.facet.search.params.CountFacetRequest;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.results.FacetResultNode;
 import org.apache.lucene.facet.taxonomy.CategoryPath;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
 import org.apache.lucene.index.IndexReader;

Modified: lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationExample.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationExample.java Fri Feb  8 14:35:50 2013
@@ -5,7 +5,7 @@ import org.junit.Test;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.demo.facet.ExampleResult;
 import org.apache.lucene.demo.facet.association.CategoryAssociationsMain;
-import org.apache.lucene.facet.search.results.FacetResultNode;
+import org.apache.lucene.facet.search.FacetResultNode;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCLExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCLExample.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCLExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCLExample.java Fri Feb  8 14:35:50 2013
@@ -8,8 +8,8 @@ import org.junit.Test;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.demo.facet.ExampleResult;
 import org.apache.lucene.demo.facet.multiCL.MultiCLMain;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.results.FacetResultNode;
+import org.apache.lucene.facet.search.FacetResult;
+import org.apache.lucene.facet.search.FacetResultNode;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleExample.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleExample.java Fri Feb  8 14:35:50 2013
@@ -7,8 +7,8 @@ import org.junit.Test;
 import org.apache.lucene.util.LuceneTestCase;
 import org.apache.lucene.demo.facet.ExampleResult;
 import org.apache.lucene.demo.facet.simple.SimpleMain;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.results.FacetResultNode;
+import org.apache.lucene.facet.search.FacetResult;
+import org.apache.lucene.facet.search.FacetResultNode;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationFloatSumAggregator.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/associations/AssociationFloatSumAggregator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationFloatSumAggregator.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationFloatSumAggregator.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/associations/AssociationFloatSumAggregator.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/associations/AssociationFloatSumAggregator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationFloatSumAggregator.java Fri Feb  8 14:35:50 2013
@@ -1,14 +1,12 @@
-package org.apache.lucene.facet.search.aggregator.associations;
+package org.apache.lucene.facet.associations;
 
 import java.io.IOException;
 
-import org.apache.lucene.facet.associations.CategoryFloatAssociation;
-import org.apache.lucene.facet.associations.FloatAssociationsIterator;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.search.aggregator.Aggregator;
+import org.apache.lucene.facet.collections.IntToFloatMap;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.search.Aggregator;
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.util.IntsRef;
-import org.apache.lucene.util.collections.IntToFloatMap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationFloatSumFacetRequest.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/associations/AssociationFloatSumFacetRequest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationFloatSumFacetRequest.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationFloatSumFacetRequest.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/associations/AssociationFloatSumFacetRequest.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/associations/AssociationFloatSumFacetRequest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationFloatSumFacetRequest.java Fri Feb  8 14:35:50 2013
@@ -1,11 +1,10 @@
-package org.apache.lucene.facet.search.params.associations;
+package org.apache.lucene.facet.associations;
 
 import java.io.IOException;
 
+import org.apache.lucene.facet.search.Aggregator;
 import org.apache.lucene.facet.search.FacetArrays;
-import org.apache.lucene.facet.search.aggregator.Aggregator;
-import org.apache.lucene.facet.search.aggregator.associations.AssociationFloatSumAggregator;
-import org.apache.lucene.facet.search.params.FacetRequest;
+import org.apache.lucene.facet.search.FacetRequest;
 import org.apache.lucene.facet.taxonomy.CategoryPath;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
 

Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumAggregator.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/associations/AssociationIntSumAggregator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumAggregator.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumAggregator.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/associations/AssociationIntSumAggregator.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/associations/AssociationIntSumAggregator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumAggregator.java Fri Feb  8 14:35:50 2013
@@ -1,14 +1,12 @@
-package org.apache.lucene.facet.search.aggregator.associations;
+package org.apache.lucene.facet.associations;
 
 import java.io.IOException;
 
-import org.apache.lucene.facet.associations.CategoryIntAssociation;
-import org.apache.lucene.facet.associations.IntAssociationsIterator;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.search.aggregator.Aggregator;
+import org.apache.lucene.facet.collections.IntToIntMap;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.search.Aggregator;
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.util.IntsRef;
-import org.apache.lucene.util.collections.IntToIntMap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumFacetRequest.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/associations/AssociationIntSumFacetRequest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumFacetRequest.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumFacetRequest.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/associations/AssociationIntSumFacetRequest.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/associations/AssociationIntSumFacetRequest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumFacetRequest.java Fri Feb  8 14:35:50 2013
@@ -1,12 +1,10 @@
-package org.apache.lucene.facet.search.params.associations;
+package org.apache.lucene.facet.associations;
 
 import java.io.IOException;
 
+import org.apache.lucene.facet.search.Aggregator;
 import org.apache.lucene.facet.search.FacetArrays;
-import org.apache.lucene.facet.search.aggregator.Aggregator;
-import org.apache.lucene.facet.search.aggregator.associations.AssociationFloatSumAggregator;
-import org.apache.lucene.facet.search.aggregator.associations.AssociationIntSumAggregator;
-import org.apache.lucene.facet.search.params.FacetRequest;
+import org.apache.lucene.facet.search.FacetRequest;
 import org.apache.lucene.facet.taxonomy.CategoryPath;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
 

Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumFacetsAggregator.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/search/AssociationIntSumFacetsAggregator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumFacetsAggregator.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumFacetsAggregator.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/search/AssociationIntSumFacetsAggregator.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/search/AssociationIntSumFacetsAggregator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationIntSumFacetsAggregator.java Fri Feb  8 14:35:50 2013
@@ -1,9 +1,10 @@
-package org.apache.lucene.facet.associations.search;
+package org.apache.lucene.facet.associations;
 
 import java.io.IOException;
 
-import org.apache.lucene.facet.index.params.CategoryListParams;
+import org.apache.lucene.facet.params.CategoryListParams;
 import org.apache.lucene.facet.search.FacetArrays;
+import org.apache.lucene.facet.search.FacetRequest;
 import org.apache.lucene.facet.search.FacetsAggregator;
 import org.apache.lucene.facet.search.FacetsCollector.MatchingDocs;
 
@@ -35,8 +36,8 @@ public class AssociationIntSumFacetsAggr
       FacetArrays facetArrays) throws IOException {}
   
   @Override
-  public void rollupValues(int ordinal, int[] children, int[] siblings,
-      FacetArrays facetArrays) {}
+  public void rollupValues(FacetRequest fr, int ordinal, int[] children,
+      int[] siblings, FacetArrays facetArrays) {}
   
   @Override
   public boolean requiresDocScores() {

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsDrillDownStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsDrillDownStream.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsDrillDownStream.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsDrillDownStream.java Fri Feb  8 14:35:50 2013
@@ -2,7 +2,7 @@ package org.apache.lucene.facet.associat
 
 import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
 import org.apache.lucene.facet.index.DrillDownStream;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
 import org.apache.lucene.facet.taxonomy.CategoryPath;
 import org.apache.lucene.store.ByteArrayDataOutput;
 import org.apache.lucene.util.BytesRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsFacetFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsFacetFields.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsFacetFields.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsFacetFields.java Fri Feb  8 14:35:50 2013
@@ -10,8 +10,8 @@ import org.apache.lucene.document.TextFi
 import org.apache.lucene.facet.index.CountingListBuilder;
 import org.apache.lucene.facet.index.DrillDownStream;
 import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
 import org.apache.lucene.facet.taxonomy.CategoryPath;
 import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
 import org.apache.lucene.index.FieldInfo.IndexOptions;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/FloatAssociationsIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/FloatAssociationsIterator.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/FloatAssociationsIterator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/FloatAssociationsIterator.java Fri Feb  8 14:35:50 2013
@@ -2,7 +2,7 @@ package org.apache.lucene.facet.associat
 
 import java.io.IOException;
 
-import org.apache.lucene.util.collections.IntToFloatMap;
+import org.apache.lucene.facet.collections.IntToFloatMap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/IntAssociationsIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/IntAssociationsIterator.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/IntAssociationsIterator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/IntAssociationsIterator.java Fri Feb  8 14:35:50 2013
@@ -2,7 +2,7 @@ package org.apache.lucene.facet.associat
 
 import java.io.IOException;
 
-import org.apache.lucene.util.collections.IntToIntMap;
+import org.apache.lucene.facet.collections.IntToIntMap;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/package.html?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/package.html (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/package.html Fri Feb  8 14:35:50 2013
@@ -19,11 +19,7 @@
 <title>Category Association</title>
 </head>
 <body>
-<h1>Category Association</h1>
-
-Allows association of arbitrary values with a category. The value can be used e.g. to compute
-the category's weight during faceted search. Two association implementations exist for
-{@link org.apache.lucene.facet.associations.CategoryIntAssociation int} and
-{@link org.apache.lucene.facet.associations.CategoryFloatAssociation float} values.
+Allows associating arbitrary values with a category. The value can be used e.g. to compute
+the category's weight during faceted search.
 </body>
 </html>

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ArrayHashMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ArrayHashMap.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ArrayHashMap.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ArrayHashMap.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 import java.util.Arrays;
 import java.util.Iterator;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/DoubleIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/DoubleIterator.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/DoubleIterator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/DoubleIterator.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/FloatIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/FloatIterator.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/FloatIterator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/FloatIterator.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/FloatToObjectMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/FloatToObjectMap.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/FloatToObjectMap.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/FloatToObjectMap.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 import java.util.Arrays;
 import java.util.Iterator;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntArray.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntArray.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntArray.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntArray.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 import java.util.Arrays;
 

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntHashSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntHashSet.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntHashSet.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntHashSet.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 import java.util.Arrays;
 

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntIterator.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntIterator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntIterator.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToDoubleMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToDoubleMap.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToDoubleMap.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToDoubleMap.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 import java.util.Arrays;
 

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToFloatMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToFloatMap.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToFloatMap.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToFloatMap.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 import java.util.Arrays;
 

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToIntMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToIntMap.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToIntMap.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToIntMap.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 import java.util.Arrays;
 

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToObjectMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToObjectMap.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToObjectMap.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/IntToObjectMap.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 import java.util.Arrays;
 import java.util.Iterator;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/LRUHashMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/LRUHashMap.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/LRUHashMap.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/LRUHashMap.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ObjectToFloatMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ObjectToFloatMap.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ObjectToFloatMap.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ObjectToFloatMap.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 import java.util.Arrays;
 import java.util.Iterator;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ObjectToIntMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ObjectToIntMap.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ObjectToIntMap.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/ObjectToIntMap.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
 
 import java.util.Arrays;
 import java.util.Iterator;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/package.html?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/package.html (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/collections/package.html Fri Feb  8 14:35:50 2013
@@ -16,9 +16,9 @@
 -->
 <html>
 <head>
-<title>Collections</title>
+<title>Facets Collections</title>
 </head>
 <body>
-	Various optimized Collections implementations.
+Various optimized Collections implementations.
 </body>
 </html>
\ No newline at end of file

Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/ComplementCountingAggregator.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ComplementCountingAggregator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/ComplementCountingAggregator.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/ComplementCountingAggregator.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ComplementCountingAggregator.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ComplementCountingAggregator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/ComplementCountingAggregator.java Fri Feb  8 14:35:50 2013
@@ -1,7 +1,8 @@
-package org.apache.lucene.facet.search.aggregator;
+package org.apache.lucene.facet.complements;
 
 import java.io.IOException;
 
+import org.apache.lucene.facet.search.CountingAggregator;
 import org.apache.lucene.util.IntsRef;
 
 /*

Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/TotalFacetCounts.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/TotalFacetCounts.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/TotalFacetCounts.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCounts.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/TotalFacetCounts.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search;
+package org.apache.lucene.facet.complements;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -11,13 +11,16 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
-import org.apache.lucene.facet.search.aggregator.Aggregator;
-import org.apache.lucene.facet.search.aggregator.CountingAggregator;
-import org.apache.lucene.facet.search.params.CountFacetRequest;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.FacetSearchParams;
+import org.apache.lucene.facet.search.Aggregator;
+import org.apache.lucene.facet.search.CategoryListIterator;
+import org.apache.lucene.facet.search.CountFacetRequest;
+import org.apache.lucene.facet.search.CountingAggregator;
+import org.apache.lucene.facet.search.FacetArrays;
+import org.apache.lucene.facet.search.FacetRequest;
+import org.apache.lucene.facet.search.StandardFacetsAccumulator;
 import org.apache.lucene.facet.taxonomy.CategoryPath;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
 import org.apache.lucene.facet.util.PartitionsUtils;

Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/TotalFacetCountsCache.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCountsCache.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/TotalFacetCountsCache.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/TotalFacetCountsCache.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCountsCache.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TotalFacetCountsCache.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/TotalFacetCountsCache.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search;
+package org.apache.lucene.facet.complements;
 
 import java.io.File;
 import java.io.IOException;
@@ -7,8 +7,8 @@ import java.util.LinkedHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
 import org.apache.lucene.facet.taxonomy.TaxonomyReader;
 import org.apache.lucene.index.IndexReader;
 

Added: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/package.html?rev=1444026&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/package.html (added)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/complements/package.html Fri Feb  8 14:35:50 2013
@@ -0,0 +1,27 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html>
+<head>
+<title>Facets Complements counting</title>
+</head>
+<body>
+Allows to cache the total counts of categories, so that during search which 
+returns a large number of results (>60% of segment size), the complement set 
+of matching documents is counted. Useful for queries that visit a large 
+number of documents, e.g. overview queries.
+</body>
+</html>
\ No newline at end of file

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/ChunksIntEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/ChunksIntEncoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/ChunksIntEncoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/ChunksIntEncoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapIntDecoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapIntDecoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapIntDecoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapIntDecoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapIntEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapIntEncoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapIntEncoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapIntEncoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapVInt8IntDecoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapVInt8IntDecoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapVInt8IntDecoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapVInt8IntDecoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.BytesRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapVInt8IntEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapVInt8IntEncoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapVInt8IntEncoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/DGapVInt8IntEncoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/EightFlagsIntDecoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/EightFlagsIntDecoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/EightFlagsIntDecoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/EightFlagsIntDecoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/EightFlagsIntEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/EightFlagsIntEncoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/EightFlagsIntEncoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/EightFlagsIntEncoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/FourFlagsIntDecoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/FourFlagsIntDecoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/FourFlagsIntDecoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/FourFlagsIntDecoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/FourFlagsIntEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/FourFlagsIntEncoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/FourFlagsIntEncoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/FourFlagsIntEncoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntDecoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntDecoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntDecoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntDecoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntEncoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntEncoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntEncoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntEncoderFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntEncoderFilter.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntEncoderFilter.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/IntEncoderFilter.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 
 /*

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/NOnesIntDecoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/NOnesIntDecoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/NOnesIntDecoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/NOnesIntDecoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/NOnesIntEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/NOnesIntEncoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/NOnesIntEncoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/NOnesIntEncoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SimpleIntDecoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SimpleIntDecoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SimpleIntDecoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SimpleIntDecoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.BytesRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SimpleIntEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SimpleIntEncoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SimpleIntEncoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SimpleIntEncoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SortingIntEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SortingIntEncoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SortingIntEncoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/SortingIntEncoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import java.util.Arrays;
 

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/UniqueValuesIntEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/UniqueValuesIntEncoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/UniqueValuesIntEncoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/UniqueValuesIntEncoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.BytesRef;
 import org.apache.lucene.util.IntsRef;

Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/VInt8IntDecoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/VInt8IntDecoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/VInt8IntDecoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/VInt8IntDecoder.java Fri Feb  8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
 
 import org.apache.lucene.util.ArrayUtil;
 import org.apache.lucene.util.BytesRef;