/[Apache-SVN]
ViewVC logotype

Revision 1130815


Jump to revision: Previous Next
Author: sarowe
Date: Thu Jun 2 21:15:00 2011 UTC (13 years, 5 months ago)
Changed paths: 94
Log Message:
SOLR-2452: merged with trunk up to r1130696; finished Solr contrib layout switch (src/main/java/ => src/java/, etc.) in the Maven, Eclipse, and IntelliJ configurations; restored two directories that were dropped as part of the layout switch: solr/contrib/dataimporthandler/src/main/webapp/ => src/webapp/, and solr/contrib/uima/src/main/resources => src/resources/; added jetty.insecurerandom sysprop setting to test-macro in lucene/common-build.xml

Changed paths

Path Details
Directorylucene/dev/branches/solr2452/ modified , props changed
Directorylucene/dev/branches/solr2452/dev-tools/eclipse/dot.classpath modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/idea/.idea/workspace.xml modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/analysis-extras/analysis-extras.iml modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/clustering/clustering.iml modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/extraction/extraction.iml modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/idea/solr/contrib/uima/uima.iml modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/idea/solr/solr.iml modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/maven/modules/analysis/icu/pom.xml.template modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/clustering/pom.xml.template modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/extraction/pom.xml.template modified , text changed
Directorylucene/dev/branches/solr2452/dev-tools/maven/solr/contrib/uima/pom.xml.template modified , text changed
Directorylucene/dev/branches/solr2452/lucene/ modified , props changed
Directorylucene/dev/branches/solr2452/lucene/CHANGES.txt modified , text changed
Directorylucene/dev/branches/solr2452/lucene/common-build.xml modified , text changed
Directorylucene/dev/branches/solr2452/lucene/contrib/CHANGES.txt modified , text changed
Directorylucene/dev/branches/solr2452/modules/analysis/LICENSE.txt modified , text changed
Directorylucene/dev/branches/solr2452/modules/analysis/NOTICE.txt modified , text changed
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData1.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData1.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData2.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData2.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData3.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData3.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData4.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData4.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData5.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData5.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData6.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData6.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData7.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData7.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData8.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemData8.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilter.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilter.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/java/org/apache/lucene/analysis/util/OpenStringBuilder.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/util/OpenStringBuilder.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java
(Copied from lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/common/src/test/org/apache/lucene/analysis/en/kstemTestData.zip
(Copied from lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/en/kstemTestData.zip, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/icu/build.xml modified , text changed
Directorylucene/dev/branches/solr2452/modules/analysis/icu/lib/icu4j-4_6.jar deleted
Directorylucene/dev/branches/solr2452/modules/analysis/icu/lib/icu4j-4_8.jar
(Copied from lucene/dev/trunk/modules/analysis/icu/lib/icu4j-4_8.jar, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/analysis/icu/lib/icu4j-NOTICE.txt modified , text changed
Directorylucene/dev/branches/solr2452/modules/analysis/icu/lib/lucene-icu4j-pom.xml.template deleted
Directorylucene/dev/branches/solr2452/modules/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/RBBIRuleCompiler.java modified , text changed
Directorylucene/dev/branches/solr2452/modules/grouping/LICENSE.txt
(Copied from lucene/dev/trunk/modules/grouping/LICENSE.txt, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/grouping/NOTICE.txt
(Copied from lucene/dev/trunk/modules/grouping/NOTICE.txt, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java
(Copied from lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html modified , text changed
Directorylucene/dev/branches/solr2452/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java modified , text changed
Directorylucene/dev/branches/solr2452/modules/suggest/LICENSE.txt
(Copied from lucene/dev/trunk/modules/suggest/LICENSE.txt, r1130703)
added
Directorylucene/dev/branches/solr2452/modules/suggest/NOTICE.txt
(Copied from lucene/dev/trunk/modules/suggest/NOTICE.txt, r1130703)
added
Directorylucene/dev/branches/solr2452/solr/ modified , props changed
Directorylucene/dev/branches/solr2452/solr/CHANGES.txt modified , text changed , props changed
Directorylucene/dev/branches/solr2452/solr/LICENSE.txt modified , text changed , props changed
Directorylucene/dev/branches/solr2452/solr/NOTICE.txt modified , text changed , props changed
Directorylucene/dev/branches/solr2452/solr/README.txt modified , props changed
Directorylucene/dev/branches/solr2452/solr/build.xml modified , props changed
Directorylucene/dev/branches/solr2452/solr/client/ modified , props changed
Directorylucene/dev/branches/solr2452/solr/common-build.xml modified , props changed
Directorylucene/dev/branches/solr2452/solr/contrib/ modified , props changed
Directorylucene/dev/branches/solr2452/solr/contrib/analysis-extras/lib/icu4j-4_6.jar deleted
Directorylucene/dev/branches/solr2452/solr/contrib/analysis-extras/lib/icu4j-4_8.jar
(Copied from lucene/dev/trunk/solr/contrib/analysis-extras/lib/icu4j-4_8.jar, r1130703)
added
Directorylucene/dev/branches/solr2452/solr/contrib/dataimporthandler/src/webapp/
(Copied from lucene/dev/branches/solr2452/solr/contrib/dataimporthandler/src/main/webapp, r1129204)
added
Directorylucene/dev/branches/solr2452/solr/contrib/dataimporthandler/src/webapp/admin/
(Copied from lucene/dev/branches/solr2452/solr/contrib/dataimporthandler/src/main/webapp/admin, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/dataimporthandler/src/webapp/admin/dataimport.jsp
(Copied from lucene/dev/branches/solr2452/solr/contrib/dataimporthandler/src/main/webapp/admin/dataimport.jsp, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/dataimporthandler/src/webapp/admin/debug.jsp
(Copied from lucene/dev/branches/solr2452/solr/contrib/dataimporthandler/src/main/webapp/admin/debug.jsp, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/extraction/lib/icu4j-4_6.jar deleted
Directorylucene/dev/branches/solr2452/solr/contrib/extraction/lib/icu4j-4_8.jar
(Copied from lucene/dev/trunk/solr/contrib/extraction/lib/icu4j-4_8.jar, r1130703)
added
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources, r1129204)
added
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/AggregateSentenceAE.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc/AggregateSentenceAE.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/HmmTagger.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc/HmmTagger.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/OpenCalaisAnnotator.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc/OpenCalaisAnnotator.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/OverridingParamsExtServicesAE.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc/OverridingParamsExtServicesAE.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/TextCategorizationAEDescriptor.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextCategorizationAEDescriptor.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/TextConceptTaggingAEDescriptor.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextConceptTaggingAEDescriptor.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/TextKeywordExtractionAEDescriptor.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextKeywordExtractionAEDescriptor.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/TextLanguageDetectionAEDescriptor.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextLanguageDetectionAEDescriptor.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/TextRankedEntityExtractionAEDescriptor.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc/TextRankedEntityExtractionAEDescriptor.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/WhitespaceTokenizer.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc/WhitespaceTokenizer.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/org/apache/uima/desc/baseAlchemyTypeSystemDescriptor.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/org/apache/uima/desc/baseAlchemyTypeSystemDescriptor.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/solr/
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/solr, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/solr/conf/
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/solr/conf, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/solr/conf/aggregate-uima-config.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/solr/conf/aggregate-uima-config.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/contrib/uima/src/resources/solr/conf/uima-fields.xml
(Copied from lucene/dev/branches/solr2452/solr/contrib/uima/src/main/resources/solr/conf/uima-fields.xml, r1129204)
replaced
Directorylucene/dev/branches/solr2452/solr/example/ modified , props changed
Directorylucene/dev/branches/solr2452/solr/lib/ modified , props changed
Directorylucene/dev/branches/solr2452/solr/site/ modified , props changed
Directorylucene/dev/branches/solr2452/solr/src/ modified , props changed
Directorylucene/dev/branches/solr2452/solr/src/java/org/apache/solr/analysis/KStemFilterFactory.java
(Copied from lucene/dev/trunk/solr/src/java/org/apache/solr/analysis/KStemFilterFactory.java, r1130703)
added
Directorylucene/dev/branches/solr2452/solr/src/test/org/apache/solr/analysis/TestKStemFilterFactory.java
(Copied from lucene/dev/trunk/solr/src/test/org/apache/solr/analysis/TestKStemFilterFactory.java, r1130703)
added
Directorylucene/dev/branches/solr2452/solr/testlogging.properties modified , props changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26