You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/08/09 12:21:07 UTC
svn commit: r1371142 [1/32] - in /lucene/dev/branches/lucene3312: ./
dev-tools/ dev-tools/eclipse/ dev-tools/maven/ dev-tools/maven/lucene/
dev-tools/maven/lucene/analysis/common/
dev-tools/maven/lucene/analysis/icu/ dev-tools/maven/lucene/analysis/kur...
Author: uschindler
Date: Thu Aug 9 10:20:53 2012
New Revision: 1371142
URL: http://svn.apache.org/viewvc?rev=1371142&view=rev
Log:
LUCENE-3312: Merged revision(s) 1366639-1371131 from lucene/dev/trunk:
SOLR-3259: default /get to json
........
minor tweaks to update script example
........
LUCENE-4268: Rename ResourceAsStreamReasourceLoader to ClasspathResourceLoader, provide FilesystemResourceLoader, bug fixing
........
LUCENE-4268: Fix test bug
........
SOLR-3648: Fix Velocity template loading in SolrCloud mode
........
fix confusing IW infoStream message
........
Fix rawtypes warning in java 7 and 8, make the SuppressWarnings more local
........
Nicer solution to generic array creation (still problematic in Java 6, but correct in Java 7 if done this way)
........
Disable test failing with Java 8
........
Allow detecting of Java 8
........
LUCENE-4109: BooleanQueries are not parsed correctly with the flexible queryparser
........
LUCENE-4269: remove BalancedSegmentMergePolicy (use TieredMergePolicy instead)
........
LUCENE-4269: deprecate BalancedSegmentMergePolicy (use TieredMergePolicy instead)
........
LUCENE-4190: restrict allowed filenames to reduce risk of deleting non-lucene file from the index directory
........
fix the monkey: connection loss and expiration cause NPE
........
upgrade checkJavaDocs.py to python3
........
LUCENE-3884: Move ElisionFilter out of .fr package
........
fix encoding in javadocs checker
........
LUCENE-2501: fix thread hazard when threads add same field with different IndexOptions at the same time
........
Added:
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilter.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilter.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/frenchArticles.txt
- copied unchanged from r1371131, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/frenchArticles.txt
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/bloom/
- copied from r1371131, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/bloom/
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/FuzzySet.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/FuzzySet.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/hash/
- copied from r1371131, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/hash/
lucene/dev/branches/lucene3312/lucene/core/src/resources/META-INF/services/org.apache.lucene.util.hash.HashFunction
- copied unchanged from r1371131, lucene/dev/trunk/lucene/core/src/resources/META-INF/services/org.apache.lucene.util.hash.HashFunction
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/document/TestField.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/document/TestField.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/CommonQueryParserConfiguration.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/CommonQueryParserConfiguration.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanQuery2ModifierNodeProcessor.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanQuery2ModifierNodeProcessor.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQP.java
- copied unchanged from r1371131, lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQP.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/
- copied from r1371131, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/
lucene/dev/branches/lucene3312/solr/contrib/extraction/README.txt
- copied unchanged from r1371131, lucene/dev/trunk/solr/contrib/extraction/README.txt
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/AdjustableSemaphore.java
- copied unchanged from r1371131, lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/AdjustableSemaphore.java
lucene/dev/branches/lucene3312/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
- copied unchanged from r1371131, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-analyzer-class-and-nested.xml
lucene/dev/branches/lucene3312/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
- copied unchanged from r1371131, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/bad-schema-uniquekey-multivalued.xml
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java
- copied unchanged from r1371131, lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
- copied unchanged from r1371131, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java
- copied unchanged from r1371131, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
- copied unchanged from r1371131, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
- copied unchanged from r1371131, lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/velocity/debug.vm
- copied unchanged from r1371131, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/debug.vm
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/velocity/join-doc.vm
- copied unchanged from r1371131, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/join-doc.vm
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/velocity/product-doc.vm
- copied unchanged from r1371131, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/product-doc.vm
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/velocity/richtext-doc.vm
- copied unchanged from r1371131, lucene/dev/trunk/solr/example/solr/collection1/conf/velocity/richtext-doc.vm
lucene/dev/branches/lucene3312/solr/licenses/zookeeper-3.3.6.jar.sha1
- copied unchanged from r1371131, lucene/dev/trunk/solr/licenses/zookeeper-3.3.6.jar.sha1
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java
- copied unchanged from r1371131, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
- copied unchanged from r1371131, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
lucene/dev/branches/lucene3312/solr/solrj/src/test-files/solrj/solr/collection1/
- copied from r1371131, lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/collection1/
lucene/dev/branches/lucene3312/solr/solrj/src/test-files/solrj/solr/solr.xml
- copied unchanged from r1371131, lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/solr.xml
lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
- copied unchanged from r1371131, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
lucene/dev/branches/lucene3312/solr/test-framework/src/java/org/apache/solr/cloud/
- copied from r1371131, lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/cloud/
lucene/dev/branches/lucene3312/solr/webapp/web/img/filetypes/
- copied from r1371131, lucene/dev/trunk/solr/webapp/web/img/filetypes/
Removed:
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilter.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/ElisionFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceAsStreamResourceLoader.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestElision.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestElisionFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/frenchArticles.txt
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/MatchOnlyTermScorer.java
lucene/dev/branches/lucene3312/lucene/misc/src/java/org/apache/lucene/index/BalancedSegmentMergePolicy.java
lucene/dev/branches/lucene3312/lucene/misc/src/test/org/apache/lucene/index/TestBalancedSegmentMergePolicy.java
lucene/dev/branches/lucene3312/solr/contrib/analysis-extras/CHANGES.txt
lucene/dev/branches/lucene3312/solr/contrib/clustering/CHANGES.txt
lucene/dev/branches/lucene3312/solr/contrib/dataimporthandler/CHANGES.txt
lucene/dev/branches/lucene3312/solr/contrib/extraction/CHANGES.txt
lucene/dev/branches/lucene3312/solr/contrib/langid/CHANGES.txt
lucene/dev/branches/lucene3312/solr/contrib/uima/CHANGES.txt
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/AbstractDistributedZkTestCase.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ChaosMonkey.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/CloudStateTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ZkTestServer.java
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/velocity/doc.vm
lucene/dev/branches/lucene3312/solr/licenses/zookeeper-3.3.5.jar.sha1
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/CloudState.java
lucene/dev/branches/lucene3312/solr/solrj/src/test-files/solrj/solr/conf/
Modified:
lucene/dev/branches/lucene3312/ (props changed)
lucene/dev/branches/lucene3312/build.xml
lucene/dev/branches/lucene3312/dev-tools/ (props changed)
lucene/dev/branches/lucene3312/dev-tools/eclipse/dot.classpath
lucene/dev/branches/lucene3312/dev-tools/maven/README.maven
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/common/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/icu/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/stempel/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/uima/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/benchmark/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/core/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/demo/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/facet/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/grouping/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/highlighter/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/join/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/memory/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/misc/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/queries/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/queryparser/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/sandbox/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/suggest/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/lucene/test-framework/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/contrib/langid/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/contrib/uima/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/contrib/velocity/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/core/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/solrj/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/test-framework/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/maven/solr/webapp/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/scripts/checkJavaDocs.py
lucene/dev/branches/lucene3312/dev-tools/scripts/smokeTestRelease.py
lucene/dev/branches/lucene3312/lucene/ (props changed)
lucene/dev/branches/lucene3312/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3312/lucene/MIGRATE.txt (contents, props changed)
lucene/dev/branches/lucene3312/lucene/analysis/ (props changed)
lucene/dev/branches/lucene3312/lucene/analysis/common/ (props changed)
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/CatalanAnalyzer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilter.jflex
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishAnalyzer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/SUPPLEMENTARY.jflex-macro
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DanishStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/DutchStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/EnglishStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FinnishStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/FrenchStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/German2Stemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/GermanStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/HungarianStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/ItalianStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/KpStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/LovinsStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/NorwegianStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PorterStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/PortugueseStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RomanianStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/RussianStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SpanishStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/SwedishStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/tartarus/snowball/ext/TurkishStemmer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java
lucene/dev/branches/lucene3312/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java
lucene/dev/branches/lucene3312/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene3312/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java
lucene/dev/branches/lucene3312/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/branches/lucene3312/lucene/build.xml (contents, props changed)
lucene/dev/branches/lucene3312/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/lucene3312/lucene/core/ (props changed)
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/package.html
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/PostingsFormat.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/TermsConsumer.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/pulsing/PulsingPostingsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Field.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/StoredField.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/StringField.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/TextField.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/AtomicReaderContext.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/BufferedDeletesStream.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DocsAndPositionsEnum.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DocsEnum.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexReaderContext.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/TermQuery.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/Constants.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java
lucene/dev/branches/lucene3312/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/codecs/appending/TestAppendingCodec.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/codecs/pulsing/Test10KPulsings.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/codecs/pulsing/TestPulsingReuse.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestByteSlices.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestPostingsFormat.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestSort.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/branches/lucene3312/lucene/demo/ (props changed)
lucene/dev/branches/lucene3312/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java
lucene/dev/branches/lucene3312/lucene/facet/ (props changed)
lucene/dev/branches/lucene3312/lucene/facet/src/java/org/apache/lucene/facet/search/PayloadIterator.java
lucene/dev/branches/lucene3312/lucene/facet/src/java/org/apache/lucene/facet/search/sampling/TakmiSampleFixer.java
lucene/dev/branches/lucene3312/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
lucene/dev/branches/lucene3312/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
lucene/dev/branches/lucene3312/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/ParentArray.java
lucene/dev/branches/lucene3312/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
lucene/dev/branches/lucene3312/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java
lucene/dev/branches/lucene3312/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
lucene/dev/branches/lucene3312/lucene/join/ (props changed)
lucene/dev/branches/lucene3312/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java
lucene/dev/branches/lucene3312/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
lucene/dev/branches/lucene3312/lucene/memory/ (props changed)
lucene/dev/branches/lucene3312/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/lucene3312/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
lucene/dev/branches/lucene3312/lucene/misc/ (props changed)
lucene/dev/branches/lucene3312/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
lucene/dev/branches/lucene3312/lucene/queries/ (props changed)
lucene/dev/branches/lucene3312/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
lucene/dev/branches/lucene3312/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java
lucene/dev/branches/lucene3312/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java
lucene/dev/branches/lucene3312/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/PrecedenceQueryNodeProcessorPipeline.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/GroupQueryNodeProcessor.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/StandardQueryNodeProcessorPipeline.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
lucene/dev/branches/lucene3312/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene3312/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
lucene/dev/branches/lucene3312/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java
lucene/dev/branches/lucene3312/lucene/spatial/ (props changed)
lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeFilter.java
lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java
lucene/dev/branches/lucene3312/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/AssertingAtomicReader.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/search/RandomSimilarityProvider.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
lucene/dev/branches/lucene3312/solr/ (props changed)
lucene/dev/branches/lucene3312/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3312/solr/build.xml
lucene/dev/branches/lucene3312/solr/cloud-dev/ (props changed)
lucene/dev/branches/lucene3312/solr/cloud-dev/example1.sh
lucene/dev/branches/lucene3312/solr/cloud-dev/example2.sh
lucene/dev/branches/lucene3312/solr/cloud-dev/example3.sh
lucene/dev/branches/lucene3312/solr/cloud-dev/solrcloud-extzk-start.sh
lucene/dev/branches/lucene3312/solr/cloud-dev/solrcloud-multi-start.sh
lucene/dev/branches/lucene3312/solr/cloud-dev/solrcloud-start-existing.sh
lucene/dev/branches/lucene3312/solr/cloud-dev/solrcloud-start.sh
lucene/dev/branches/lucene3312/solr/contrib/ (props changed)
lucene/dev/branches/lucene3312/solr/contrib/dataimporthandler/README.txt
lucene/dev/branches/lucene3312/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java
lucene/dev/branches/lucene3312/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java
lucene/dev/branches/lucene3312/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java
lucene/dev/branches/lucene3312/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/RequestInfo.java
lucene/dev/branches/lucene3312/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java
lucene/dev/branches/lucene3312/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solrconfig-end-to-end.xml
lucene/dev/branches/lucene3312/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestDIHEndToEnd.java
lucene/dev/branches/lucene3312/solr/contrib/uima/README.txt
lucene/dev/branches/lucene3312/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityResourceLoader.java
lucene/dev/branches/lucene3312/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
lucene/dev/branches/lucene3312/solr/core/ (props changed)
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/SolrLogFormatter.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/AssignShard.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/Overseer.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/CurrencyField.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/LatLonType.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/schema/PointType.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/Grouping.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/ValueSourceParser.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/CommitTracker.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/SolrCoreState.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/UpdateLog.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
lucene/dev/branches/lucene3312/solr/core/src/test-files/solr/collection1/conf/schema.xml
lucene/dev/branches/lucene3312/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/core/CoreContainerCoreInitFailuresTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/search/TestRecovery.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java
lucene/dev/branches/lucene3312/solr/example/ (props changed)
lucene/dev/branches/lucene3312/solr/example/example-DIH/solr/db/conf/schema.xml
lucene/dev/branches/lucene3312/solr/example/example-DIH/solr/rss/conf/schema.xml
lucene/dev/branches/lucene3312/solr/example/example-DIH/solr/solr/conf/schema.xml
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/schema.xml
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/update-script.js
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/velocity/VM_global_library.vm
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/velocity/facet_fields.vm
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/velocity/facet_ranges.vm
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/velocity/hit.vm
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/velocity/hitGrouped.vm
lucene/dev/branches/lucene3312/solr/example/solr/collection1/conf/velocity/main.css
lucene/dev/branches/lucene3312/solr/licenses/ (props changed)
lucene/dev/branches/lucene3312/solr/licenses/xercesImpl-2.9.1.jar.sha1
lucene/dev/branches/lucene3312/solr/solrj/ (props changed)
lucene/dev/branches/lucene3312/solr/solrj/ivy.xml
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/common/util/Hash.java
lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrServer.java
lucene/dev/branches/lucene3312/solr/test-framework/ (props changed)
lucene/dev/branches/lucene3312/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
lucene/dev/branches/lucene3312/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/lucene3312/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java
lucene/dev/branches/lucene3312/solr/webapp/ (props changed)
lucene/dev/branches/lucene3312/solr/webapp/web/admin.html
lucene/dev/branches/lucene3312/solr/webapp/web/css/styles/common.css
lucene/dev/branches/lucene3312/solr/webapp/web/js/scripts/app.js
Modified: lucene/dev/branches/lucene3312/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/build.xml?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/build.xml (original)
+++ lucene/dev/branches/lucene3312/build.xml Thu Aug 9 10:20:53 2012
@@ -176,22 +176,57 @@
</subant>
</target>
- <target name="jar-checksums" depends="resolve" description="Recompute SHA1 checksums for all JAR files.">
- <delete>
- <fileset dir="${basedir}">
- <include name="**/*.jar.sha1"/>
- </fileset>
- </delete>
+ <target name="jar-checksums" description="Recompute SHA1 checksums for all JAR files.">
+ <sequential>
+ <subant target="jar-checksums" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ <fileset dir="solr" includes="build.xml" />
+ </subant>
+ </sequential>
+ </target>
- <checksum algorithm="SHA1" fileext=".sha1">
- <fileset dir="${basedir}">
- <include name="**/*.jar"/>
- </fileset>
- </checksum>
+ <property name="python32.exe" value="python3.2" />
+ <property name="JAVA6_HOME" value="/usr/local/jdk1.6.0_27"/>
+ <property name="JAVA7_HOME" value="/usr/local/jdk1.7.0_01"/>
+ <property name="fakeRelease" value="lucene/build/fakeRelease"/>
+ <property name="fakeReleaseTmp" value="lucene/build/fakeReleaseTmp"/>
+ <property name="fakeReleaseVersion" value="5.0"/> <!-- *not* -SNAPSHOT, the real version -->
- <fixcrlf
- srcdir="${basedir}"
- includes="**/*.jar.sha1"
- eol="lf" fixlast="true" encoding="US-ASCII" />
+ <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it." depends="clean">
+ <sequential>
+ <subant target="prepare-release-no-sign" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ <fileset dir="solr" includes="build.xml" />
+ <property name="version" value="${fakeReleaseVersion}" />
+ </subant>
+ <delete dir="${fakeRelease}"/>
+ <delete dir="${fakeReleaseTmp}"/>
+ <mkdir dir="${fakeRelease}"/>
+ <copy todir="${fakeRelease}/lucene">
+ <fileset dir="lucene/dist"/>
+ </copy>
+ <copy todir="${fakeRelease}/lucene/changes">
+ <fileset dir="lucene/build/docs/changes"/>
+ </copy>
+ <get src="http://people.apache.org/keys/group/lucene.asc"
+ dest="${fakeRelease}/lucene/KEYS"/>
+ <copy todir="${fakeRelease}/solr">
+ <fileset dir="solr/package"/>
+ </copy>
+ <copy file="${fakeRelease}/lucene/KEYS" todir="${fakeRelease}/solr"/>
+ <makeurl file="${fakeRelease}" validate="false" property="fakeRelease.uri"/>
+ <exec executable="${python32.exe}" failonerror="true">
+ <arg value="-u"/>
+ <arg value="dev-tools/scripts/smokeTestRelease.py"/>
+ <arg value="${fakeRelease.uri}"/>
+ <arg value="${fakeReleaseVersion}"/>
+ <arg value="${fakeReleaseTmp}"/>
+ <arg value="false"/>
+ <env key="JAVA6_HOME" value="${JAVA6_HOME}"/>
+ <env key="JAVA7_HOME" value="${JAVA7_HOME}"/>
+ </exec>
+ <delete dir="${fakeRelease}"/>
+ <delete dir="${fakeReleaseTmp}"/>
+ </sequential>
</target>
</project>
Modified: lucene/dev/branches/lucene3312/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/eclipse/dot.classpath?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/lucene3312/dev-tools/eclipse/dot.classpath Thu Aug 9 10:20:53 2012
@@ -15,30 +15,30 @@
<classpathentry kind="src" path="lucene/sandbox/src/java"/>
<classpathentry kind="src" path="lucene/sandbox/src/test"/>
<classpathentry kind="src" path="lucene/test-framework/src/java"/>
- <classpathentry kind="src" output="bin.tests-framework" path="lucene/test-framework/src/resources"/>
+ <classpathentry kind="src" output="bin/tests-framework" path="lucene/test-framework/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/common/src/java"/>
- <classpathentry kind="src" output="bin.analysis-common" path="lucene/analysis/common/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-common" path="lucene/analysis/common/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/common/src/test"/>
<classpathentry kind="src" path="lucene/analysis/icu/src/java"/>
- <classpathentry kind="src" output="bin.analysis-icu" path="lucene/analysis/icu/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-icu" path="lucene/analysis/icu/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/icu/src/test"/>
<classpathentry kind="src" path="lucene/analysis/kuromoji/src/java"/>
- <classpathentry kind="src" output="bin.analysis-kuromoji" path="lucene/analysis/kuromoji/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-kuromoji" path="lucene/analysis/kuromoji/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/kuromoji/src/test"/>
<classpathentry kind="src" path="lucene/analysis/phonetic/src/java"/>
- <classpathentry kind="src" output="bin.analysis-phonetic" path="lucene/analysis/phonetic/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-phonetic" path="lucene/analysis/phonetic/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/phonetic/src/test"/>
<classpathentry kind="src" path="lucene/analysis/smartcn/src/java"/>
- <classpathentry kind="src" output="bin.analysis-smartcn" path="lucene/analysis/smartcn/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-smartcn" path="lucene/analysis/smartcn/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/smartcn/src/test"/>
<classpathentry kind="src" path="lucene/analysis/stempel/src/java"/>
- <classpathentry kind="src" output="bin.analysis-stempel" path="lucene/analysis/stempel/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-stempel" path="lucene/analysis/stempel/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/stempel/src/test"/>
<classpathentry kind="src" path="lucene/analysis/morfologik/src/java"/>
- <classpathentry kind="src" output="bin.analysis-morfologik" path="lucene/analysis/morfologik/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-morfologik" path="lucene/analysis/morfologik/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/morfologik/src/test"/>
<classpathentry kind="src" path="lucene/analysis/uima/src/java"/>
- <classpathentry kind="src" output="bin.analysis-uima" path="lucene/analysis/uima/src/resources"/>
+ <classpathentry kind="src" output="bin/analysis-uima" path="lucene/analysis/uima/src/resources"/>
<classpathentry kind="src" path="lucene/analysis/uima/src/test"/>
<classpathentry kind="src" path="lucene/benchmark/src/java"/>
<classpathentry kind="src" path="lucene/benchmark/src/test"/>
@@ -120,7 +120,7 @@
<classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
- <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.5.jar"/>
+ <classpathentry kind="lib" path="solr/lib/zookeeper-3.3.6.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-deploy-8.1.2.v20120308.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-http-8.1.2.v20120308.jar"/>
@@ -175,5 +175,5 @@
<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="lib" path="lucene/test-framework/lib/randomizedtesting-runner-1.6.0.jar"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="bin/other"/>
</classpath>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/README.maven
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/README.maven?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/README.maven (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/README.maven Thu Aug 9 10:20:53 2012
@@ -36,27 +36,25 @@ A. How to use nightly Jenkins-built Luce
B. How to generate Lucene/Solr Maven artifacts
- Prerequisites: JDK 1.6+ and Ant 1.7.X
+ Prerequisites: JDK 1.6+ and Ant 1.8.2+
Run 'ant generate-maven-artifacts' to create an internal Maven
repository, including POMs, binary .jars, source .jars, and javadoc
.jars.
- You can run the above command in four possible places: the top-level
- directory; under lucene/; under solr/; or under modules/. From the
- top-level directory, from lucene/, or from modules/, the internal
- repository will be located at dist/maven/. From solr/, the internal
- repository will be located at package/maven/.
+ You can run the above command in three possible places: the top-level
+ directory; under lucene/; or under solr/. From the top-level directory
+ or from lucene/, the internal repository will be located at dist/maven/.
+ From solr/, the internal repository will be located at package/maven/.
C. How to deploy Maven artifacts to a repository
- Prerequisites: JDK 1.6+ and Ant 1.7.X
+ Prerequisites: JDK 1.6+ and Ant 1.8.2+
- You can deploy targets for all of Lucene/Solr, only Lucene, only Solr,
- or only modules/, as in B. above. To deploy to a Maven repository, the
- command is the same as in B. above, with the addition of two system
- properties:
+ You can deploy targets for all of Lucene/Solr, only Lucene, or only Solr,
+ as in B. above. To deploy to a Maven repository, the command is the same
+ as in B. above, with the addition of two system properties:
ant -Dm2.repository.id=my-repo-id \
-Dm2.repository.url=http://example.org/my/repo \
@@ -101,7 +99,7 @@ D. How to use Maven to build Lucene/Solr
the default, you can supply an alternate version on the command line
with the above command, e.g.:
- ant -Dversion=5.0-my-special-version get-maven-poms
+ ant -Dversion=my-special-version get-maven-poms
Note: if you change the version in the POMs, there is one test method
that will fail under maven-surefire-plugin:
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/common/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/common/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/common/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -77,33 +71,5 @@
</excludes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.analysis.charfilter.HtmlStripCharFilter</mainClass>
- <name>HtmlStripCharFilter</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.analysis.en.PorterStemmer</mainClass>
- <name>EnglishPorterStemmer</name>
- </program>
- <program>
- <mainClass>org.tartarus.snowball.TestApp</mainClass>
- <name>SnowballTestApp</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/icu/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/icu/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/icu/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -40,15 +40,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/morfologik/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -75,6 +69,11 @@
<build>
<sourceDirectory>${module-path}/src/java</sourceDirectory>
<testSourceDirectory>${module-path}/src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${module-path}/src/resources</directory>
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>${project.build.testSourceDirectory}</directory>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/phonetic/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -75,6 +69,11 @@
<build>
<sourceDirectory>${module-path}/src/java</sourceDirectory>
<testSourceDirectory>${module-path}/src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>${module-path}/src/resources</directory>
+ </resource>
+ </resources>
<testResources>
<testResource>
<directory>${project.build.testSourceDirectory}</directory>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/smartcn/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/stempel/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/stempel/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/uima/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/uima/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/analysis/uima/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -41,15 +41,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/benchmark/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/benchmark/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -120,41 +114,5 @@
</includes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.benchmark.byTask.Benchmark</mainClass>
- <name>Benchmark</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.quality.trec.QueryDriver</mainClass>
- <name>QueryDriver</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.quality.utils.QualityQueriesFinder</mainClass>
- <name>QualityQueriesFinder</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.utils.ExtractReuters</mainClass>
- <name>ExtractReuters</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.benchmark.utils.ExtractWikipedia</mainClass>
- <name>ExtractWikipedia</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/core/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/core/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/core/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -106,40 +100,6 @@
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.index.CheckIndex</mainClass>
- <name>CheckIndex</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.index.IndexReader</mainClass>
- <name>IndexReader</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.store.LockStressTest</mainClass>
- <name>LockStressTest</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.store.LockVerifyServer</mainClass>
- <name>LockVerifyServer</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.util.English</mainClass>
- <name>English</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/demo/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/demo/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/demo/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
@@ -87,30 +81,5 @@
</excludes>
</testResource>
</testResources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <configuration>
- <extraJvmArguments>-Xmx128M</extraJvmArguments>
- <repositoryLayout>flat</repositoryLayout>
- <assembleDirectory>${build-directory}</assembleDirectory>
- <platforms>
- <platform>windows</platform>
- <platform>unix</platform>
- </platforms>
- <programs>
- <program>
- <mainClass>org.apache.lucene.demo.IndexFiles</mainClass>
- <name>IndexFiles</name>
- </program>
- <program>
- <mainClass>org.apache.lucene.demo.SearchFiles</mainClass>
- <name>SearchFiles</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
</build>
</project>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/facet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/facet/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/facet/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/facet/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/grouping/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/grouping/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/grouping/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/grouping/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -37,15 +37,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/lucene/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/lucene/highlighter/pom.xml.template?rev=1371142&r1=1371141&r2=1371142&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/lucene/highlighter/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/lucene/highlighter/pom.xml.template Thu Aug 9 10:20:53 2012
@@ -39,15 +39,9 @@
<module-path>${top-level}/${module-directory}</module-path>
</properties>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
- </url>
+ <connection>scm:svn:${vc-anonymous-base-url}/${module-directory}</connection>
+ <developerConnection>scm:svn:${vc-dev-base-url}/${module-directory}</developerConnection>
+ <url>${vc-browse-base-url}/${module-directory}</url>
</scm>
<dependencies>
<dependency>