You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/05/23 07:20:33 UTC
svn commit: r1126320 - in /lucene/dev/branches/solr2452: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/idea/lucene/contrib/ant/
dev-tools/idea/lucene/contrib/db/ dev-tools/idea/lucene/contrib/lucli/
dev-tools/idea/lucene/contrib/swing/ dev-tool...
Author: sarowe
Date: Mon May 23 05:20:32 2011
New Revision: 1126320
URL: http://svn.apache.org/viewvc?rev=1126320&view=rev
Log:
SOLR-2452: Merged up to trunk r1126319.
Added:
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
- copied unchanged from r1126313, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
Removed:
lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/ant/
lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/db/
lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/lucli/
lucene/dev/branches/solr2452/dev-tools/idea/lucene/contrib/swing/
lucene/dev/branches/solr2452/dev-tools/maven/lucene/contrib/ant/
lucene/dev/branches/solr2452/dev-tools/maven/lucene/contrib/db/
lucene/dev/branches/solr2452/dev-tools/maven/lucene/contrib/lucli/
lucene/dev/branches/solr2452/dev-tools/maven/lucene/contrib/swing/
lucene/dev/branches/solr2452/lucene/contrib/ant/
lucene/dev/branches/solr2452/lucene/contrib/db/
lucene/dev/branches/solr2452/lucene/contrib/lucli/
lucene/dev/branches/solr2452/lucene/contrib/swing/
Modified:
lucene/dev/branches/solr2452/ (props changed)
lucene/dev/branches/solr2452/build.xml
lucene/dev/branches/solr2452/dev-tools/eclipse/dot.classpath
lucene/dev/branches/solr2452/dev-tools/idea/.idea/ant.xml
lucene/dev/branches/solr2452/dev-tools/idea/.idea/modules.xml
lucene/dev/branches/solr2452/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/solr2452/dev-tools/maven/lucene/contrib/pom.xml.template
lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template
lucene/dev/branches/solr2452/lucene/ (props changed)
lucene/dev/branches/solr2452/lucene/build.xml
lucene/dev/branches/solr2452/lucene/common-build.xml
lucene/dev/branches/solr2452/lucene/contrib/CHANGES.txt
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/site.xml
lucene/dev/branches/solr2452/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
lucene/dev/branches/solr2452/solr/ (props changed)
lucene/dev/branches/solr2452/solr/CHANGES.txt (props changed)
lucene/dev/branches/solr2452/solr/LICENSE.txt (props changed)
lucene/dev/branches/solr2452/solr/NOTICE.txt (props changed)
lucene/dev/branches/solr2452/solr/README.txt (props changed)
lucene/dev/branches/solr2452/solr/build.xml (props changed)
lucene/dev/branches/solr2452/solr/client/ (props changed)
lucene/dev/branches/solr2452/solr/common-build.xml (props changed)
lucene/dev/branches/solr2452/solr/contrib/ (props changed)
lucene/dev/branches/solr2452/solr/example/ (props changed)
lucene/dev/branches/solr2452/solr/lib/ (props changed)
lucene/dev/branches/solr2452/solr/site/ (props changed)
lucene/dev/branches/solr2452/solr/src/ (props changed)
lucene/dev/branches/solr2452/solr/testlogging.properties (props changed)
Modified: lucene/dev/branches/solr2452/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/build.xml?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/build.xml (original)
+++ lucene/dev/branches/solr2452/build.xml Mon May 23 05:20:32 2011
@@ -77,14 +77,6 @@
<mkdir dir=".settings"/>
<copy file="dev-tools/eclipse/resources.prefs"
tofile=".settings/org.eclipse.core.resources.prefs" overwrite="true"/>
- <echo>Running Lucene contrib db/bdb-je task 'get-je-jar' ...</echo>
- <subant target="get-je-jar">
- <fileset dir="lucene/contrib/db/bdb-je" includes="build.xml" />
- </subant>
- <echo>Running Lucene contrib db/bdb task 'get-db-jar' ...</echo>
- <subant target="get-db-jar">
- <fileset dir="lucene/contrib/db/bdb" includes="build.xml" />
- </subant>
<echo>
SUCCESS: You must right-click your project and choose Refresh
Please note, your project must use a Java 6 JRE
@@ -95,14 +87,6 @@
<copy todir=".">
<fileset dir="dev-tools/idea"/>
</copy>
- <echo>Running Lucene contrib db/bdb-je task 'get-je-jar' ...</echo>
- <subant target="get-je-jar">
- <fileset dir="lucene/contrib/db/bdb-je" includes="build.xml" />
- </subant>
- <echo>Running Lucene contrib db/bdb task 'get-db-jar' ...</echo>
- <subant target="get-db-jar">
- <fileset dir="lucene/contrib/db/bdb" includes="build.xml" />
- </subant>
<echo>
To complete IntelliJ IDEA setup, you must manually configure
Project Structure | Project | Project SDK.
Modified: lucene/dev/branches/solr2452/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/eclipse/dot.classpath?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/solr2452/dev-tools/eclipse/dot.classpath Mon May 23 05:20:32 2011
@@ -3,21 +3,12 @@
<classpathentry kind="src" path="lucene/src/java"/>
<classpathentry kind="src" path="lucene/src/test-framework"/>
<classpathentry kind="src" path="lucene/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/ant/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/ant/src/resources"/>
- <classpathentry kind="src" path="lucene/contrib/ant/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb-je/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb-je/src/test"/>
<classpathentry kind="src" path="lucene/contrib/demo/src/java"/>
<classpathentry kind="src" path="lucene/contrib/demo/src/test"/>
<classpathentry kind="src" path="lucene/contrib/highlighter/src/java"/>
<classpathentry kind="src" path="lucene/contrib/highlighter/src/test"/>
<classpathentry kind="src" path="lucene/contrib/instantiated/src/java"/>
<classpathentry kind="src" path="lucene/contrib/instantiated/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/lucli/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/lucli/src/test"/>
<classpathentry kind="src" path="lucene/contrib/memory/src/java"/>
<classpathentry kind="src" path="lucene/contrib/memory/src/test"/>
<classpathentry kind="src" path="lucene/contrib/misc/src/java"/>
@@ -31,8 +22,6 @@
<classpathentry kind="src" path="lucene/contrib/spatial/src/test"/>
<classpathentry kind="src" path="lucene/contrib/spellchecker/src/java"/>
<classpathentry kind="src" path="lucene/contrib/spellchecker/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/swing/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/swing/src/test"/>
<classpathentry kind="src" path="lucene/contrib/wordnet/src/java"/>
<classpathentry kind="src" path="lucene/contrib/wordnet/src/test"/>
<classpathentry kind="src" path="lucene/contrib/xml-query-parser/src/java"/>
@@ -84,10 +73,6 @@
<classpathentry kind="lib" path="lucene/lib/ant-1.7.1.jar"/>
<classpathentry kind="lib" path="lucene/lib/ant-junit-1.7.1.jar"/>
<classpathentry kind="lib" path="lucene/lib/junit-4.7.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/ant/lib/jtidy-r938.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/db/bdb/lib/db-4.7.25.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/db/bdb-je/lib/je-3.3.93.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/lucli/lib/jline.jar"/>
<classpathentry kind="lib" path="lucene/contrib/queries/lib/jakarta-regexp-1.4.jar"/>
<classpathentry kind="lib" path="modules/analysis/icu/lib/icu4j-4_6.jar"/>
<classpathentry kind="lib" path="modules/analysis/phonetic/lib/commons-codec-1.4.jar"/>
Modified: lucene/dev/branches/solr2452/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/.idea/ant.xml?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/.idea/ant.xml Mon May 23 05:20:32 2011
@@ -3,21 +3,15 @@
<component name="AntConfiguration">
<buildFile url="file://$PROJECT_DIR$/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/ant/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/db/bdb/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/db/bdb-je/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/db/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/demo/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/highlighter/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/instantiated/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/lucli/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/memory/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/misc/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/queries/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/queryparser/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/spatial/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/spellchecker/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/swing/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/wordnet/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/xml-query-parser/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/analysis/common/build.xml" />
Modified: lucene/dev/branches/solr2452/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/.idea/modules.xml?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/.idea/modules.xml Mon May 23 05:20:32 2011
@@ -4,20 +4,15 @@
<modules>
<module filepath="$PROJECT_DIR$/parent.iml" />
<module filepath="$PROJECT_DIR$/lucene/lucene.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/ant/ant.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/db/bdb/bdb.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/db/bdb-je/bdb-je.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/demo/demo.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/highlighter/highlighter.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/instantiated/instantiated.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/lucli/lucli.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/memory/memory.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/misc/misc.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/queries/queries.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/queryparser/queryparser.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/spatial/spatial.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/spellchecker/spellchecker.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/swing/swing.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/wordnet/wordnet.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/xml-query-parser/xml-query-parser.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/common/common.iml" />
Modified: lucene/dev/branches/solr2452/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/idea/.idea/workspace.xml?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/solr2452/dev-tools/idea/.idea/workspace.xml Mon May 23 05:20:32 2011
@@ -8,27 +8,6 @@
<option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="ant contrib" type="JUnit" factoryName="JUnit">
- <module name="ant" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/ant" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
- <configuration default="false" name="bdb contrib" type="JUnit" factoryName="JUnit">
- <module name="bdb" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/db" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=bdb-temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
- <configuration default="false" name="bdb-je contrib" type="JUnit" factoryName="JUnit">
- <module name="bdb-je" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/db" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=bdb-je-temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
<configuration default="false" name="benchmark module" type="JUnit" factoryName="JUnit">
<module name="benchmark" />
<option name="TEST_OBJECT" value="package" />
@@ -106,13 +85,6 @@
<option name="VM_PARAMETERS" value="-ea -Dlucene.version=4.0-SNAPSHOT -DtempDir=temp -Dtests.linedocsfile=europarl.lines.txt.gz" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="lucli contrib" type="JUnit" factoryName="JUnit">
- <module name="lucli" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/lucli" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
<configuration default="false" name="memory contrib" type="JUnit" factoryName="JUnit">
<module name="memory" />
<option name="TEST_OBJECT" value="package" />
@@ -183,13 +155,6 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="swing contrib" type="JUnit" factoryName="JUnit">
- <module name="swing" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/swing" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
<configuration default="false" name="uima contrib" type="JUnit" factoryName="JUnit">
<module name="uima" />
<option name="TEST_OBJECT" value="package" />
@@ -211,37 +176,32 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <list size="30">
+ <list size="25">
<item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
- <item index="1" class="java.lang.String" itemvalue="JUnit.ant contrib" />
- <item index="2" class="java.lang.String" itemvalue="JUnit.bdb contrib" />
- <item index="3" class="java.lang.String" itemvalue="JUnit.bdb-je contrib" />
- <item index="4" class="java.lang.String" itemvalue="JUnit.benchmark module" />
- <item index="5" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
- <item index="6" class="java.lang.String" itemvalue="JUnit.common analysis module" />
- <item index="7" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
- <item index="8" class="java.lang.String" itemvalue="JUnit.dataimporthandler-extras contrib" />
- <item index="9" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
- <item index="10" class="java.lang.String" itemvalue="JUnit.grouping module" />
- <item index="11" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
- <item index="12" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
- <item index="13" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
- <item index="14" class="java.lang.String" itemvalue="JUnit.lucene" />
- <item index="15" class="java.lang.String" itemvalue="JUnit.lucli contrib" />
- <item index="16" class="java.lang.String" itemvalue="JUnit.memory contrib" />
- <item index="17" class="java.lang.String" itemvalue="JUnit.misc contrib" />
- <item index="18" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
- <item index="19" class="java.lang.String" itemvalue="JUnit.queries contrib" />
- <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
- <item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
- <item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
- <item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
- <item index="24" class="java.lang.String" itemvalue="JUnit.spellchecker contrib" />
- <item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
- <item index="26" class="java.lang.String" itemvalue="JUnit.swing contrib" />
- <item index="27" class="java.lang.String" itemvalue="JUnit.uima contrib" />
- <item index="28" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
- <item index="29" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
+ <item index="1" class="java.lang.String" itemvalue="JUnit.benchmark module" />
+ <item index="2" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
+ <item index="3" class="java.lang.String" itemvalue="JUnit.common analysis module" />
+ <item index="4" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
+ <item index="5" class="java.lang.String" itemvalue="JUnit.dataimporthandler-extras contrib" />
+ <item index="6" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
+ <item index="7" class="java.lang.String" itemvalue="JUnit.grouping module" />
+ <item index="8" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
+ <item index="9" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
+ <item index="10" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
+ <item index="11" class="java.lang.String" itemvalue="JUnit.lucene" />
+ <item index="12" class="java.lang.String" itemvalue="JUnit.memory contrib" />
+ <item index="13" class="java.lang.String" itemvalue="JUnit.misc contrib" />
+ <item index="14" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
+ <item index="15" class="java.lang.String" itemvalue="JUnit.queries contrib" />
+ <item index="16" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
+ <item index="17" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
+ <item index="18" class="java.lang.String" itemvalue="JUnit.solr" />
+ <item index="19" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.spellchecker contrib" />
+ <item index="21" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
+ <item index="22" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+ <item index="23" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
+ <item index="24" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
</list>
</component>
</project>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/lucene/contrib/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/lucene/contrib/pom.xml.template?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/lucene/contrib/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/lucene/contrib/pom.xml.template Mon May 23 05:20:32 2011
@@ -31,19 +31,15 @@
<name>Lucene Contrib aggregator POM</name>
<packaging>pom</packaging>
<modules>
- <module>ant</module>
- <module>db</module>
<module>demo</module>
<module>highlighter</module>
<module>instantiated</module>
- <module>lucli</module>
<module>memory</module>
<module>misc</module>
<module>queries</module>
<module>queryparser</module>
<module>spatial</module>
<module>spellchecker</module>
- <module>swing</module>
<module>wordnet</module>
<module>xml-query-parser</module>
</modules>
Modified: lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template Mon May 23 05:20:32 2011
@@ -131,16 +131,6 @@
<version>r05</version>
</dependency>
<dependency>
- <groupId>com.sleepycat</groupId>
- <artifactId>berkeleydb</artifactId>
- <version>4.7.25</version>
- </dependency>
- <dependency>
- <groupId>com.sleepycat</groupId>
- <artifactId>berkeleydb-je</artifactId>
- <version>3.3.93</version>
- </dependency>
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
@@ -206,11 +196,6 @@
<version>0.9.1</version>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- <version>4aug2000r7-dev</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
@@ -585,25 +570,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>get-jars-and-poms</id>
- <phase>install</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <ant dir="lucene/contrib/db/bdb" target="get-db-jar"/>
- <ant dir="lucene/contrib/db/bdb-je" target="get-je-jar"/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
@@ -635,34 +601,6 @@
</configuration>
</execution>
<execution>
- <id>install-berkeleydb</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>com.sleepycat</groupId>
- <artifactId>berkeleydb</artifactId>
- <version>4.7.25</version>
- <packaging>jar</packaging>
- <file>lucene/contrib/db/bdb/lib/db-4.7.25.jar</file>
- </configuration>
- </execution>
- <execution>
- <id>install-berkeleydb-je</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>com.sleepycat</groupId>
- <artifactId>berkeleydb-je</artifactId>
- <version>3.3.93</version>
- <packaging>jar</packaging>
- <file>lucene/contrib/db/bdb-je/lib/je-3.3.93.jar</file>
- </configuration>
- </execution>
- <execution>
<id>install-solr-commons-csv</id>
<phase>install</phase>
<goals>
Modified: lucene/dev/branches/solr2452/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/build.xml?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/build.xml (original)
+++ lucene/dev/branches/solr2452/lucene/build.xml Mon May 23 05:20:32 2011
@@ -220,19 +220,14 @@
<!-- make sure the group list below is updated. -->
<!-- Also remember to keep site.xml in sync. -->
- <packageset dir="contrib/ant/src/java"/>
- <packageset dir="contrib/db/bdb-je/src/java"/>
- <packageset dir="contrib/db/bdb/src/java"/>
<packageset dir="contrib/demo/src/java"/>
<packageset dir="contrib/highlighter/src/java"/>
<packageset dir="contrib/instantiated/src/java"/>
- <packageset dir="contrib/lucli/src/java"/>
<packageset dir="contrib/memory/src/java"/>
<packageset dir="contrib/misc/src/java"/>
<packageset dir="contrib/queries/src/java"/>
<packageset dir="contrib/spatial/src/java"/>
<packageset dir="contrib/spellchecker/src/java"/>
- <packageset dir="contrib/swing/src/java"/>
<packageset dir="contrib/wordnet/src/java"/>
<packageset dir="contrib/xml-query-parser/src/java"/>
<packageset dir="contrib/queryparser/src/java"/>
@@ -244,20 +239,16 @@
<group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*:org.apache.lucene.analysis.tokenattributes*"/>
- <group title="contrib: Ant" packages="org.apache.lucene.ant*"/>
<group title="contrib: Demo" packages="org.apache.lucene.demo*"/>
<group title="contrib: ICU" packages="org.apache.lucene.collation*"/>
- <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
<group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*:org.apache.lucene.search.vectorhighlight*"/>
<group title="contrib: Instantiated" packages="org.apache.lucene.store.instantiated*"/>
- <group title="contrib: Lucli" packages="lucli*"/>
<group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
<group title="contrib: Misc " packages="org.apache.lucene.misc*"/>
<group title="contrib: Queries" packages="org.apache.lucene.search.similar*:org.apache.lucene.search.regex*:org.apache.regexp*"/>
<group title="contrib: Query Parser" packages="org.apache.lucene.queryParser.*"/>
<group title="contrib: Spatial" packages="org.apache.lucene.spatial*"/>
<group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
- <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
<group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
<group title="contrib: XML Query Parser" packages="org.apache.lucene.xmlparser*"/>
Modified: lucene/dev/branches/solr2452/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/common-build.xml?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/common-build.xml (original)
+++ lucene/dev/branches/solr2452/lucene/common-build.xml Mon May 23 05:20:32 2011
@@ -852,15 +852,6 @@
<arg value="-c" />
<arg value="${basedir}/lib" />
<arg value="-c" />
- <arg value="${basedir}/contrib/ant/lib" />
- <!-- BDB libs are downloaded, don't check them -->
- <!--<arg value="-c" />
- <arg value="${toplevel.dir}/lucene/contrib/db/bdb/lib" />
- <arg value="-c" />
- <arg value="${toplevel.dir}/lucene/contrib/db/bdb-je/lib" />-->
- <arg value="-c" />
- <arg value="${basedir}/contrib/lucli/lib" />
- <arg value="-c" />
<arg value="${basedir}/contrib/queries/lib" />
</java>
</target>
Modified: lucene/dev/branches/solr2452/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/contrib/CHANGES.txt?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/solr2452/lucene/contrib/CHANGES.txt Mon May 23 05:20:32 2011
@@ -50,6 +50,10 @@ Bug Fixes
======================= Lucene 3.x (not yet released) =======================
+Changes in backwards compatibility policy
+
+ * LUCENE-2981: Removed the following contribs: ant, db, lucli, swing. (Robert Muir)
+
Changes in runtime behavior
* LUCENE-3086: ItalianAnalyzer now uses ElisionFilter with a set of Italian
Modified: lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/SegmentReader.java?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/SegmentReader.java Mon May 23 05:20:32 2011
@@ -29,7 +29,6 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldSelector;
-import org.apache.lucene.index.codecs.FieldsProducer;
import org.apache.lucene.store.BufferedIndexInput;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IndexInput;
@@ -70,174 +69,7 @@ public class SegmentReader extends Index
IndexInput singleNormStream;
AtomicInteger singleNormRef;
- CoreReaders core;
-
- // Holds core readers that are shared (unchanged) when
- // SegmentReader is cloned or reopened
- static final class CoreReaders {
-
- // Counts how many other reader share the core objects
- // (freqStream, proxStream, tis, etc.) of this reader;
- // when coreRef drops to 0, these core objects may be
- // closed. A given instance of SegmentReader may be
- // closed, even those it shares core objects with other
- // SegmentReaders:
- private final AtomicInteger ref = new AtomicInteger(1);
-
- final String segment;
- final FieldInfos fieldInfos;
-
- final FieldsProducer fields;
-
- final Directory dir;
- final Directory cfsDir;
- final int readBufferSize;
- final int termsIndexDivisor;
-
- private final SegmentReader origInstance;
-
- FieldsReader fieldsReaderOrig;
- TermVectorsReader termVectorsReaderOrig;
- CompoundFileReader cfsReader;
- CompoundFileReader storeCFSReader;
-
- CoreReaders(SegmentReader origInstance, Directory dir, SegmentInfo si, int readBufferSize, int termsIndexDivisor) throws IOException {
-
- if (termsIndexDivisor == 0) {
- throw new IllegalArgumentException("indexDivisor must be < 0 (don't load terms index) or greater than 0 (got 0)");
- }
-
- segment = si.name;
- final SegmentCodecs segmentCodecs = si.getSegmentCodecs();
- this.readBufferSize = readBufferSize;
- this.dir = dir;
-
- boolean success = false;
-
- try {
- Directory dir0 = dir;
- if (si.getUseCompoundFile()) {
- cfsReader = new CompoundFileReader(dir, IndexFileNames.segmentFileName(segment, "", IndexFileNames.COMPOUND_FILE_EXTENSION), readBufferSize);
- dir0 = cfsReader;
- }
- cfsDir = dir0;
- si.loadFieldInfos(cfsDir, false); // prevent opening the CFS to load fieldInfos
- fieldInfos = si.getFieldInfos();
-
- this.termsIndexDivisor = termsIndexDivisor;
-
- // Ask codec for its Fields
- fields = segmentCodecs.codec().fieldsProducer(new SegmentReadState(cfsDir, si, fieldInfos, readBufferSize, termsIndexDivisor));
- assert fields != null;
-
- success = true;
- } finally {
- if (!success) {
- decRef();
- }
- }
-
- // Must assign this at the end -- if we hit an
- // exception above core, we don't want to attempt to
- // purge the FieldCache (will hit NPE because core is
- // not assigned yet).
- this.origInstance = origInstance;
- }
-
- synchronized TermVectorsReader getTermVectorsReaderOrig() {
- return termVectorsReaderOrig;
- }
-
- synchronized FieldsReader getFieldsReaderOrig() {
- return fieldsReaderOrig;
- }
-
- synchronized void incRef() {
- ref.incrementAndGet();
- }
-
- synchronized Directory getCFSReader() {
- return cfsReader;
- }
-
- synchronized void decRef() throws IOException {
-
- if (ref.decrementAndGet() == 0) {
-
- if (fields != null) {
- fields.close();
- }
-
- if (termVectorsReaderOrig != null) {
- termVectorsReaderOrig.close();
- }
-
- if (fieldsReaderOrig != null) {
- fieldsReaderOrig.close();
- }
-
- if (cfsReader != null) {
- cfsReader.close();
- }
-
- if (storeCFSReader != null) {
- storeCFSReader.close();
- }
-
- // Now, notify any ReaderFinished listeners:
- if (origInstance != null) {
- origInstance.notifyReaderFinishedListeners();
- }
- }
- }
-
- synchronized void openDocStores(SegmentInfo si) throws IOException {
-
- assert si.name.equals(segment);
-
- if (fieldsReaderOrig == null) {
- final Directory storeDir;
- if (si.getDocStoreOffset() != -1) {
- if (si.getDocStoreIsCompoundFile()) {
- assert storeCFSReader == null;
- storeCFSReader = new CompoundFileReader(dir,
- IndexFileNames.segmentFileName(si.getDocStoreSegment(), "", IndexFileNames.COMPOUND_FILE_STORE_EXTENSION),
- readBufferSize);
- storeDir = storeCFSReader;
- assert storeDir != null;
- } else {
- storeDir = dir;
- assert storeDir != null;
- }
- } else if (si.getUseCompoundFile()) {
- // In some cases, we were originally opened when CFS
- // was not used, but then we are asked to open doc
- // stores after the segment has switched to CFS
- if (cfsReader == null) {
- cfsReader = new CompoundFileReader(dir, IndexFileNames.segmentFileName(segment, "", IndexFileNames.COMPOUND_FILE_EXTENSION), readBufferSize);
- }
- storeDir = cfsReader;
- assert storeDir != null;
- } else {
- storeDir = dir;
- assert storeDir != null;
- }
-
- final String storesSegment = si.getDocStoreSegment();
- fieldsReaderOrig = new FieldsReader(storeDir, storesSegment, fieldInfos, readBufferSize,
- si.getDocStoreOffset(), si.docCount);
-
- // Verify two sources of "maxDoc" agree:
- if (si.getDocStoreOffset() == -1 && fieldsReaderOrig.size() != si.docCount) {
- throw new CorruptIndexException("doc counts differ for segment " + segment + ": fieldsReader shows " + fieldsReaderOrig.size() + " but segmentInfo shows " + si.docCount);
- }
-
- if (si.getHasVectors()) { // open term vector files only as needed
- termVectorsReaderOrig = new TermVectorsReader(storeDir, storesSegment, fieldInfos, readBufferSize, si.getDocStoreOffset(), si.docCount);
- }
- }
- }
- }
+ SegmentCoreReaders core;
/**
* Sets the initial value
@@ -248,8 +80,6 @@ public class SegmentReader extends Index
return (FieldsReader) core.getFieldsReaderOrig().clone();
}
}
-
-
Map<String,SegmentNorms> norms = new HashMap<String,SegmentNorms>();
@@ -281,7 +111,7 @@ public class SegmentReader extends Index
boolean success = false;
try {
- instance.core = new CoreReaders(instance, dir, si, readBufferSize, termInfosIndexDivisor);
+ instance.core = new SegmentCoreReaders(instance, dir, si, readBufferSize, termInfosIndexDivisor);
if (doOpenStores) {
instance.core.openDocStores(si);
}
Modified: lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml (original)
+++ lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml Mon May 23 05:20:32 2011
@@ -50,11 +50,6 @@
<a href="http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/">http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/</a>.
</p>
- <section id="ant"><title>ant</title>
- <p>Ant task to create Lucene indexes.</p>
- <p>See <a href="../api/contrib-ant/index.html">ant javadoc</a></p>
- </section>
-
<section id="benchmark"><title>benchmark</title>
<p>The benchmark contribution contains tools for benchmarking Lucene using standard, freely available corpora.</p>
<p>See <a href="../api/contrib-benchmark/index.html">benchmark javadoc</a></p>
@@ -66,11 +61,6 @@
<p>See <a href="../api/contrib-demo/index.html">demo javadoc</a></p>
</section>
- <section id="db"><title>db</title>
- <p>Provides integration with Berkley DB.</p>
- <p>See <a href="../api/contrib-db/index.html">db javadoc</a></p>
- </section>
-
<section id="highlighter"><title>highlighter</title>
<p>A set of classes for highlighting matching terms in search results.</p>
<p>See <a href="../api/contrib-highlighter/index.html">highlighter javadoc</a></p>
@@ -80,11 +70,6 @@
<p>RAM-based index that enables much faster searching than RAMDirectory in certain situations.</p>
<p>See <a href="../api/contrib-instantiated/index.html">instantiated javadoc</a></p>
</section>
-
- <section id="lucli"><title>lucli</title>
- <p>An application that allows Lucene index manipulation from the command-line.</p>
- <p>See <a href="../api/contrib-lucli/index.html">lucli javadoc</a></p>
- </section>
<section id="memory"><title>memory</title>
<p>High-performance single-document main memory index.</p>
@@ -121,11 +106,6 @@
<p>See <a href="../api/contrib-spellchecker/index.html">spellchecker javadoc</a></p>
</section>
- <section id="swing"><title>swing</title>
- <p>Swing components designed to integrate with Lucene.</p>
- <p>See <a href="../api/contrib-swing/index.html">swing javadoc</a></p>
- </section>
-
<section id="wordnet"><title>wordnet</title>
<p>Tools to help utilize wordnet synonyms with Lucene</p>
<p>See <a href="../api/contrib-wordnet/index.html">wordnet javadoc</a></p>
Modified: lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/site.xml?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/site.xml (original)
+++ lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/site.xml Mon May 23 05:20:32 2011
@@ -52,14 +52,10 @@ See http://forrest.apache.org/docs/linki
<javadoc-core label="Core" href="ext:javadocs-core"/>
<javadoc-test-framework label="Test Framework" href="ext:javadocs-test-framework"/>
<javadoc-contrib label="Contrib">
- <javadoc-contrib-ant label="Ant" href="ext:javadocs-contrib-ant"/>
- <javadoc-contrib-bdb label="Bdb" href="ext:javadocs-contrib-bdb"/>
- <javadoc-contrib-bdb-je label="Bdb-je" href="ext:javadocs-contrib-bdb-je"/>
<javadoc-contrib-benchmark label="Benchmark" href="ext:javadocs-contrib-benchmark"/>
<javadoc-contrib-demo label="Demo" href="ext:javadocs-contrib-demo"/>
<javadoc-contrib-highlighter label="Highlighter" href="ext:javadocs-contrib-highlighter"/>
<javadoc-contrib-instantiated label="Instantiated" href="ext:javadocs-contrib-instantiated"/>
- <javadoc-contrib-lucli label="Lucli" href="ext:javadocs-contrib-lucli"/>
<javadoc-contrib-memory label="Memory" href="ext:javadocs-contrib-memory"/>
<javadoc-contrib-misc label="Miscellaneous" href="ext:javadocs-contrib-misc"/>
<javadoc-contrib-queries label="Queries" href="ext:javadocs-contrib-queries"/>
@@ -69,8 +65,7 @@ See http://forrest.apache.org/docs/linki
-->
<javadoc-contrib-remote label="Remote" href="ext:javadocs-contrib-remote"/>
<javadoc-contrib-spatial label="Spatial" href="ext:javadocs-contrib-spatial"/>
- <javadoc-contrib-spellchecker label="Spellchecker" href="ext:javadocs-contrib-spellchecker"/>
- <javadoc-contrib-swing label="Swing" href="ext:javadocs-contrib-swing"/>
+ <javadoc-contrib-spellchecker label="Spellchecker" href="ext:javadocs-contrib-spellchecker"/>
<javadoc-contrib-wordnet label="Wordnet" href="ext:javadocs-contrib-wordnet"/>
<javadoc-contrib-xml-query-parser label="XML Query Parser" href="ext:javadocs-contrib-xml-query-parser"/>
</javadoc-contrib>
@@ -100,14 +95,10 @@ See http://forrest.apache.org/docs/linki
<javadocs-all href="api/all/index.html"/>
<javadocs-core href="api/core/index.html"/>
<javadocs-test-framework href="api/test-framework/index.html"/>
- <javadocs-contrib-ant href="api/contrib-ant/index.html"/>
- <javadocs-contrib-bdb href="api/contrib-bdb/index.html"/>
- <javadocs-contrib-bdb-je href="api/contrib-bdb-je/index.html"/>
<javadocs-contrib-benchmark href="api/contrib-benchmark/index.html"/>
<javadocs-contrib-demo href="api/contrib-demo/index.html"/>
<javadocs-contrib-highlighter href="api/contrib-highlighter/index.html"/>
<javadocs-contrib-instantiated href="api/contrib-instantiated/index.html"/>
- <javadocs-contrib-lucli href="api/contrib-lucli/index.html"/>
<javadocs-contrib-memory href="api/contrib-memory/index.html"/>
<javadocs-contrib-misc href="api/contrib-misc/index.html"/>
<javadocs-contrib-queries href="api/contrib-queries/index.html"/>
@@ -115,7 +106,6 @@ See http://forrest.apache.org/docs/linki
<javadocs-contrib-remote href="api/contrib-remote/index.html"/>
<javadocs-contrib-spatial href="api/contrib-spatial/index.html"/>
<javadocs-contrib-spellchecker href="api/contrib-spellchecker/index.html"/>
- <javadocs-contrib-swing href="api/contrib-swing/index.html"/>
<javadocs-contrib-wordnet href="api/contrib-wordnet/index.html"/>
<javadocs-contrib-xml-query-parser href="api/contrib-xml-query-parser/index.html"/>
Modified: lucene/dev/branches/solr2452/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html?rev=1126320&r1=1126319&r2=1126320&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html (original)
+++ lucene/dev/branches/solr2452/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html Mon May 23 05:20:32 2011
@@ -68,7 +68,7 @@ field fall into a single group.</p>
<p>Typical usage looks like this (using the {@link org.apache.lucene.search.CachingCollector}):</p>
-<pre>
+<pre class="prettyprint">
FirstPassGroupingCollector c1 = new FirstPassGroupingCollector("author", groupSort, groupOffset+topNGroups);
boolean cacheScores = true;