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/06/02 00:37:11 UTC
svn commit: r1130331 [1/2] - in /lucene/dev/branches/solr2452: ./
dev-tools/maven/ lucene/ lucene/contrib/
lucene/contrib/misc/src/test/org/apache/lucene/index/
lucene/contrib/misc/src/test/org/apache/lucene/misc/ lucene/docs/
lucene/docs/lucene-contri...
Author: sarowe
Date: Wed Jun 1 22:37:09 2011
New Revision: 1130331
URL: http://svn.apache.org/viewvc?rev=1130331&view=rev
Log:
SOLR-2452: merged with trunk up to r1130266. Removed duplicate solr-contrib-uptodate definition in solr/contrib/contrib-build.xml. Fixed directory glob in solr-contrib-uptodate target: .../src/main/java/ -> .../src/java/
Added:
lucene/dev/branches/solr2452/solr/src/test-framework/org/apache/solr/core/
- copied from r1130268, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/core/
lucene/dev/branches/solr2452/solr/src/test-framework/org/apache/solr/core/MockDirectoryFactory.java
- copied unchanged from r1130268, lucene/dev/trunk/solr/src/test-framework/org/apache/solr/core/MockDirectoryFactory.java
Removed:
lucene/dev/branches/solr2452/common-build.xml
lucene/dev/branches/solr2452/modules/analysis/common/SNOWBALL-LICENSE.txt
lucene/dev/branches/solr2452/modules/benchmark/.rsync-filter
Modified:
lucene/dev/branches/solr2452/ (props changed)
lucene/dev/branches/solr2452/build.xml
lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template
lucene/dev/branches/solr2452/lucene/ (props changed)
lucene/dev/branches/solr2452/lucene/CHANGES.txt
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/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
lucene/dev/branches/solr2452/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
lucene/dev/branches/solr2452/lucene/docs/contributions.html
lucene/dev/branches/solr2452/lucene/docs/contributions.pdf
lucene/dev/branches/solr2452/lucene/docs/demo.html
lucene/dev/branches/solr2452/lucene/docs/demo.pdf
lucene/dev/branches/solr2452/lucene/docs/demo2.html
lucene/dev/branches/solr2452/lucene/docs/demo2.pdf
lucene/dev/branches/solr2452/lucene/docs/fileformats.html
lucene/dev/branches/solr2452/lucene/docs/fileformats.pdf
lucene/dev/branches/solr2452/lucene/docs/gettingstarted.html
lucene/dev/branches/solr2452/lucene/docs/gettingstarted.pdf
lucene/dev/branches/solr2452/lucene/docs/index.html
lucene/dev/branches/solr2452/lucene/docs/index.pdf
lucene/dev/branches/solr2452/lucene/docs/linkmap.html
lucene/dev/branches/solr2452/lucene/docs/linkmap.pdf
lucene/dev/branches/solr2452/lucene/docs/lucene-contrib/index.html
lucene/dev/branches/solr2452/lucene/docs/lucene-contrib/index.pdf
lucene/dev/branches/solr2452/lucene/docs/queryparsersyntax.html
lucene/dev/branches/solr2452/lucene/docs/queryparsersyntax.pdf
lucene/dev/branches/solr2452/lucene/docs/scoring.html
lucene/dev/branches/solr2452/lucene/docs/scoring.pdf
lucene/dev/branches/solr2452/lucene/docs/skin/basic.css
lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png
lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png
lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png
lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
lucene/dev/branches/solr2452/lucene/docs/skin/print.css
lucene/dev/branches/solr2452/lucene/docs/skin/profile.css
lucene/dev/branches/solr2452/lucene/docs/skin/screen.css
lucene/dev/branches/solr2452/lucene/docs/systemrequirements.html
lucene/dev/branches/solr2452/lucene/docs/systemrequirements.pdf
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/document/Field.java
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/IndexReader.java
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/util/Version.java
lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/fileformats.xml
lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/index.xml
lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml
lucene/dev/branches/solr2452/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/solr2452/modules/analysis/CHANGES.txt
lucene/dev/branches/solr2452/modules/analysis/LICENSE.txt
lucene/dev/branches/solr2452/modules/analysis/build.xml
lucene/dev/branches/solr2452/modules/analysis/common/build.xml
lucene/dev/branches/solr2452/modules/analysis/icu/build.xml
lucene/dev/branches/solr2452/modules/benchmark/CHANGES.txt
lucene/dev/branches/solr2452/modules/build.xml
lucene/dev/branches/solr2452/solr/ (props changed)
lucene/dev/branches/solr2452/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/solr2452/solr/LICENSE.txt (contents, 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 (contents, props changed)
lucene/dev/branches/solr2452/solr/client/ (props changed)
lucene/dev/branches/solr2452/solr/common-build.xml (contents, props changed)
lucene/dev/branches/solr2452/solr/contrib/ (props changed)
lucene/dev/branches/solr2452/solr/contrib/analysis-extras/CHANGES.txt
lucene/dev/branches/solr2452/solr/contrib/clustering/CHANGES.txt
lucene/dev/branches/solr2452/solr/contrib/clustering/lib/simple-xml-NOTICE.txt
lucene/dev/branches/solr2452/solr/contrib/contrib-build.xml
lucene/dev/branches/solr2452/solr/contrib/dataimporthandler/CHANGES.txt
lucene/dev/branches/solr2452/solr/contrib/extraction/CHANGES.txt
lucene/dev/branches/solr2452/solr/contrib/uima/CHANGES.txt
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/src/test-framework/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/branches/solr2452/solr/src/test-framework/org/apache/solr/util/AbstractSolrTestCase.java
lucene/dev/branches/solr2452/solr/src/test/org/apache/solr/TestSolrCoreProperties.java
lucene/dev/branches/solr2452/solr/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java
lucene/dev/branches/solr2452/solr/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java
lucene/dev/branches/solr2452/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
lucene/dev/branches/solr2452/solr/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
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=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/build.xml (original)
+++ lucene/dev/branches/solr2452/build.xml Wed Jun 1 22:37:09 2011
@@ -18,7 +18,6 @@
-->
<project name="lucene-solr" default="test" basedir=".">
- <import file="common-build.xml"/>
<target name="test" description="Test both Lucene and Solr" depends="validate">
<sequential>
<subant target="test" inheritall="false" failonerror="true">
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=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/solr2452/dev-tools/maven/pom.xml.template Wed Jun 1 22:37:09 2011
@@ -561,6 +561,31 @@
</execution>
</executions>
</plugin>
+
+ <!-- Adding OSGI metadata to the JAR without changing the packaging type. -->
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.4</version>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
<profiles>
Modified: lucene/dev/branches/solr2452/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/CHANGES.txt?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/solr2452/lucene/CHANGES.txt Wed Jun 1 22:37:09 2011
@@ -1,5 +1,8 @@
Lucene Change Log
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
======================= Trunk (not yet released) =======================
Changes in backwards compatibility policy
@@ -233,6 +236,9 @@ Changes in Runtime Behavior
(Mike McCandless, Michael Busch, Simon Willnauer)
+* LUCENE-3146: IndexReader.setNorm throws IllegalStateException if the field
+ does not store norms. (Shai Erera, Mike McCandless)
+
API Changes
* LUCENE-2302, LUCENE-1458, LUCENE-2111, LUCENE-2514: Terms are no longer
@@ -1315,7 +1321,7 @@ Documentation
* LUCENE-2894: Use google-code-prettify for syntax highlighting in javadoc.
(Shinichiro Abe, Koji Sekiguchi)
-================== Release 2.9.4 / 3.0.3 2010-12-03 ====================
+================== Release 2.9.4 / 3.0.3 ====================
Changes in runtime behavior
@@ -1468,7 +1474,7 @@ Documentation
Java NIO behavior when a Thread is interrupted while blocking on IO.
(Simon Willnauer, Robert Muir)
-================== Release 2.9.3 / 3.0.2 2010-06-18 ====================
+================== Release 2.9.3 / 3.0.2 ====================
Changes in backwards compatibility policy
@@ -1613,7 +1619,7 @@ Build
compiling/testing/packaging. This marks the benchmark contrib also
as Java 1.5, as it depends on fast-vector-highlighter. (Uwe Schindler)
-================== Release 2.9.2 / 3.0.1 2010-02-26 ====================
+================== Release 2.9.2 / 3.0.1 ====================
Changes in backwards compatibility policy
@@ -1716,7 +1722,7 @@ Documentation
provided reader is per-segment (Simon Willnauer via Mike
McCandless)
-======================= Release 3.0.0 2009-11-25 =======================
+======================= Release 3.0.0 =======================
Changes in backwards compatibility policy
@@ -1917,7 +1923,7 @@ Build
* LUCENE-2024: Raise build requirements to Java 1.5 and ANT 1.7.0
(Uwe Schindler, Mike McCandless)
-======================= Release 2.9.1 2009-11-06 =======================
+======================= Release 2.9.1 =======================
Changes in backwards compatibility policy
@@ -1987,7 +1993,7 @@ Documentation
* LUCENE-2008: Javadoc improvements for TokenStream/Tokenizer/Token
(Luke Nezda via Mike McCandless)
-======================= Release 2.9.0 2009-09-23 =======================
+======================= Release 2.9.0 =======================
Changes in backwards compatibility policy
@@ -2901,7 +2907,7 @@ Test Cases
* LUCENE-1836: Added a new LocalizedTestCase as base class for localization
junit tests. (Robert Muir, Uwe Schindler via Michael Busch)
-======================= Release 2.4.1 2009-03-09 =======================
+======================= Release 2.4.1 =======================
API Changes
@@ -2969,7 +2975,7 @@ Bug fixes
rollback IndexWriter's internal state on hitting an
exception. (Scott Garland via Mike McCandless)
-======================= Release 2.4.0 2008-10-06 =======================
+======================= Release 2.4.0 =======================
Changes in backwards compatibility policy
@@ -3334,7 +3340,7 @@ Test Cases
2. LUCENE-1348: relax TestTimeLimitedCollector to not fail due to
timeout exceeded (just because test machine is very busy).
-======================= Release 2.3.2 2008-05-05 =======================
+======================= Release 2.3.2 =======================
Bug fixes
@@ -3384,7 +3390,7 @@ Build
1. LUCENE-1230: Include *pom.xml* in source release files. (Michael Busch)
-======================= Release 2.3.1 2008-02-22 =======================
+======================= Release 2.3.1 =======================
Bug fixes
@@ -3413,7 +3419,7 @@ Bug fixes
preventing Fields with empty-string field name from working.
(Sergey Kabashnyuk via Mike McCandless)
-======================= Release 2.3.0 2008-01-21 =======================
+======================= Release 2.3.0 =======================
Changes in runtime behavior
@@ -3805,7 +3811,7 @@ Test Cases
1. LUCENE-766: Test adding two fields with the same name but different
term vector setting. (Nicolas Lalevée via Doron Cohen)
-======================= Release 2.2.0 2007-06-19 =======================
+======================= Release 2.2.0 =======================
Changes in runtime behavior
@@ -4114,7 +4120,7 @@ Build
of the Lucene core and the contrib modules.
(Sami Siren, Karl Wettin, Michael Busch)
-======================= Release 2.1.0 2007-02-14 =======================
+======================= Release 2.1.0 =======================
Changes in runtime behavior
@@ -4602,7 +4608,7 @@ Build
distribution of both binary and source distributions. Called by package
and package-*-src
-======================= Release 2.0.0 2006-05-26 =======================
+======================= Release 2.0.0 =======================
API Changes
@@ -5706,7 +5712,7 @@ Infrastructure
11. Fixed bugs in GermanAnalyzer (gschwarz)
-1.2 RC2, 19 October 2001:
+1.2 RC2:
- added sources to distribution
- removed broken build scripts and libraries from distribution
- SegmentsReader: fixed potential race condition
@@ -5721,7 +5727,7 @@ Infrastructure
- JDK 1.1 compatibility fix: disabled lock files for JDK 1.1,
since they rely on a feature added in JDK 1.2.
-1.2 RC1 (first Apache release), 2 October 2001:
+1.2 RC1 (first Apache release):
- packages renamed from com.lucene to org.apache.lucene
- license switched from LGPL to Apache
- ant-only build -- no more makefiles
@@ -5732,18 +5738,18 @@ Infrastructure
- Analyzers can choose tokenizer based on field name
- misc bug fixes.
-1.01b (last Sourceforge release), 2 July 2001
+1.01b (last Sourceforge release)
. a few bug fixes
. new Query Parser
. new prefix query (search for "foo*" matches "food")
-1.0, 2000-10-04
+1.0
This release fixes a few serious bugs and also includes some
performance optimizations, a stemmer, and a few other minor
enhancements.
-0.04 2000-04-19
+0.04
Lucene now includes a grammar-based tokenizer, StandardTokenizer.
@@ -5768,7 +5774,7 @@ StandardTokenizer serves two purposes:
the new tokenizer into the application and modifying it
accordingly.
-0.01, 2000-03-30
+0.01
First open source release.
Modified: lucene/dev/branches/solr2452/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/build.xml?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/build.xml (original)
+++ lucene/dev/branches/solr2452/lucene/build.xml Wed Jun 1 22:37:09 2011
@@ -50,8 +50,7 @@
excludes="*-src.jar"
/>
<patternset id="binary.root.dist.patterns"
- includes="docs/,*.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/ contrib/xml-query-parser/*.dtd"
- excludes="BUILD.txt"
+ includes="docs/,CHANGES.txt,LICENSE.txt,NOTICE.txt,README.txt,MIGRATE.txt,JRE_VERSION_MIGRATION.txt,contrib/**/README*,**/CHANGES.txt,contrib/**/*.sh contrib/**/docs/ contrib/xml-query-parser/*.dtd,lib/*.jar,lib/*LICENSE*.txt,lib/*NOTICE*.txt,contrib/*/lib/*.jar,contrib/*/lib/*LICENSE*.txt,contrib/*/lib/*NOTICE*.txt"
/>
@@ -293,10 +292,10 @@
<!-- -->
<!-- ================================================================== -->
<target name="package-tgz" depends="package"
- description="--> Generates the lucene distribution as .tar.gz">
+ description="--> Generates the lucene distribution as .tgz">
<delete file="${build.dir}/lucene-${version}.tar"/>
- <delete file="${dist.dir}/lucene-${version}.tar.gz"/>
+ <delete file="${dist.dir}/lucene-${version}.tgz"/>
<tar tarfile="${build.dir}/lucene-${version}.tar" longfile="gnu">
<tarfileset prefix="lucene-${version}" dir=".">
<patternset refid="binary.root.dist.patterns"/>
@@ -306,10 +305,10 @@
</tarfileset>
</tar>
- <gzip zipfile="${dist.dir}/lucene-${version}.tar.gz"
+ <gzip zipfile="${dist.dir}/lucene-${version}.tgz"
src="${build.dir}/lucene-${version}.tar"
/>
- <lucene-checksum file="${dist.dir}/lucene-${version}.tar.gz"/>
+ <lucene-checksum file="${dist.dir}/lucene-${version}.tgz"/>
</target>
<!-- ================================================================== -->
@@ -318,7 +317,7 @@
<!-- -->
<!-- ================================================================== -->
<target name="package-all-binary" depends="package-zip, package-tgz"
- description="--> Generates the .tar.gz and .zip distributions"/>
+ description="--> Generates the .tgz and .zip distributions"/>
<!-- ================================================================== -->
<!-- same as package-all. it is just here for compatibility. -->
@@ -345,9 +344,9 @@
<!-- Packages the sources from "svn export" with tar-gzip -->
<!-- ================================================================== -->
<target name="package-tgz-src" depends="init, init-dist, svn-export-source"
- description="--> Generates the Lucene distribution as .tar.gz">
+ description="--> Generates the Lucene distribution as .tgz">
<property name="source.package.file"
- value="${dist.dir}/lucene-${version}-src.tar.gz"/>
+ value="${dist.dir}/lucene-${version}-src.tgz"/>
<delete file="${source.package.file}"/>
<tar tarfile="${source.package.file}" compression="gzip" longfile="gnu">
<tarfileset prefix="lucene-${version}" dir="${svn.export.dir}"/>
@@ -377,7 +376,7 @@
<!-- ================================================================== -->
<!-- Populates properties svn.URL and svn.Revision using "svn info". -->
<!-- ================================================================== -->
- <target name="get-svn-info">
+ <target name="get-svn-info" depends="check-svn">
<exec dir="." executable="${svn.exe}" outputproperty="svn.info" failonerror="true">
<arg value="info"/>
</exec>
@@ -393,6 +392,16 @@
</loadproperties>
</target>
+ <target name="check-svn">
+ <sequential>
+ <exec dir="." executable="${svnversion.exe}" outputproperty="svn.ver"/>
+ <fail message="A subversion checkout is required for this target">
+ <condition>
+ <equals arg1="${svn.ver}" arg2="exported"/>
+ </condition>
+ </fail>
+ </sequential>
+ </target>
<!-- ================================================================== -->
<!-- same as package-tgz-src. it is just here for compatibility. -->
@@ -494,7 +503,7 @@
<fileset dir="${dist.dir}">
<include name="**/*.jar"/>
<include name="**/*.zip"/>
- <include name="**/*.tar.gz"/>
+ <include name="**/*.tgz"/>
<include name="**/*.pom"/>
</fileset>
<globmapper from="*" to="*.asc"/>
Modified: lucene/dev/branches/solr2452/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/common-build.xml?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/common-build.xml (original)
+++ lucene/dev/branches/solr2452/lucene/common-build.xml Wed Jun 1 22:37:09 2011
@@ -24,7 +24,6 @@
</description>
<dirname file="${ant.file.common}" property="common.dir"/>
- <import file="${common.dir}/../common-build.xml"/>
<property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
<property name="prettify.dir" value="${common.dir}/src/tools/prettify"/>
<property name="maven.build.dir" value="${common.dir}/build/maven"/>
@@ -61,6 +60,11 @@
<fileset dir="${common.dir}/lib" includes="ant-*.jar"/>
</path>
+ <path id="tools.runtime.classpath">
+ <pathelement location="${common.dir}/build/classes/tools"/>
+ </path>
+
+
<!-- default arguments to pass to JVM executing tests -->
<property name="testmethod" value=""/>
<property name="args" value=""/>
@@ -536,6 +540,8 @@
<sysproperty key="testmethod" value="${testmethod}"/>
<sysproperty key="jetty.testMode" value="1"/>
+
+ <sysproperty key="solr.directoryFactory" value="org.apache.solr.core.MockDirectoryFactory"/>
<formatter type="xml"/>
<formatter classname="${junit.details.formatter}" usefile="false"/>
Modified: lucene/dev/branches/solr2452/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/contrib/CHANGES.txt?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/solr2452/lucene/contrib/CHANGES.txt Wed Jun 1 22:37:09 2011
@@ -1,5 +1,8 @@
Lucene contrib change Log
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
======================= Trunk (not yet released) =======================
Build
@@ -442,7 +445,7 @@ Other
* LUCENE-2415: Use reflection instead of a shim class to access Jakarta
Regex prefix. (Uwe Schindler)
-================== Release 2.9.4 / 3.0.3 2010-12-03 ====================
+================== Release 2.9.4 / 3.0.3 ====================
Bug Fixes
@@ -477,11 +480,11 @@ Documentation
as expected on all JRE's. For example, on an IBM JRE, it does nothing.
(Robert Muir)
-================== Release 2.9.3 / 3.0.2 2010-06-18 ====================
+================== Release 2.9.3 / 3.0.2 ====================
No changes.
-================== Release 2.9.2 / 3.0.1 2010-02-26 ====================
+================== Release 2.9.2 / 3.0.1 ====================
New features
@@ -520,7 +523,7 @@ API Changes
* LUCENE-2165: Add a constructor to SnowballAnalyzer that takes a Set of
stopwords, and deprecate the String[] one. (Nick Burch via Robert Muir)
-======================= Release 3.0.0 2009-11-25 =======================
+======================= Release 3.0.0 =======================
Changes in backwards compatibility policy
@@ -597,7 +600,7 @@ Build
* LUCENE-2031: Moved PatternAnalyzer from contrib/memory into
contrib/analyzers/common, under miscellaneous. (Robert Muir)
-======================= Release 2.9.1 2009-11-06 =======================
+======================= Release 2.9.1 =======================
Changes in backwards compatibility policy
@@ -640,7 +643,7 @@ Bug fixes
* LUCENE-2013: SpanRegexQuery does not work with QueryScorer.
(Benjamin Keil via Mark Miller)
-======================= Release 2.9.0 2009-09-23 =======================
+======================= Release 2.9.0 =======================
Changes in runtime behavior
@@ -829,7 +832,7 @@ Build
Test Cases
-======================= Release 2.4.0 2008-10-06 =======================
+======================= Release 2.4.0 =======================
Changes in runtime behavior
Modified: lucene/dev/branches/solr2452/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java (original)
+++ lucene/dev/branches/solr2452/lucene/contrib/misc/src/test/org/apache/lucene/index/TestFieldNormModifier.java Wed Jun 1 22:37:09 2011
@@ -86,7 +86,11 @@ public class TestFieldNormModifier exten
public void testMissingField() throws Exception {
FieldNormModifier fnm = new FieldNormModifier(store, s);
- fnm.reSetNorms("nobodyherebutuschickens");
+ try {
+ fnm.reSetNorms("nobodyherebutuschickens");
+ } catch (IllegalStateException e) {
+ // expected
+ }
}
public void testFieldWithNoNorm() throws Exception {
@@ -101,7 +105,11 @@ public class TestFieldNormModifier exten
r.close();
FieldNormModifier fnm = new FieldNormModifier(store, s);
- fnm.reSetNorms("nonorm");
+ try {
+ fnm.reSetNorms("nonorm");
+ } catch (IllegalStateException e) {
+ // expected
+ }
// nothing should have changed
r = IndexReader.open(store, false);
Modified: lucene/dev/branches/solr2452/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java (original)
+++ lucene/dev/branches/solr2452/lucene/contrib/misc/src/test/org/apache/lucene/misc/TestLengthNormModifier.java Wed Jun 1 22:37:09 2011
@@ -92,12 +92,12 @@ public class TestLengthNormModifier exte
super.tearDown();
}
- public void testMissingField() {
+ public void testMissingField() throws Exception {
FieldNormModifier fnm = new FieldNormModifier(store, s);
try {
fnm.reSetNorms("nobodyherebutuschickens");
- } catch (Exception e) {
- assertNull("caught something", e);
+ } catch (IllegalStateException e) {
+ // expected
}
}
@@ -115,8 +115,8 @@ public class TestLengthNormModifier exte
FieldNormModifier fnm = new FieldNormModifier(store, s);
try {
fnm.reSetNorms("nonorm");
- } catch (Exception e) {
- assertNull("caught something", e);
+ } catch (IllegalStateException e) {
+ // expected
}
// nothing should have changed
Modified: lucene/dev/branches/solr2452/lucene/docs/contributions.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/contributions.html?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/contributions.html (original)
+++ lucene/dev/branches/solr2452/lucene/docs/contributions.html Wed Jun 1 22:37:09 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
<div id="menu_1.1.3.4" class="menuitemgroup">
<div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-instantiated/index.html">Instantiated</a>
</div>
<div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-memory/index.html">Memory</a>
</div>
<div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/solr2452/lucene/docs/contributions.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/contributions.pdf?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Files lucene/dev/branches/solr2452/lucene/docs/contributions.pdf (original) and lucene/dev/branches/solr2452/lucene/docs/contributions.pdf Wed Jun 1 22:37:09 2011 differ
Modified: lucene/dev/branches/solr2452/lucene/docs/demo.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/demo.html?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/demo.html (original)
+++ lucene/dev/branches/solr2452/lucene/docs/demo.html Wed Jun 1 22:37:09 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
<div id="menu_1.1.3.4" class="menuitemgroup">
<div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-instantiated/index.html">Instantiated</a>
</div>
<div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-memory/index.html">Memory</a>
</div>
<div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/solr2452/lucene/docs/demo.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/demo.pdf?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Files lucene/dev/branches/solr2452/lucene/docs/demo.pdf (original) and lucene/dev/branches/solr2452/lucene/docs/demo.pdf Wed Jun 1 22:37:09 2011 differ
Modified: lucene/dev/branches/solr2452/lucene/docs/demo2.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/demo2.html?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/demo2.html (original)
+++ lucene/dev/branches/solr2452/lucene/docs/demo2.html Wed Jun 1 22:37:09 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
<div id="menu_1.1.3.4" class="menuitemgroup">
<div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-instantiated/index.html">Instantiated</a>
</div>
<div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-memory/index.html">Memory</a>
</div>
<div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/solr2452/lucene/docs/demo2.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/demo2.pdf?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Files lucene/dev/branches/solr2452/lucene/docs/demo2.pdf (original) and lucene/dev/branches/solr2452/lucene/docs/demo2.pdf Wed Jun 1 22:37:09 2011 differ
Modified: lucene/dev/branches/solr2452/lucene/docs/fileformats.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/fileformats.html?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/fileformats.html (original)
+++ lucene/dev/branches/solr2452/lucene/docs/fileformats.html Wed Jun 1 22:37:09 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
<div id="menu_1.1.3.4" class="menuitemgroup">
<div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-instantiated/index.html">Instantiated</a>
</div>
<div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-memory/index.html">Memory</a>
</div>
<div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
@@ -356,7 +341,7 @@ document.write("Last Published: " + docu
<div class="section">
<p>
This document defines the index file formats used
- in Lucene version 4.0. If you are using a different
+ in this version of Lucene. If you are using a different
version of Lucene, please consult the copy of
<span class="codefrag">docs/fileformats.html</span>
that was distributed
Modified: lucene/dev/branches/solr2452/lucene/docs/fileformats.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/fileformats.pdf?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Files lucene/dev/branches/solr2452/lucene/docs/fileformats.pdf (original) and lucene/dev/branches/solr2452/lucene/docs/fileformats.pdf Wed Jun 1 22:37:09 2011 differ
Modified: lucene/dev/branches/solr2452/lucene/docs/gettingstarted.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/gettingstarted.html?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/gettingstarted.html (original)
+++ lucene/dev/branches/solr2452/lucene/docs/gettingstarted.html Wed Jun 1 22:37:09 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
<div id="menu_1.1.3.4" class="menuitemgroup">
<div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-instantiated/index.html">Instantiated</a>
</div>
<div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-memory/index.html">Memory</a>
</div>
<div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/solr2452/lucene/docs/gettingstarted.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/gettingstarted.pdf?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Files lucene/dev/branches/solr2452/lucene/docs/gettingstarted.pdf (original) and lucene/dev/branches/solr2452/lucene/docs/gettingstarted.pdf Wed Jun 1 22:37:09 2011 differ
Modified: lucene/dev/branches/solr2452/lucene/docs/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/index.html?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/index.html (original)
+++ lucene/dev/branches/solr2452/lucene/docs/index.html Wed Jun 1 22:37:09 2011
@@ -133,15 +133,6 @@ document.write("Last Published: " + docu
<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
<div id="menu_1.1.3.4" class="menuitemgroup">
<div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
@@ -154,9 +145,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-instantiated/index.html">Instantiated</a>
</div>
<div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-memory/index.html">Memory</a>
</div>
<div class="menuitem">
@@ -178,9 +166,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
@@ -241,7 +226,7 @@ document.write("Last Published: " + docu
<h1>Lucene Java Documentation</h1>
<p>
- This is the official documentation for Lucene Java 4.0<BR>
+ This is the official documentation for Lucene Java<BR>
Please use the menu on the left to access the Javadocs and different documents.
</p>
Modified: lucene/dev/branches/solr2452/lucene/docs/index.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/index.pdf?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Files lucene/dev/branches/solr2452/lucene/docs/index.pdf (original) and lucene/dev/branches/solr2452/lucene/docs/index.pdf Wed Jun 1 22:37:09 2011 differ
Modified: lucene/dev/branches/solr2452/lucene/docs/linkmap.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/linkmap.html?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/linkmap.html (original)
+++ lucene/dev/branches/solr2452/lucene/docs/linkmap.html Wed Jun 1 22:37:09 2011
@@ -133,15 +133,6 @@ document.write("Last Published: " + docu
<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
<div id="menu_1.1.3.4" class="menuitemgroup">
<div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
@@ -154,9 +145,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-instantiated/index.html">Instantiated</a>
</div>
<div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-memory/index.html">Memory</a>
</div>
<div class="menuitem">
@@ -178,9 +166,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
@@ -313,24 +298,6 @@ document.write("Last Published: " + docu
<ul>
<li>
-<a href="api/contrib-ant/index.html">Ant</a> ___________________ <em>javadoc-contrib-ant</em>
-</li>
-</ul>
-
-<ul>
-<li>
-<a href="api/contrib-bdb/index.html">Bdb</a> ___________________ <em>javadoc-contrib-bdb</em>
-</li>
-</ul>
-
-<ul>
-<li>
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a> ___________________ <em>javadoc-contrib-bdb-je</em>
-</li>
-</ul>
-
-<ul>
-<li>
<a href="api/contrib-benchmark/index.html">Benchmark</a> ___________________ <em>javadoc-contrib-benchmark</em>
</li>
</ul>
@@ -355,12 +322,6 @@ document.write("Last Published: " + docu
<ul>
<li>
-<a href="api/contrib-lucli/index.html">Lucli</a> ___________________ <em>javadoc-contrib-lucli</em>
-</li>
-</ul>
-
-<ul>
-<li>
<a href="api/contrib-memory/index.html">Memory</a> ___________________ <em>javadoc-contrib-memory</em>
</li>
</ul>
@@ -400,13 +361,7 @@ document.write("Last Published: " + docu
<li>
<a href="api/contrib-spellchecker/index.html">Spellchecker</a> ___________________ <em>javadoc-contrib-spellchecker</em>
</li>
-</ul>
-
-<ul>
-<li>
-<a href="api/contrib-swing/index.html">Swing</a> ___________________ <em>javadoc-contrib-swing</em>
-</li>
-</ul>
+</ul>
<ul>
<li>
Modified: lucene/dev/branches/solr2452/lucene/docs/linkmap.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/linkmap.pdf?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Files lucene/dev/branches/solr2452/lucene/docs/linkmap.pdf (original) and lucene/dev/branches/solr2452/lucene/docs/linkmap.pdf Wed Jun 1 22:37:09 2011 differ
Modified: lucene/dev/branches/solr2452/lucene/docs/lucene-contrib/index.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/lucene-contrib/index.html?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/lucene-contrib/index.html (original)
+++ lucene/dev/branches/solr2452/lucene/docs/lucene-contrib/index.html Wed Jun 1 22:37:09 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
<div onclick="SwitchMenu('menu_1.1.3.4', '../skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
<div id="menu_1.1.3.4" class="menuitemgroup">
<div class="menuitem">
-<a href="../api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="../api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="../api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
<a href="../api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
<a href="../api/contrib-instantiated/index.html">Instantiated</a>
</div>
<div class="menuitem">
-<a href="../api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
<a href="../api/contrib-memory/index.html">Memory</a>
</div>
<div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
<a href="../api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="../api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
<a href="../api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
@@ -249,27 +234,18 @@ document.write("Last Published: " + docu
<a href="#Contrib">Lucene Contrib</a>
<ul class="minitoc">
<li>
-<a href="#ant">ant</a>
-</li>
-<li>
<a href="#benchmark">benchmark</a>
</li>
<li>
<a href="#demo">demo</a>
</li>
<li>
-<a href="#db">db</a>
-</li>
-<li>
<a href="#highlighter">highlighter</a>
</li>
<li>
<a href="#instantiated">instantiated</a>
</li>
<li>
-<a href="#lucli">lucli</a>
-</li>
-<li>
<a href="#memory">memory</a>
</li>
<li>
@@ -291,9 +267,6 @@ document.write("Last Published: " + docu
<a href="#spellchecker">spellchecker</a>
</li>
<li>
-<a href="#swing">swing</a>
-</li>
-<li>
<a href="#wordnet">wordnet</a>
</li>
<li>
@@ -350,88 +323,68 @@ document.write("Last Published: " + docu
You can access the current trunk Contrib repository at
<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>
-<a name="N10035"></a><a name="ant"></a>
-<h3 class="boxed">ant</h3>
-<p>Ant task to create Lucene indexes.</p>
-<p>See <a href="../api/contrib-ant/index.html">ant javadoc</a>
-</p>
-<a name="N10044"></a><a name="benchmark"></a>
+<a name="N10035"></a><a name="benchmark"></a>
<h3 class="boxed">benchmark</h3>
<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>
-<a name="N10053"></a><a name="demo"></a>
+<a name="N10044"></a><a name="demo"></a>
<h3 class="boxed">demo</h3>
<p>The demo contrib contains the Lucene demo: IndexFiles and SearchFiles, described under
<a href="../gettingstarted.html">Getting Started</a>.</p>
<p>See <a href="../api/contrib-demo/index.html">demo javadoc</a>
</p>
-<a name="N10066"></a><a name="db"></a>
-<h3 class="boxed">db</h3>
-<p>Provides integration with Berkley DB.</p>
-<p>See <a href="../api/contrib-db/index.html">db javadoc</a>
-</p>
-<a name="N10075"></a><a name="highlighter"></a>
+<a name="N10057"></a><a name="highlighter"></a>
<h3 class="boxed">highlighter</h3>
<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>
-<a name="N10084"></a><a name="instantiated"></a>
+<a name="N10066"></a><a name="instantiated"></a>
<h3 class="boxed">instantiated</h3>
<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>
-<a name="N10093"></a><a name="lucli"></a>
-<h3 class="boxed">lucli</h3>
-<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>
-<a name="N100A2"></a><a name="memory"></a>
+<a name="N10075"></a><a name="memory"></a>
<h3 class="boxed">memory</h3>
<p>High-performance single-document main memory index.</p>
<p>See <a href="../api/contrib-memory/index.html">memory javadoc</a>
</p>
-<a name="N100B1"></a><a name="misc"></a>
+<a name="N10084"></a><a name="misc"></a>
<h3 class="boxed">misc</h3>
<p>A variety of miscellaneous files, including QueryParsers, and other alternate Lucene class implementations and tools.</p>
<p>See <a href="../api/contrib-misc/index.html">misc javadoc</a>
</p>
-<a name="N100C0"></a><a name="queryparser"></a>
+<a name="N10093"></a><a name="queryparser"></a>
<h3 class="boxed">queryparser</h3>
<p>A new Lucene query parser implementation, which matches the syntax of the core QueryParser but offers a more modular architecture to enable customization.</p>
<p>See <a href="../api/contrib-queryparser/index.html">queryparser javadoc</a>
</p>
-<a name="N100CF"></a><a name="queries"></a>
+<a name="N100A2"></a><a name="queries"></a>
<h3 class="boxed">queries</h3>
<p>Additional queries for Lucene.</p>
<p>See <a href="../api/contrib-queries/index.html">queries javadoc</a>
</p>
-<a name="N100DE"></a><a name="remote"></a>
+<a name="N100B1"></a><a name="remote"></a>
<h3 class="boxed">remote</h3>
<p>Classes to help use Lucene with RMI.</p>
<p>See <a href="../api/contrib-remote/index.html">remote javadoc</a>
</p>
-<a name="N100ED"></a><a name="spatial"></a>
+<a name="N100C0"></a><a name="spatial"></a>
<h3 class="boxed">spatial</h3>
<p>Classes to help with efficient distance based sorting.</p>
<p>See <a href="../api/contrib-spatial/index.html">spatial javadoc</a>
</p>
-<a name="N100FC"></a><a name="spellchecker"></a>
+<a name="N100CF"></a><a name="spellchecker"></a>
<h3 class="boxed">spellchecker</h3>
<p>Provides tools for spellchecking and suggestions with Lucene.</p>
<p>See <a href="../api/contrib-spellchecker/index.html">spellchecker javadoc</a>
</p>
-<a name="N1010B"></a><a name="swing"></a>
-<h3 class="boxed">swing</h3>
-<p>Swing components designed to integrate with Lucene.</p>
-<p>See <a href="../api/contrib-swing/index.html">swing javadoc</a>
-</p>
-<a name="N1011A"></a><a name="wordnet"></a>
+<a name="N100DE"></a><a name="wordnet"></a>
<h3 class="boxed">wordnet</h3>
<p>Tools to help utilize wordnet synonyms with Lucene</p>
<p>See <a href="../api/contrib-wordnet/index.html">wordnet javadoc</a>
</p>
-<a name="N10129"></a><a name="xml-query-parser"></a>
+<a name="N100ED"></a><a name="xml-query-parser"></a>
<h3 class="boxed">xml-query-parser</h3>
<p>A QueryParser that can read queries written in an XML format.</p>
<p>See <a href="../api/contrib-wordnet/index.html">xml-query-parser javadoc</a>
Modified: lucene/dev/branches/solr2452/lucene/docs/lucene-contrib/index.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/lucene-contrib/index.pdf?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Files lucene/dev/branches/solr2452/lucene/docs/lucene-contrib/index.pdf (original) and lucene/dev/branches/solr2452/lucene/docs/lucene-contrib/index.pdf Wed Jun 1 22:37:09 2011 differ
Modified: lucene/dev/branches/solr2452/lucene/docs/queryparsersyntax.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/queryparsersyntax.html?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/queryparsersyntax.html (original)
+++ lucene/dev/branches/solr2452/lucene/docs/queryparsersyntax.html Wed Jun 1 22:37:09 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
<div id="menu_1.1.3.4" class="menuitemgroup">
<div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-instantiated/index.html">Instantiated</a>
</div>
<div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-memory/index.html">Memory</a>
</div>
<div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/solr2452/lucene/docs/queryparsersyntax.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/queryparsersyntax.pdf?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Files lucene/dev/branches/solr2452/lucene/docs/queryparsersyntax.pdf (original) and lucene/dev/branches/solr2452/lucene/docs/queryparsersyntax.pdf Wed Jun 1 22:37:09 2011 differ
Modified: lucene/dev/branches/solr2452/lucene/docs/scoring.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/scoring.html?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/scoring.html (original)
+++ lucene/dev/branches/solr2452/lucene/docs/scoring.html Wed Jun 1 22:37:09 2011
@@ -135,15 +135,6 @@ document.write("Last Published: " + docu
<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
<div id="menu_1.1.3.4" class="menuitemgroup">
<div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
@@ -156,9 +147,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-instantiated/index.html">Instantiated</a>
</div>
<div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-memory/index.html">Memory</a>
</div>
<div class="menuitem">
@@ -180,9 +168,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
Modified: lucene/dev/branches/solr2452/lucene/docs/scoring.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/scoring.pdf?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Files lucene/dev/branches/solr2452/lucene/docs/scoring.pdf (original) and lucene/dev/branches/solr2452/lucene/docs/scoring.pdf Wed Jun 1 22:37:09 2011 differ
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/basic.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/basic.css?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/skin/basic.css (original)
+++ lucene/dev/branches/solr2452/lucene/docs/skin/basic.css Wed Jun 1 22:37:09 2011
@@ -163,4 +163,4 @@ p {
.codefrag {
font-family: "Courier New", Courier, monospace;
font-size: 110%;
-}
+}
\ No newline at end of file
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-b-l-15-1body-2menu-3menu.png?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-b-r-15-1body-2menu-3menu.png?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-15-1body-2menu-3menu.png?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/print.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/print.css?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/skin/print.css (original)
+++ lucene/dev/branches/solr2452/lucene/docs/skin/print.css Wed Jun 1 22:37:09 2011
@@ -51,4 +51,4 @@ a:link, a:visited {
acronym {
border: 0;
-}
+}
\ No newline at end of file
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/profile.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/profile.css?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/skin/profile.css (original)
+++ lucene/dev/branches/solr2452/lucene/docs/skin/profile.css Wed Jun 1 22:37:09 2011
@@ -172,4 +172,4 @@ a:hover { color:#6587ff}
}
-
+
\ No newline at end of file
Modified: lucene/dev/branches/solr2452/lucene/docs/skin/screen.css
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/skin/screen.css?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/skin/screen.css (original)
+++ lucene/dev/branches/solr2452/lucene/docs/skin/screen.css Wed Jun 1 22:37:09 2011
@@ -584,4 +584,4 @@ p.instruction {
list-style-image: url('../images/instruction_arrow.png');
list-style-position: outside;
margin-left: 2em;
-}
+}
\ No newline at end of file
Modified: lucene/dev/branches/solr2452/lucene/docs/systemrequirements.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/systemrequirements.html?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/docs/systemrequirements.html (original)
+++ lucene/dev/branches/solr2452/lucene/docs/systemrequirements.html Wed Jun 1 22:37:09 2011
@@ -133,15 +133,6 @@ document.write("Last Published: " + docu
<div onclick="SwitchMenu('menu_1.1.3.4', 'skin/')" id="menu_1.1.3.4Title" class="menutitle">Contrib</div>
<div id="menu_1.1.3.4" class="menuitemgroup">
<div class="menuitem">
-<a href="api/contrib-ant/index.html">Ant</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb/index.html">Bdb</a>
-</div>
-<div class="menuitem">
-<a href="api/contrib-bdb-je/index.html">Bdb-je</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-benchmark/index.html">Benchmark</a>
</div>
<div class="menuitem">
@@ -154,9 +145,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-instantiated/index.html">Instantiated</a>
</div>
<div class="menuitem">
-<a href="api/contrib-lucli/index.html">Lucli</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-memory/index.html">Memory</a>
</div>
<div class="menuitem">
@@ -178,9 +166,6 @@ document.write("Last Published: " + docu
<a href="api/contrib-spellchecker/index.html">Spellchecker</a>
</div>
<div class="menuitem">
-<a href="api/contrib-swing/index.html">Swing</a>
-</div>
-<div class="menuitem">
<a href="api/contrib-wordnet/index.html">Wordnet</a>
</div>
<div class="menuitem">
@@ -252,7 +237,7 @@ document.write("Last Published: " + docu
<h2 class="boxed">System Requirements</h2>
<div class="section">
<p>
- Lucene Java 4.0 has the following minimum requirements:
+ Lucene Java has the following minimum requirements:
<ul>
<li>Java 1.5.x or greater.</li>
Modified: lucene/dev/branches/solr2452/lucene/docs/systemrequirements.pdf
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/docs/systemrequirements.pdf?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/document/Field.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/document/Field.java?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/document/Field.java (original)
+++ lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/document/Field.java Wed Jun 1 22:37:09 2011
@@ -96,7 +96,7 @@ public final class Field extends Abstrac
},
/** Expert: Index the field's value without an Analyzer,
- * and also disable the storing of norms. Note that you
+ * and also disable the indexing of norms. Note that you
* can also separately enable/disable norms by calling
* {@link Field#setOmitNorms}. No norms means that
* index-time field and document boosting and field
@@ -104,11 +104,11 @@ public final class Field extends Abstrac
* less memory usage as norms take up one byte of RAM
* per indexed field for every document in the index,
* during searching. Note that once you index a given
- * field <i>with</i> norms enabled, disabling norms will
+ * field <i>with</i> norms disabled, enabling norms will
* have no effect. In other words, for this to have the
- * above described effect on a field, all instances of
+ * above described effect on a field, one instance of
* that field must be indexed with NOT_ANALYZED_NO_NORMS
- * from the beginning. */
+ * at some point. */
NOT_ANALYZED_NO_NORMS {
@Override
public boolean isIndexed() { return true; }
Modified: lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/IndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/IndexReader.java?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/IndexReader.java (original)
+++ lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/index/IndexReader.java Wed Jun 1 22:37:09 2011
@@ -1025,8 +1025,8 @@ public abstract class IndexReader implem
* length normalization}. Thus, to preserve the length normalization
* values when resetting this, one should base the new value upon the old.
*
- * <b>NOTE:</b> If this field does not store norms, then
- * this method call will silently do nothing.
+ * <b>NOTE:</b> If this field does not index norms, then
+ * this method throws {@link IllegalStateException}.
*
* @see #norms(String)
* @see Similarity#decodeNormValue(byte)
@@ -1037,6 +1037,7 @@ public abstract class IndexReader implem
* has this index open (<code>write.lock</code> could not
* be obtained)
* @throws IOException if there is a low-level IO error
+ * @throws IllegalStateException if the field does not index norms
*/
public synchronized void setNorm(int doc, String field, byte value)
throws StaleReaderException, CorruptIndexException, LockObtainFailedException, IOException {
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=1130331&r1=1130330&r2=1130331&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 Wed Jun 1 22:37:09 2011
@@ -566,8 +566,10 @@ public class SegmentReader extends Index
protected void doSetNorm(int doc, String field, byte value)
throws IOException {
SegmentNorms norm = norms.get(field);
- if (norm == null) // not an indexed field
- return;
+ if (norm == null) {
+ // field does not store norms
+ throw new IllegalStateException("Cannot setNorm for field " + field + ": norms were omitted");
+ }
normsDirty = true;
norm.copyOnWrite()[doc] = value; // set the value
Modified: lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/util/Version.java?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/util/Version.java (original)
+++ lucene/dev/branches/solr2452/lucene/src/java/org/apache/lucene/util/Version.java Wed Jun 1 22:37:09 2011
@@ -27,6 +27,9 @@ package org.apache.lucene.util;
* change the version at search-time, but instead also adjust
* your indexing code to match, and re-index.
*/
+// remove me when java 5 is no longer supported
+// this is a workaround for a JDK bug that wrongly emits a warning.
+@SuppressWarnings("dep-ann")
public enum Version {
/**
* Match settings and bugs in Lucene's 3.0 release.
Modified: lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/fileformats.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/fileformats.xml?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/fileformats.xml (original)
+++ lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/fileformats.xml Wed Jun 1 22:37:09 2011
@@ -12,7 +12,7 @@
<p>
This document defines the index file formats used
- in Lucene version 4.0. If you are using a different
+ in this version of Lucene. If you are using a different
version of Lucene, please consult the copy of
<code>docs/fileformats.html</code>
that was distributed
Modified: lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/index.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/index.xml?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/index.xml (original)
+++ lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/index.xml Wed Jun 1 22:37:09 2011
@@ -6,7 +6,7 @@
<body>
<p>
- This is the official documentation for Lucene Java 4.0<BR/>
+ This is the official documentation for Lucene Java<BR/>
Please use the menu on the left to access the Javadocs and different documents.
</p>
<p>
Modified: lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml (original)
+++ lucene/dev/branches/solr2452/lucene/src/site/src/documentation/content/xdocs/systemrequirements.xml Wed Jun 1 22:37:09 2011
@@ -11,7 +11,7 @@
</section> -->
<section id="System Requirements"><title>System Requirements</title>
<p>
- Lucene Java 4.0 has the following minimum requirements:
+ Lucene Java has the following minimum requirements:
<ul>
<li>Java 1.5.x or greater.</li>
<li>ANT 1.7.0 or greater.</li>
Modified: lucene/dev/branches/solr2452/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/solr2452/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java Wed Jun 1 22:37:09 2011
@@ -221,7 +221,7 @@ public abstract class LuceneTestCase ext
private static TimeZone timeZone;
private static TimeZone savedTimeZone;
- private static Map<MockDirectoryWrapper,StackTraceElement[]> stores;
+ protected static Map<MockDirectoryWrapper,StackTraceElement[]> stores;
private static final String[] TEST_CODECS = new String[] {"MockSep", "MockFixedIntBlock", "MockVariableIntBlock", "MockRandom"};
@@ -341,6 +341,14 @@ public abstract class LuceneTestCase ext
random.setSeed(staticSeed);
tempDirs.clear();
stores = Collections.synchronizedMap(new IdentityHashMap<MockDirectoryWrapper,StackTraceElement[]>());
+
+ // enable this by default, for IDE consistency with ant tests (as its the default from ant)
+ // TODO: really should be in solr base classes, but some extend LTC directly.
+ // we do this in beforeClass, because some tests currently disable it
+ if (System.getProperty("solr.directoryFactory") == null) {
+ System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockDirectoryFactory");
+ }
+
savedCodecProvider = CodecProvider.getDefault();
if ("random".equals(TEST_CODECPROVIDER)) {
if ("randomPerField".equals(TEST_CODEC)) {
Modified: lucene/dev/branches/solr2452/modules/analysis/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/modules/analysis/CHANGES.txt?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/modules/analysis/CHANGES.txt (original)
+++ lucene/dev/branches/solr2452/modules/analysis/CHANGES.txt Wed Jun 1 22:37:09 2011
@@ -1,5 +1,8 @@
Analysis Module Change Log
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
======================= Trunk (not yet released) =======================
API Changes
Modified: lucene/dev/branches/solr2452/modules/analysis/LICENSE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/modules/analysis/LICENSE.txt?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/modules/analysis/LICENSE.txt (original)
+++ lucene/dev/branches/solr2452/modules/analysis/LICENSE.txt Wed Jun 1 22:37:09 2011
@@ -200,3 +200,32 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
+
+The following license applies to the Snowball stemmers:
+
+Copyright (c) 2001, Dr Martin Porter
+Copyright (c) 2002, Richard Boulton
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the copyright holders nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: lucene/dev/branches/solr2452/modules/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/modules/analysis/build.xml?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/modules/analysis/build.xml (original)
+++ lucene/dev/branches/solr2452/modules/analysis/build.xml Wed Jun 1 22:37:09 2011
@@ -57,6 +57,13 @@
<ant dir="smartcn" target="clean" />
<ant dir="stempel" target="clean" />
</target>
+ <target name="validate">
+ <ant dir="common" target="validate" />
+ <ant dir="icu" target="validate" />
+ <ant dir="phonetic" target="validate" />
+ <ant dir="smartcn" target="validate" />
+ <ant dir="stempel" target="validate" />
+ </target>
<target name="compile-core">
<ant dir="common" target="compile-core" />
<ant dir="icu" target="compile-core" />
Modified: lucene/dev/branches/solr2452/modules/analysis/common/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/modules/analysis/common/build.xml?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/modules/analysis/common/build.xml (original)
+++ lucene/dev/branches/solr2452/modules/analysis/common/build.xml Wed Jun 1 22:37:09 2011
@@ -106,7 +106,7 @@
</java>
</target>
- <target name="compile-tools">
+ <target name="compile-tools" depends="common.compile-tools">
<compile
srcdir="src/tools/java"
destdir="${build.dir}/classes/tools">
Modified: lucene/dev/branches/solr2452/modules/analysis/icu/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/modules/analysis/icu/build.xml?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/modules/analysis/icu/build.xml (original)
+++ lucene/dev/branches/solr2452/modules/analysis/icu/build.xml Wed Jun 1 22:37:09 2011
@@ -125,7 +125,7 @@ are part of the ICU4C package. See http:
</java>
</target>
- <target name="compile-tools">
+ <target name="compile-tools" depends="common.compile-tools">
<compile
srcdir="src/tools/java"
destdir="${build.dir}/classes/tools">
Modified: lucene/dev/branches/solr2452/modules/benchmark/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/modules/benchmark/CHANGES.txt?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/modules/benchmark/CHANGES.txt (original)
+++ lucene/dev/branches/solr2452/modules/benchmark/CHANGES.txt Wed Jun 1 22:37:09 2011
@@ -2,6 +2,9 @@ Lucene Benchmark Contrib Change Log
The Benchmark contrib package contains code for benchmarking Lucene in a variety of ways.
+For more information on past and future Lucene versions, please see:
+http://s.apache.org/luceneversions
+
05/25/2011
LUCENE-3137: ExtractReuters supports out-dir param suffixed by a slash. (Doron Cohen)
Modified: lucene/dev/branches/solr2452/modules/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/modules/build.xml?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/modules/build.xml (original)
+++ lucene/dev/branches/solr2452/modules/build.xml Wed Jun 1 22:37:09 2011
@@ -18,7 +18,6 @@
-->
<project name="modules" default="test" basedir=".">
- <import file="../common-build.xml"/>
<target name="test" description="Test all modules">
<sequential>
<subant target="test" inheritall="false" failonerror="true">
@@ -30,7 +29,7 @@
</sequential>
</target>
- <target name="compile" description="Compile all modules" depends="validate-modules">
+ <target name="compile" description="Compile all modules" depends="validate">
<sequential>
<subant target="compile" inheritall="false" failonerror="true">
<fileset dir="analysis" includes="build.xml" />
@@ -74,24 +73,15 @@
</subant>
</sequential>
</target>
- <target name="validate" depends="validate-modules"/>
- <target name="validate-modules" depends="check-legal-modules" unless="validated-modules"/>
- <target name="check-legal-modules" depends="compile-tools">
- <java classname="org.apache.lucene.validation.DependencyChecker" failonerror="true" fork="true">
- <classpath>
- <path refid="tools.runtime.classpath" />
- </classpath>
- <!-- TODO: it might be better to just automatically find all directories that contain jar files, but that could take a
- long time. This should be faster, but we could miss a directory
- -->
- <!-- Modules -->
- <arg value="-c" />
- <arg value="${basedir}/analysis/icu/lib" />
- <arg value="-c" />
- <arg value="${basedir}/analysis/phonetic/lib" />
- <arg value="-c" />
- <arg value="${basedir}/benchmark/lib" />
- </java>
+ <target name="validate">
+ <sequential>
+ <subant target="validate" inheritall="false" failonerror="true">
+ <fileset dir="analysis" includes="build.xml" />
+ <fileset dir="benchmark" includes="build.xml" />
+ <fileset dir="grouping" includes="build.xml" />
+ <fileset dir="suggest" includes="build.xml" />
+ </subant>
+ </sequential>
</target>
<target name="clean" description="Clean all modules">
Modified: lucene/dev/branches/solr2452/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/solr/CHANGES.txt?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/solr/CHANGES.txt (original)
+++ lucene/dev/branches/solr2452/solr/CHANGES.txt Wed Jun 1 22:37:09 2011
@@ -24,7 +24,6 @@ $Id$
================== 4.0.0-dev ==================
Versions of Major Components
---------------------
-Apache Lucene trunk
Apache Tika 0.8
Carrot2 3.5.0
Velocity 1.6.4 and Velocity Tools 2.0
@@ -1830,7 +1829,7 @@ Documentation
3. SOLR-1409: Added Solr Powered By Logos
-================== Release 1.3.0 20080915 ==================
+================== Release 1.3.0 ==================
Upgrading from Solr 1.2
-----------------------
@@ -2491,7 +2490,7 @@ Build
client and contrib. The target can publish artifacts with source and javadocs.
(Spencer Crissman, Craig McClanahan, shalin)
-================== Release 1.2, 20070602 ==================
+================== Release 1.2 ==================
Upgrading from Solr 1.1
-------------------------------------
@@ -2840,7 +2839,7 @@ Other Changes
2. Updated to Lucene 2007-05-20_00-04-53
-================== Release 1.1.0, 20061222 ==================
+================== Release 1.1.0 ==================
Status
------
Modified: lucene/dev/branches/solr2452/solr/LICENSE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/solr/LICENSE.txt?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/solr/LICENSE.txt (original)
+++ lucene/dev/branches/solr2452/solr/LICENSE.txt Wed Jun 1 22:37:09 2011
@@ -1067,3 +1067,32 @@ Definitions.
10. RESPONSIBILITY FOR CLAIMS. As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) The code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California.
+
+The following license applies to the Snowball stemmers:
+
+Copyright (c) 2001, Dr Martin Porter
+Copyright (c) 2002, Richard Boulton
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * Neither the name of the copyright holders nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: lucene/dev/branches/solr2452/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr2452/solr/build.xml?rev=1130331&r1=1130330&r2=1130331&view=diff
==============================================================================
--- lucene/dev/branches/solr2452/solr/build.xml (original)
+++ lucene/dev/branches/solr2452/solr/build.xml Wed Jun 1 22:37:09 2011
@@ -35,7 +35,7 @@
<target name="compile" description="Compile the source code."
depends="compile-core, build-contrib"/>
<target name="test" description="Validate, then run core and contrib unit tests."
- depends="validate-solr, common.test, test-contrib"/>
+ depends="validate-solr, common-solr.test, test-contrib"/>
<target name="test-core" description="Runs the core unit tests."
depends="common.test"/>
<target name="compile-test" description="Compile unit tests."