You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/03/30 14:41:35 UTC
svn commit: r1307386 [1/5] - in /lucene/dev/branches/lucene3930: ./
dev-tools/ dev-tools/eclipse/ dev-tools/maven/
dev-tools/maven/modules/benchmark/ dev-tools/maven/solr/core/
dev-tools/maven/solr/solrj/ lucene/ lucene/contrib/
lucene/contrib/misc/src...
Author: rmuir
Date: Fri Mar 30 12:41:28 2012
New Revision: 1307386
URL: http://svn.apache.org/viewvc?rev=1307386&view=rev
Log:
LUCENE-3930: merge trunk (1306069:1307382)
Added:
lucene/dev/branches/lucene3930/lucene/test-framework/src/java/org/apache/lucene/util/Rethrow.java
- copied unchanged from r1307382, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/Rethrow.java
lucene/dev/branches/lucene3930/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DocTermsIndexDocValues.java
- copied unchanged from r1307382, lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/DocTermsIndexDocValues.java
lucene/dev/branches/lucene3930/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java
- copied unchanged from r1307382, lucene/dev/trunk/solr/contrib/analysis-extras/src/java/org/apache/solr/analysis/MorfologikFilterFactory.java
lucene/dev/branches/lucene3930/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestMorfologikFilterFactory.java
- copied unchanged from r1307382, lucene/dev/trunk/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestMorfologikFilterFactory.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java
- copied unchanged from r1307382, lucene/dev/trunk/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java
lucene/dev/branches/lucene3930/solr/core/src/test-files/solr/conf/open-exchange-rates.json
- copied unchanged from r1307382, lucene/dev/trunk/solr/core/src/test-files/solr/conf/open-exchange-rates.json
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java
- copied unchanged from r1307382, lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java
lucene/dev/branches/lucene3930/solr/example/solr/conf/lang/userdict_ja.txt
- copied unchanged from r1307382, lucene/dev/trunk/solr/example/solr/conf/lang/userdict_ja.txt
lucene/dev/branches/lucene3930/solr/lib/httpclient-LICENSE-ASL.txt (props changed)
- copied unchanged from r1307382, lucene/dev/trunk/solr/lib/httpclient-LICENSE-ASL.txt
lucene/dev/branches/lucene3930/solr/lib/httpclient-NOTICE.txt (props changed)
- copied unchanged from r1307382, lucene/dev/trunk/solr/lib/httpclient-NOTICE.txt
lucene/dev/branches/lucene3930/solr/lib/httpcore-LICENSE-ASL.txt (props changed)
- copied unchanged from r1307382, lucene/dev/trunk/solr/lib/httpcore-LICENSE-ASL.txt
lucene/dev/branches/lucene3930/solr/lib/httpcore-NOTICE.txt (props changed)
- copied unchanged from r1307382, lucene/dev/trunk/solr/lib/httpcore-NOTICE.txt
lucene/dev/branches/lucene3930/solr/lib/httpmime-LICENSE-ASL.txt (props changed)
- copied unchanged from r1307382, lucene/dev/trunk/solr/lib/httpmime-LICENSE-ASL.txt
lucene/dev/branches/lucene3930/solr/lib/httpmime-NOTICE.txt (props changed)
- copied unchanged from r1307382, lucene/dev/trunk/solr/lib/httpmime-NOTICE.txt
lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
- copied unchanged from r1307382, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrServer.java
lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
- copied unchanged from r1307382, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/BasicHttpSolrServerTest.java
- copied unchanged from r1307382, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/BasicHttpSolrServerTest.java
Removed:
lucene/dev/branches/lucene3930/modules/benchmark/lib/lucene-xercesImpl-pom.xml.template
lucene/dev/branches/lucene3930/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java
lucene/dev/branches/lucene3930/solr/lib/commons-httpclient-LICENSE-ASL.txt
lucene/dev/branches/lucene3930/solr/lib/commons-httpclient-NOTICE.txt
lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CommonsHttpSolrServer.java
lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
Modified:
lucene/dev/branches/lucene3930/ (props changed)
lucene/dev/branches/lucene3930/dev-tools/ (props changed)
lucene/dev/branches/lucene3930/dev-tools/eclipse/dot.classpath
lucene/dev/branches/lucene3930/dev-tools/maven/modules/benchmark/pom.xml.template
lucene/dev/branches/lucene3930/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene3930/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/branches/lucene3930/dev-tools/maven/solr/solrj/pom.xml.template
lucene/dev/branches/lucene3930/lucene/ (props changed)
lucene/dev/branches/lucene3930/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3930/lucene/contrib/ (props changed)
lucene/dev/branches/lucene3930/lucene/contrib/CHANGES.txt
lucene/dev/branches/lucene3930/lucene/contrib/contrib-build.xml
lucene/dev/branches/lucene3930/lucene/contrib/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java
lucene/dev/branches/lucene3930/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java
lucene/dev/branches/lucene3930/lucene/core/ (props changed)
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/Token.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermBuffer.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/Payload.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/ReadersAndLiveDocs.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/TermState.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/Query.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearPayloadCheckQuery.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanPayloadCheckQuery.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionRangeQuery.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/store/DataInput.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/store/Directory.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/util/AttributeImpl.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/util/DoubleBarrelLRUCache.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/util/OpenBitSet.java
lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
lucene/dev/branches/lucene3930/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java
lucene/dev/branches/lucene3930/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/branches/lucene3930/lucene/core/src/test/org/apache/lucene/index/TestFieldInfos.java
lucene/dev/branches/lucene3930/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/lucene3930/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
lucene/dev/branches/lucene3930/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
lucene/dev/branches/lucene3930/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
lucene/dev/branches/lucene3930/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
lucene/dev/branches/lucene3930/lucene/core/src/test/org/apache/lucene/util/TestDoubleBarrelLRUCache.java
lucene/dev/branches/lucene3930/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java
lucene/dev/branches/lucene3930/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene3930/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
lucene/dev/branches/lucene3930/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSingleIntIndexInput.java
lucene/dev/branches/lucene3930/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java
lucene/dev/branches/lucene3930/lucene/tools/ (props changed)
lucene/dev/branches/lucene3930/lucene/tools/custom-tasks.xml
lucene/dev/branches/lucene3930/modules/analysis/common/ (props changed)
lucene/dev/branches/lucene3930/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java
lucene/dev/branches/lucene3930/modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
lucene/dev/branches/lucene3930/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java
lucene/dev/branches/lucene3930/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/SingleTokenTokenStream.java
lucene/dev/branches/lucene3930/modules/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayIterator.java
lucene/dev/branches/lucene3930/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/PatternAnalyzerTest.java
lucene/dev/branches/lucene3930/modules/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java
lucene/dev/branches/lucene3930/modules/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CharArrayIterator.java
lucene/dev/branches/lucene3930/modules/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/LaoBreakIterator.java
lucene/dev/branches/lucene3930/modules/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestCharArrayIterator.java
lucene/dev/branches/lucene3930/modules/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java
lucene/dev/branches/lucene3930/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/stoptags.txt
lucene/dev/branches/lucene3930/modules/analysis/kuromoji/src/resources/org/apache/lucene/analysis/ja/stopwords.txt
lucene/dev/branches/lucene3930/modules/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagAttributeImpl.java
lucene/dev/branches/lucene3930/modules/benchmark/CHANGES.txt
lucene/dev/branches/lucene3930/modules/benchmark/NOTICE.txt
lucene/dev/branches/lucene3930/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParserTokenManager.java
lucene/dev/branches/lucene3930/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java
lucene/dev/branches/lucene3930/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java
lucene/dev/branches/lucene3930/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java
lucene/dev/branches/lucene3930/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java
lucene/dev/branches/lucene3930/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java
lucene/dev/branches/lucene3930/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java
lucene/dev/branches/lucene3930/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java
lucene/dev/branches/lucene3930/modules/facet/src/java/org/apache/lucene/facet/index/attributes/CategoryAttributeImpl.java
lucene/dev/branches/lucene3930/modules/facet/src/java/org/apache/lucene/facet/search/params/FacetRequest.java
lucene/dev/branches/lucene3930/modules/facet/src/java/org/apache/lucene/facet/taxonomy/CategoryPath.java
lucene/dev/branches/lucene3930/modules/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java
lucene/dev/branches/lucene3930/modules/facet/src/test/org/apache/lucene/facet/search/params/FacetRequestTest.java
lucene/dev/branches/lucene3930/modules/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java
lucene/dev/branches/lucene3930/modules/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java
lucene/dev/branches/lucene3930/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
lucene/dev/branches/lucene3930/modules/queries/src/java/org/apache/lucene/queries/BoostingQuery.java
lucene/dev/branches/lucene3930/modules/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java
lucene/dev/branches/lucene3930/modules/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java
lucene/dev/branches/lucene3930/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
lucene/dev/branches/lucene3930/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java
lucene/dev/branches/lucene3930/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserTokenManager.java
lucene/dev/branches/lucene3930/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java
lucene/dev/branches/lucene3930/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParserTokenManager.java
lucene/dev/branches/lucene3930/modules/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/OpenRangeQueryNodeProcessor.java
lucene/dev/branches/lucene3930/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/QueryParserTokenManager.java
lucene/dev/branches/lucene3930/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java
lucene/dev/branches/lucene3930/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java
lucene/dev/branches/lucene3930/modules/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java
lucene/dev/branches/lucene3930/solr/ (props changed)
lucene/dev/branches/lucene3930/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3930/solr/NOTICE.txt (contents, props changed)
lucene/dev/branches/lucene3930/solr/common-build.xml (contents, props changed)
lucene/dev/branches/lucene3930/solr/contrib/ (props changed)
lucene/dev/branches/lucene3930/solr/contrib/analysis-extras/build.xml
lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java
lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestContentStreamDataSource.java
lucene/dev/branches/lucene3930/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java
lucene/dev/branches/lucene3930/solr/core/ (props changed)
lucene/dev/branches/lucene3930/solr/core/ivy.xml
lucene/dev/branches/lucene3930/solr/core/src/java/doc-files/tutorial.html
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/analysis/CommonGramsFilterFactory.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/analysis/CommonGramsQueryFilterFactory.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/analysis/JapaneseTokenizerFactory.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/schema/DateField.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/schema/SortableFloatField.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/schema/SortableIntField.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/schema/SortableLongField.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/schema/StrFieldSource.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/search/WrappedQuery.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/update/PeerSync.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java
lucene/dev/branches/lucene3930/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java
lucene/dev/branches/lucene3930/solr/core/src/test-files/solr/conf/schema.xml
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/TestSolrCoreProperties.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/analysis/TestJapaneseTokenizerFactory.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/schema/CurrencyFieldTest.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java
lucene/dev/branches/lucene3930/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
lucene/dev/branches/lucene3930/solr/example/ (props changed)
lucene/dev/branches/lucene3930/solr/example/solr/conf/lang/stoptags_ja.txt
lucene/dev/branches/lucene3930/solr/example/solr/conf/lang/stopwords_ja.txt
lucene/dev/branches/lucene3930/solr/example/solr/conf/schema.xml
lucene/dev/branches/lucene3930/solr/example/solr/conf/solrconfig.xml
lucene/dev/branches/lucene3930/solr/lib/ (props changed)
lucene/dev/branches/lucene3930/solr/solrj/ (props changed)
lucene/dev/branches/lucene3930/solr/solrj/ivy.xml
lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java
lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
lucene/dev/branches/lucene3930/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java
lucene/dev/branches/lucene3930/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
lucene/dev/branches/lucene3930/solr/test-framework/ (props changed)
lucene/dev/branches/lucene3930/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/branches/lucene3930/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java
lucene/dev/branches/lucene3930/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/lucene3930/solr/testlogging.properties (contents, props changed)
Modified: lucene/dev/branches/lucene3930/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/dev-tools/eclipse/dot.classpath?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/lucene3930/dev-tools/eclipse/dot.classpath Fri Mar 30 12:41:28 2012
@@ -39,7 +39,7 @@
<classpathentry kind="src" path="modules/analysis/uima/src/test"/>
<classpathentry kind="src" path="modules/benchmark/src/java"/>
<classpathentry kind="src" path="modules/benchmark/src/test"/>
- <classpathentry excluding="src" including="conf/**" kind="src" path="modules/benchmark"/>
+ <classpathentry excluding="src" including="conf/**" kind="src" path="modules/benchmark"/>
<classpathentry kind="src" path="modules/facet/src/java"/>
<classpathentry kind="src" path="modules/facet/src/examples"/>
<classpathentry kind="src" path="modules/facet/src/test"/>
@@ -100,11 +100,13 @@
<classpathentry kind="lib" path="modules/analysis/morfologik/lib/morfologik-polish-1.5.2.jar"/>
<classpathentry kind="lib" path="modules/analysis/morfologik/lib/morfologik-stemming-1.5.2.jar"/>
<classpathentry kind="lib" path="modules/benchmark/lib/commons-compress-1.2.jar"/>
- <classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar"/>
+ <classpathentry kind="lib" path="modules/benchmark/lib/xercesImpl-2.9.1.jar"/>
<classpathentry kind="lib" path="solr/lib/apache-solr-noggit-r1211150.jar"/>
<classpathentry kind="lib" path="solr/lib/apache-solr-commons-csv-1.0-SNAPSHOT-r966014.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-fileupload-1.2.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/commons-httpclient-3.1.jar"/>
+ <classpathentry kind="lib" path="solr/lib/httpclient-4.1.3.jar"/>
+ <classpathentry kind="lib" path="solr/lib/httpcore-4.1.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/httpmime-4.1.3.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-io-2.1.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
@@ -167,8 +169,8 @@
<classpathentry kind="lib" path="solr/contrib/uima/lib/uimaj-core-2.3.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/contrib/velocity/lib/velocity-tools-2.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar"/>
- <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-collections-3.2.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-collections-3.2.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: lucene/dev/branches/lucene3930/dev-tools/maven/modules/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/dev-tools/maven/modules/benchmark/pom.xml.template?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/dev-tools/maven/modules/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/lucene3930/dev-tools/maven/modules/benchmark/pom.xml.template Fri Mar 30 12:41:28 2012
@@ -85,11 +85,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>lucene-xercesImpl</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
</dependency>
@@ -97,6 +92,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene3930/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/dev-tools/maven/pom.xml.template?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene3930/dev-tools/maven/pom.xml.template Fri Mar 30 12:41:28 2012
@@ -45,6 +45,7 @@
<jetty.version>8.1.2.v20120308</jetty.version>
<slf4j.version>1.6.1</slf4j.version>
<tika.version>1.0</tika.version>
+ <httpcomponents.version>4.1.3</httpcomponents.version>
</properties>
<issueManagement>
<system>JIRA</system>
@@ -150,9 +151,14 @@
<version>2.1</version>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpcomponents.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>${httpcomponents.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -344,6 +350,11 @@
<artifactId>spatial4j</artifactId>
<version>0.2</version>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.9.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
Modified: lucene/dev/branches/lucene3930/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/dev-tools/maven/solr/core/pom.xml.template?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/lucene3930/dev-tools/maven/solr/core/pom.xml.template Fri Mar 30 12:41:28 2012
@@ -78,6 +78,11 @@
</dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-morfologik</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
<artifactId>lucene-analyzers-phonetic</artifactId>
<version>${project.version}</version>
</dependency>
@@ -136,14 +141,8 @@
<artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -198,6 +197,20 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene3930/dev-tools/maven/solr/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/dev-tools/maven/solr/solrj/pom.xml.template?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/dev-tools/maven/solr/solrj/pom.xml.template (original)
+++ lucene/dev/branches/lucene3930/dev-tools/maven/solr/solrj/pom.xml.template Fri Mar 30 12:41:28 2012
@@ -84,14 +84,8 @@
<artifactId>log4j-over-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -101,6 +95,22 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <!-- HttpSolrServer requires this dependency. -->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <!-- HttpSolrServer requires this dependency. -->
+ </dependency>
<!-- Technically, this is optional in SolrJ; but it's fast. SOLR-2852 -->
<dependency>
<groupId>org.codehaus.woodstox</groupId>
Modified: lucene/dev/branches/lucene3930/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/CHANGES.txt?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3930/lucene/CHANGES.txt Fri Mar 30 12:41:28 2012
@@ -257,6 +257,8 @@ Changes in backwards compatibility polic
you can use SlowCompositeReaderWrapper to make all parallel readers atomic
and use ParallelAtomicReader. (Uwe Schindler, Mike McCandless, Robert Muir)
+* LUCENE-2000: clone() now returns covariant types where possible. (ryan)
+
Changes in Runtime Behavior
* LUCENE-2846: omitNorms now behaves like omitTermFrequencyAndPositions, if you
Modified: lucene/dev/branches/lucene3930/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/contrib/CHANGES.txt?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3930/lucene/contrib/CHANGES.txt Fri Mar 30 12:41:28 2012
@@ -106,6 +106,9 @@ API Changes
not take position overlaps into account while recalculating norms.
(Uwe Schindler, Robert Muir)
+ * LUCENE-3936: Renamed StringIndexDocValues to DocTermsIndexDocValues.
+ (Martijn van Groningen)
+
Bug Fixes
* LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was
@@ -290,6 +293,9 @@ Bug Fixes
* LUCENE-3894: ICUTokenizer, NGramTokenizer and EdgeNGramTokenizer
could stop early if the Reader only partially fills the provided
buffer. (Mike McCandless)
+
+ * LUCENE-3937: Workaround a XERCES-J bug in benchmark module.
+ (Uwe Schindler, Robert Muir, Mike McCandless)
Documentation
Modified: lucene/dev/branches/lucene3930/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/contrib/contrib-build.xml?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/lucene3930/lucene/contrib/contrib-build.xml Fri Mar 30 12:41:28 2012
@@ -163,16 +163,33 @@
</target>
<property name="analyzers-uima.jar" value="${common.dir}/../modules/analysis/build/uima/lucene-analyzers-uima-${version}.jar"/>
- <target name="check-analyzers-uima-uptodate" unless="analyzers-uima.uptodate">
- <module-uptodate name="analysis/uima" jarfile="${analyzers-uima.jar}" property="analyzers-uima.uptodate"/>
- </target>
- <target name="jar-analyzers-uima" unless="analyzers-uima.uptodate" depends="check-analyzers-uima-uptodate">
- <ant dir="${common.dir}/../modules/analysis/uima" target="jar-core" inheritAll="false">
- <propertyset refid="uptodate.and.compiled.properties"/>
- </ant>
+ <target name="check-analyzers-uima-uptodate" unless="analyzers-uima.uptodate">
+ <module-uptodate name="analysis/uima" jarfile="${analyzers-uima.jar}" property="analyzers-uima.uptodate"/>
+ </target>
+ <target name="jar-analyzers-uima" unless="analyzers-uima.uptodate" depends="check-analyzers-uima-uptodate">
+ <ant dir="${common.dir}/../modules/analysis/uima" target="jar-core" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
<property name="analyzers-uima.uptodate" value="true"/>
</target>
+ <property name="analyzers-morfologik.jar" value="${common.dir}/../modules/analysis/build/morfologik/lucene-analyzers-morfologik-${version}.jar"/>
+ <fileset id="analyzers-morfologik.fileset" dir="${common.dir}/../modules/analysis">
+ <include name="build/morfologik/lucene-analyzers-morfologik-${version}.jar" />
+ <include name="morfologik/lib/morfologik-fsa-1.5.2.jar" />
+ <include name="morfologik/lib/morfologik-polish-1.5.2.jar" />
+ <include name="morfologik/lib/morfologik-stemming-1.5.2.jar" />
+ </fileset>
+ <target name="check-analyzers-morfologik-uptodate" unless="analyzers-morfologik.uptodate">
+ <module-uptodate name="analysis/morfologik" jarfile="${analyzers-morfologik.jar}" property="analyzers-morfologik.uptodate"/>
+ </target>
+ <target name="jar-analyzers-morfologik" unless="analyzers-morfologik.uptodate" depends="check-analyzers-morfologik-uptodate">
+ <ant dir="${common.dir}/../modules/analysis/morfologik" target="jar-core" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="analyzers-morfologik.uptodate" value="true"/>
+ </target>
+
<property name="grouping.jar" value="${common.dir}/../modules/grouping/build/lucene-grouping-${version}.jar"/>
<target name="check-grouping-uptodate" unless="grouping.uptodate">
<module-uptodate name="grouping" jarfile="${grouping.jar}" property="grouping.uptodate"/>
Modified: lucene/dev/branches/lucene3930/lucene/contrib/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/contrib/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/contrib/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java (original)
+++ lucene/dev/branches/lucene3930/lucene/contrib/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java Fri Mar 30 12:41:28 2012
@@ -424,7 +424,7 @@ public class NativeUnixDirectory extends
}
@Override
- public Object clone() {
+ public NativeUnixIndexInput clone() {
try {
return new NativeUnixIndexInput(this);
} catch (IOException ioe) {
Modified: lucene/dev/branches/lucene3930/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java (original)
+++ lucene/dev/branches/lucene3930/lucene/contrib/misc/src/java/org/apache/lucene/store/WindowsDirectory.java Fri Mar 30 12:41:28 2012
@@ -120,7 +120,7 @@ public class WindowsDirectory extends FS
}
@Override
- public Object clone() {
+ public WindowsIndexInput clone() {
WindowsIndexInput clone = (WindowsIndexInput)super.clone();
clone.isClone = true;
return clone;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/Token.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/Token.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/Token.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/Token.java Fri Mar 30 12:41:28 2012
@@ -366,11 +366,11 @@ public class Token extends CharTermAttri
}
@Override
- public Object clone() {
+ public Token clone() {
Token t = (Token)super.clone();
// Do a deep clone
if (payload != null) {
- t.payload = (Payload) payload.clone();
+ t.payload = payload.clone();
}
return t;
}
@@ -386,7 +386,7 @@ public class Token extends CharTermAttri
t.flags = flags;
t.type = type;
if (payload != null)
- t.payload = (Payload) payload.clone();
+ t.payload = payload.clone();
return t;
}
@@ -577,13 +577,13 @@ public class Token extends CharTermAttri
to.reinit(this);
// reinit shares the payload, so clone it:
if (payload !=null) {
- to.payload = (Payload) payload.clone();
+ to.payload = payload.clone();
}
} else {
super.copyTo(target);
((OffsetAttribute) target).setOffset(startOffset, endOffset);
((PositionIncrementAttribute) target).setPositionIncrement(positionIncrement);
- ((PayloadAttribute) target).setPayload((payload == null) ? null : (Payload) payload.clone());
+ ((PayloadAttribute) target).setPayload((payload == null) ? null : payload.clone());
((FlagsAttribute) target).setFlags(flags);
((TypeAttribute) target).setType(type);
}
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java Fri Mar 30 12:41:28 2012
@@ -208,7 +208,7 @@ public class CharTermAttributeImpl exten
}
@Override
- public Object clone() {
+ public CharTermAttributeImpl clone() {
CharTermAttributeImpl t = (CharTermAttributeImpl)super.clone();
// Do a deep clone
t.termBuffer = new char[this.termLength];
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java Fri Mar 30 12:41:28 2012
@@ -58,10 +58,10 @@ public class PayloadAttributeImpl extend
}
@Override
- public Object clone() {
+ public PayloadAttributeImpl clone() {
PayloadAttributeImpl clone = (PayloadAttributeImpl) super.clone();
if (payload != null) {
- clone.payload = (Payload) payload.clone();
+ clone.payload = payload.clone();
}
return clone;
}
@@ -92,7 +92,7 @@ public class PayloadAttributeImpl extend
@Override
public void copyTo(AttributeImpl target) {
PayloadAttribute t = (PayloadAttribute) target;
- t.setPayload((payload == null) ? null : (Payload) payload.clone());
+ t.setPayload((payload == null) ? null : payload.clone());
}
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java Fri Mar 30 12:41:28 2012
@@ -95,7 +95,7 @@ public class BlockTermsReader extends Fi
}
@Override
- public Object clone() {
+ public FieldAndTerm clone() {
return new FieldAndTerm(this);
}
@@ -729,7 +729,7 @@ public class BlockTermsReader extends Fi
public TermState termState() throws IOException {
//System.out.println("BTR.termState this=" + this);
decodeMetaData();
- TermState ts = (TermState) state.clone();
+ TermState ts = state.clone();
//System.out.println(" return ts=" + ts);
return ts;
}
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java Fri Mar 30 12:41:28 2012
@@ -803,7 +803,7 @@ public class BlockTreeTermsReader extend
@Override
public TermState termState() throws IOException {
currentFrame.decodeMetaData();
- return (TermState) currentFrame.termState.clone();
+ return currentFrame.termState.clone();
}
private Frame getFrame(int ord) throws IOException {
@@ -2166,7 +2166,7 @@ public class BlockTreeTermsReader extend
public TermState termState() throws IOException {
assert !eof;
currentFrame.decodeMetaData();
- TermState ts = (TermState) currentFrame.state.clone();
+ TermState ts = currentFrame.state.clone();
//if (DEBUG) System.out.println("BTTR.termState seg=" + segment + " state=" + ts);
return ts;
}
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java Fri Mar 30 12:41:28 2012
@@ -181,7 +181,7 @@ public abstract class FixedIntBlockIndex
}
@Override
- public Object clone() {
+ public Index clone() {
Index other = new Index();
other.fp = fp;
other.upto = upto;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java Fri Mar 30 12:41:28 2012
@@ -207,7 +207,7 @@ public abstract class VariableIntBlockIn
}
@Override
- public Object clone() {
+ public Index clone() {
Index other = new Index();
other.fp = fp;
other.upto = upto;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/SegmentTermEnum.java Fri Mar 30 12:41:28 2012
@@ -100,7 +100,7 @@ final class SegmentTermEnum implements C
}
@Override
- protected Object clone() {
+ protected SegmentTermEnum clone() {
SegmentTermEnum clone = null;
try {
clone = (SegmentTermEnum) super.clone();
@@ -109,8 +109,8 @@ final class SegmentTermEnum implements C
clone.input = (IndexInput) input.clone();
clone.termInfo = new TermInfo(termInfo);
- clone.termBuffer = (TermBuffer)termBuffer.clone();
- clone.prevBuffer = (TermBuffer)prevBuffer.clone();
+ clone.termBuffer = termBuffer.clone();
+ clone.prevBuffer = prevBuffer.clone();
clone.scanBuffer = new TermBuffer();
return clone;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermBuffer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermBuffer.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermBuffer.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermBuffer.java Fri Mar 30 12:41:28 2012
@@ -111,7 +111,7 @@ final class TermBuffer implements Clonea
}
@Override
- protected Object clone() {
+ protected TermBuffer clone() {
TermBuffer clone = null;
try {
clone = (TermBuffer)super.clone();
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java Fri Mar 30 12:41:28 2012
@@ -82,7 +82,7 @@ final class TermInfosReader {
}
@Override
- public Object clone() {
+ public CloneableTerm clone() {
return new CloneableTerm(term);
}
}
@@ -340,12 +340,12 @@ final class TermInfosReader {
/** Returns an enumeration of all the Terms and TermInfos in the set. */
public SegmentTermEnum terms() {
- return (SegmentTermEnum)origEnum.clone();
+ return origEnum.clone();
}
/** Returns an enumeration of terms starting at or after the named term. */
public SegmentTermEnum terms(Term term) throws IOException {
get(term, true);
- return (SegmentTermEnum)getThreadResources().termEnum.clone();
+ return getThreadResources().termEnum.clone();
}
}
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReaderIndex.java Fri Mar 30 12:41:28 2012
@@ -116,7 +116,7 @@ class TermInfosReaderIndex {
}
void seekEnum(SegmentTermEnum enumerator, int indexOffset) throws IOException {
- PagedBytesDataInput input = (PagedBytesDataInput) dataInput.clone();
+ PagedBytesDataInput input = dataInput.clone();
input.setPosition(indexToDataOffset.get(indexOffset));
@@ -152,7 +152,7 @@ class TermInfosReaderIndex {
int getIndexOffset(Term term) throws IOException {
int lo = 0;
int hi = indexSize - 1;
- PagedBytesDataInput input = (PagedBytesDataInput) dataInput.clone();
+ PagedBytesDataInput input = dataInput.clone();
BytesRef scratch = new BytesRef();
while (hi >= lo) {
int mid = (lo + hi) >>> 1;
@@ -176,7 +176,7 @@ class TermInfosReaderIndex {
* @throws IOException
*/
Term getTerm(int termIndex) throws IOException {
- PagedBytesDataInput input = (PagedBytesDataInput) dataInput.clone();
+ PagedBytesDataInput input = dataInput.clone();
input.setPosition(indexToDataOffset.get(termIndex));
// read the term
@@ -206,7 +206,7 @@ class TermInfosReaderIndex {
* @throws IOException
*/
int compareTo(Term term, int termIndex) throws IOException {
- return compareTo(term, termIndex, (PagedBytesDataInput) dataInput.clone(), new BytesRef());
+ return compareTo(term, termIndex, dataInput.clone(), new BytesRef());
}
/**
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java Fri Mar 30 12:41:28 2012
@@ -105,7 +105,7 @@ public class Lucene40PostingsReader exte
byte[] bytes;
@Override
- public Object clone() {
+ public StandardTermState clone() {
StandardTermState other = new StandardTermState();
other.copyFrom(this);
return other;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java Fri Mar 30 12:41:28 2012
@@ -73,7 +73,7 @@ public class PulsingPostingsReader exten
private byte[] inlinedBytes;
@Override
- public Object clone() {
+ public PulsingTermState clone() {
PulsingTermState clone;
clone = (PulsingTermState) super.clone();
if (postingsSize != -1) {
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java Fri Mar 30 12:41:28 2012
@@ -47,7 +47,7 @@ public abstract class IntIndexInput impl
public abstract void set(Index other);
@Override
- public abstract Object clone();
+ public abstract Index clone();
}
public abstract static class Reader {
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java Fri Mar 30 12:41:28 2012
@@ -161,7 +161,7 @@ public class SepPostingsReader extends P
ByteArrayDataInput bytesReader;
@Override
- public Object clone() {
+ public SepTermState clone() {
SepTermState other = new SepTermState();
other.copyFrom(this);
return other;
@@ -172,13 +172,13 @@ public class SepPostingsReader extends P
super.copyFrom(_other);
SepTermState other = (SepTermState) _other;
if (docIndex == null) {
- docIndex = (IntIndexInput.Index) other.docIndex.clone();
+ docIndex = other.docIndex.clone();
} else {
docIndex.set(other.docIndex);
}
if (other.freqIndex != null) {
if (freqIndex == null) {
- freqIndex = (IntIndexInput.Index) other.freqIndex.clone();
+ freqIndex = other.freqIndex.clone();
} else {
freqIndex.set(other.freqIndex);
}
@@ -187,7 +187,7 @@ public class SepPostingsReader extends P
}
if (other.posIndex != null) {
if (posIndex == null) {
- posIndex = (IntIndexInput.Index) other.posIndex.clone();
+ posIndex = other.posIndex.clone();
} else {
posIndex.set(other.posIndex);
}
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java Fri Mar 30 12:41:28 2012
@@ -475,7 +475,7 @@ public class CheckIndex {
}
- result.newSegments = (SegmentInfos) sis.clone();
+ result.newSegments = sis.clone();
result.newSegments.clear();
result.maxSegmentName = -1;
@@ -642,7 +642,7 @@ public class CheckIndex {
}
// Keeper
- result.newSegments.add((SegmentInfo) info.clone());
+ result.newSegments.add(info.clone());
}
if (0 == result.numBadSegments) {
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java Fri Mar 30 12:41:28 2012
@@ -87,7 +87,7 @@ public final class FieldInfo {
}
@Override
- public Object clone() {
+ public FieldInfo clone() {
return new FieldInfo(name, isIndexed, number, storeTermVector,
omitNorms, storePayloads, indexOptions, docValueType, normType);
}
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java Fri Mar 30 12:41:28 2012
@@ -163,13 +163,13 @@ public final class FieldInfos implements
* Returns a deep clone of this FieldInfos instance.
*/
@Override
- synchronized public Object clone() {
+ synchronized public FieldInfos clone() {
FieldInfos fis = new FieldInfos(globalFieldNumbers);
fis.hasFreq = hasFreq;
fis.hasProx = hasProx;
fis.hasVectors = hasVectors;
for (FieldInfo fi : this) {
- FieldInfo clone = (FieldInfo) (fi).clone();
+ FieldInfo clone = fi.clone();
fis.putInternal(clone);
}
return fis;
@@ -444,7 +444,7 @@ public final class FieldInfos implements
}
final FieldInfos roFis = new FieldInfos((FieldNumberBiMap)null);
for (FieldInfo fieldInfo : this) {
- FieldInfo clone = (FieldInfo) (fieldInfo).clone();
+ FieldInfo clone = fieldInfo.clone();
roFis.putInternal(clone);
roFis.hasVectors |= clone.storeTermVector;
roFis.hasProx |= clone.isIndexed && clone.indexOptions.compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) >= 0;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java Fri Mar 30 12:41:28 2012
@@ -145,7 +145,7 @@ public final class IndexUpgrader {
}
}
- final IndexWriterConfig c = (IndexWriterConfig) iwc.clone();
+ final IndexWriterConfig c = iwc.clone();
c.setMergePolicy(new UpgradeIndexMergePolicy(c.getMergePolicy()));
c.setIndexDeletionPolicy(new KeepOnlyLastCommitDeletionPolicy());
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Fri Mar 30 12:41:28 2012
@@ -585,7 +585,7 @@ public class IndexWriter implements Clos
*/
public IndexWriter(Directory d, IndexWriterConfig conf)
throws CorruptIndexException, LockObtainFailedException, IOException {
- config = (IndexWriterConfig) conf.clone();
+ config = conf.clone();
directory = d;
analyzer = conf.getAnalyzer();
infoStream = conf.getInfoStream();
@@ -2431,7 +2431,7 @@ public class IndexWriter implements Clos
// no partial changes (eg a delete w/o
// corresponding add from an updateDocument) can
// sneak into the commit point:
- toCommit = (SegmentInfos) segmentInfos.clone();
+ toCommit = segmentInfos.clone();
pendingCommitChangeCount = changeCount;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java Fri Mar 30 12:41:28 2012
@@ -185,11 +185,11 @@ public final class IndexWriterConfig imp
}
@Override
- public Object clone() {
+ public IndexWriterConfig clone() {
// Shallow clone is the only thing that's possible, since parameters like
// analyzer, index commit etc. do not implement Cloneable.
try {
- return super.clone();
+ return (IndexWriterConfig)super.clone();
} catch (CloneNotSupportedException e) {
// should not happen
throw new RuntimeException(e);
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/Payload.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/Payload.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/Payload.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/Payload.java Fri Mar 30 12:41:28 2012
@@ -155,7 +155,7 @@ public class Payload implements Cloneabl
* byte array.
*/
@Override
- public Object clone() {
+ public Payload clone() {
try {
// Start with a shallow copy of data
Payload clone = (Payload) super.clone();
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/ReadersAndLiveDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/ReadersAndLiveDocs.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/ReadersAndLiveDocs.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/ReadersAndLiveDocs.java Fri Mar 30 12:41:28 2012
@@ -273,7 +273,7 @@ class ReadersAndLiveDocs {
assert liveDocs.length() == info.docCount;
// Save in case we need to rollback on failure:
- final SegmentInfo sav = (SegmentInfo) info.clone();
+ final SegmentInfo sav = info.clone();
info.advanceDelGen();
info.setDelCount(info.getDelCount() + pendingDeleteCount);
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java Fri Mar 30 12:41:28 2012
@@ -142,7 +142,7 @@ public final class SegmentInfo implement
docStoreIsCompoundFile = src.docStoreIsCompoundFile;
hasVectors = src.hasVectors;
hasProx = src.hasProx;
- fieldInfos = src.fieldInfos == null ? null : (FieldInfos) src.fieldInfos.clone();
+ fieldInfos = src.fieldInfos == null ? null : src.fieldInfos.clone();
if (src.normGen == null) {
normGen = null;
} else {
@@ -252,9 +252,9 @@ public final class SegmentInfo implement
}
@Override
- public Object clone() {
+ public SegmentInfo clone() {
final SegmentInfo si = new SegmentInfo(name, docCount, dir, isCompoundFile, codec,
- fieldInfos == null ? null : (FieldInfos) fieldInfos.clone());
+ fieldInfos == null ? null : fieldInfos.clone());
si.docStoreOffset = docStoreOffset;
si.docStoreSegment = docStoreSegment;
si.docStoreIsCompoundFile = docStoreIsCompoundFile;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java Fri Mar 30 12:41:28 2012
@@ -374,7 +374,7 @@ public final class SegmentInfos implemen
*/
@Override
- public Object clone() {
+ public SegmentInfos clone() {
try {
final SegmentInfos sis = (SegmentInfos) super.clone();
// deep clone, first recreate all collections:
@@ -385,7 +385,7 @@ public final class SegmentInfos implemen
for(final SegmentInfo info : this) {
assert info.getCodec() != null;
// dont directly access segments, use add method!!!
- sis.add((SegmentInfo) info.clone());
+ sis.add(info.clone());
}
sis.userData = new HashMap<String,String>(userData);
return sis;
@@ -957,7 +957,7 @@ public final class SegmentInfos implemen
final List<SegmentInfo> list = new ArrayList<SegmentInfo>(size());
for(final SegmentInfo info : this) {
assert info.getCodec() != null;
- list.add((SegmentInfo) info.clone());
+ list.add(info.clone());
}
return list;
} else {
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java Fri Mar 30 12:41:28 2012
@@ -83,7 +83,7 @@ final class StandardDirectoryReader exte
List<SegmentReader> readers = new ArrayList<SegmentReader>();
final Directory dir = writer.getDirectory();
- final SegmentInfos segmentInfos = (SegmentInfos) infos.clone();
+ final SegmentInfos segmentInfos = infos.clone();
int infosUpto = 0;
for (int i=0;i<numSegments;i++) {
IOException prior = null;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/TermState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/TermState.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/TermState.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/index/TermState.java Fri Mar 30 12:41:28 2012
@@ -36,9 +36,9 @@ public abstract class TermState implemen
public abstract void copyFrom(TermState other);
@Override
- public Object clone() {
+ public TermState clone() {
try {
- return super.clone();
+ return (TermState)super.clone();
} catch (CloneNotSupportedException cnse) {
// should not happen
throw new RuntimeException(cnse);
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java Fri Mar 30 12:41:28 2012
@@ -433,7 +433,7 @@ public class BooleanQuery extends Query
if (getBoost() != 1.0f) { // incorporate boost
if (query == c.getQuery()) { // if rewrite was no-op
- query = (Query)query.clone(); // then clone before boost
+ query = query.clone(); // then clone before boost
}
// Since the BooleanQuery only has 1 clause, the BooleanQuery will be
// written out. Therefore the rewritten Query's boost must incorporate both
@@ -454,7 +454,7 @@ public class BooleanQuery extends Query
// The BooleanQuery clone is lazily initialized so only initialize
// it if a rewritten clause differs from the original clause (and hasn't been
// initialized already). If nothing differs, the clone isn't needlessly created
- clone = (BooleanQuery)this.clone();
+ clone = this.clone();
}
clone.clauses.set(i, new BooleanClause(query, c.getOccur()));
}
@@ -474,7 +474,7 @@ public class BooleanQuery extends Query
}
@Override @SuppressWarnings("unchecked")
- public Object clone() {
+ public BooleanQuery clone() {
BooleanQuery clone = (BooleanQuery)super.clone();
clone.clauses = (ArrayList<BooleanClause>) this.clauses.clone();
return clone;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java Fri Mar 30 12:41:28 2012
@@ -190,7 +190,7 @@ public class DisjunctionMaxQuery extends
Query singleton = disjuncts.get(0);
Query result = singleton.rewrite(reader);
if (getBoost() != 1.0f) {
- if (result == singleton) result = (Query)result.clone();
+ if (result == singleton) result = result.clone();
result.setBoost(getBoost() * result.getBoost());
}
return result;
@@ -200,7 +200,7 @@ public class DisjunctionMaxQuery extends
Query clause = disjuncts.get(i);
Query rewrite = clause.rewrite(reader);
if (rewrite != clause) {
- if (clone == null) clone = (DisjunctionMaxQuery)this.clone();
+ if (clone == null) clone = this.clone();
clone.disjuncts.set(i, rewrite);
}
}
@@ -211,7 +211,7 @@ public class DisjunctionMaxQuery extends
/** Create a shallow copy of us -- used in rewriting if necessary
* @return a copy of us (but reuse, don't copy, our subqueries) */
@Override @SuppressWarnings("unchecked")
- public Object clone() {
+ public DisjunctionMaxQuery clone() {
DisjunctionMaxQuery clone = (DisjunctionMaxQuery)super.clone();
clone.disjuncts = (ArrayList<Query>) this.disjuncts.clone();
return clone;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/Query.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/Query.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/Query.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/Query.java Fri Mar 30 12:41:28 2012
@@ -97,9 +97,9 @@ public abstract class Query implements C
/** Returns a clone of this query. */
@Override
- public Object clone() {
+ public Query clone() {
try {
- return super.clone();
+ return (Query)super.clone();
} catch (CloneNotSupportedException e) {
throw new RuntimeException("Clone not supported: " + e.getMessage());
}
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java Fri Mar 30 12:41:28 2012
@@ -76,7 +76,7 @@ public class PayloadNearQuery extends Sp
}
@Override
- public Object clone() {
+ public PayloadNearQuery clone() {
int sz = clauses.size();
SpanQuery[] newClauses = new SpanQuery[sz];
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java Fri Mar 30 12:41:28 2012
@@ -61,7 +61,7 @@ public class SpanFirstQuery extends Span
}
@Override
- public Object clone() {
+ public SpanFirstQuery clone() {
SpanFirstQuery spanFirstQuery = new SpanFirstQuery((SpanQuery) match.clone(), end);
spanFirstQuery.setBoost(getBoost());
return spanFirstQuery;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearPayloadCheckQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearPayloadCheckQuery.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearPayloadCheckQuery.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearPayloadCheckQuery.java Fri Mar 30 12:41:28 2012
@@ -88,7 +88,7 @@ public class SpanNearPayloadCheckQuery e
}
@Override
- public Object clone() {
+ public SpanNearPayloadCheckQuery clone() {
SpanNearPayloadCheckQuery result = new SpanNearPayloadCheckQuery((SpanNearQuery) match.clone(), payloadToMatch);
result.setBoost(getBoost());
return result;
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java Fri Mar 30 12:41:28 2012
@@ -140,7 +140,7 @@ public class SpanNearQuery extends SpanQ
SpanQuery query = (SpanQuery) c.rewrite(reader);
if (query != c) { // clause rewrote: must clone
if (clone == null)
- clone = (SpanNearQuery) this.clone();
+ clone = this.clone();
clone.clauses.set(i,query);
}
}
@@ -152,7 +152,7 @@ public class SpanNearQuery extends SpanQ
}
@Override
- public Object clone() {
+ public SpanNearQuery clone() {
int sz = clauses.size();
SpanQuery[] newClauses = new SpanQuery[sz];
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java Fri Mar 30 12:41:28 2012
@@ -71,7 +71,7 @@ public class SpanNotQuery extends SpanQu
}
@Override
- public Object clone() {
+ public SpanNotQuery clone() {
SpanNotQuery spanNotQuery = new SpanNotQuery((SpanQuery)include.clone(),(SpanQuery) exclude.clone());
spanNotQuery.setBoost(getBoost());
return spanNotQuery;
@@ -175,12 +175,12 @@ public class SpanNotQuery extends SpanQu
SpanQuery rewrittenInclude = (SpanQuery) include.rewrite(reader);
if (rewrittenInclude != include) {
- clone = (SpanNotQuery) this.clone();
+ clone = this.clone();
clone.include = rewrittenInclude;
}
SpanQuery rewrittenExclude = (SpanQuery) exclude.rewrite(reader);
if (rewrittenExclude != exclude) {
- if (clone == null) clone = (SpanNotQuery) this.clone();
+ if (clone == null) clone = this.clone();
clone.exclude = rewrittenExclude;
}
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java Fri Mar 30 12:41:28 2012
@@ -76,7 +76,7 @@ public class SpanOrQuery extends SpanQue
}
@Override
- public Object clone() {
+ public SpanOrQuery clone() {
int sz = clauses.size();
SpanQuery[] newClauses = new SpanQuery[sz];
@@ -96,7 +96,7 @@ public class SpanOrQuery extends SpanQue
SpanQuery query = (SpanQuery) c.rewrite(reader);
if (query != c) { // clause rewrote: must clone
if (clone == null)
- clone = (SpanOrQuery) this.clone();
+ clone = this.clone();
clone.clauses.set(i,query);
}
}
Modified: lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanPayloadCheckQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanPayloadCheckQuery.java?rev=1307386&r1=1307385&r2=1307386&view=diff
==============================================================================
--- lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanPayloadCheckQuery.java (original)
+++ lucene/dev/branches/lucene3930/lucene/core/src/java/org/apache/lucene/search/spans/SpanPayloadCheckQuery.java Fri Mar 30 12:41:28 2012
@@ -90,7 +90,7 @@ public class SpanPayloadCheckQuery exten
}
@Override
- public Object clone() {
+ public SpanPayloadCheckQuery clone() {
SpanPayloadCheckQuery result = new SpanPayloadCheckQuery((SpanQuery) match.clone(), payloadToMatch);
result.setBoost(getBoost());
return result;