You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/05/23 02:20:35 UTC
svn commit: r1126281 - in /lucene/dev/branches/branch_3x: ./
dev-tools/eclipse/ lucene/ lucene/backwards/ lucene/contrib/
lucene/contrib/ant/ lucene/contrib/db/ lucene/contrib/lucli/
lucene/contrib/swing/ lucene/src/site/src/documentation/content/xdocs...
Author: rmuir
Date: Mon May 23 00:20:35 2011
New Revision: 1126281
URL: http://svn.apache.org/viewvc?rev=1126281&view=rev
Log:
LUCENE-2981: review/remove unused/unsupported contribs
Removed:
lucene/dev/branches/branch_3x/lucene/contrib/ant/
lucene/dev/branches/branch_3x/lucene/contrib/db/
lucene/dev/branches/branch_3x/lucene/contrib/lucli/
lucene/dev/branches/branch_3x/lucene/contrib/swing/
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/build.xml
lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/lucene/build.xml
lucene/dev/branches/branch_3x/lucene/common-build.xml
lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/site.xml
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/build.xml?rev=1126281&r1=1126280&r2=1126281&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/build.xml (original)
+++ lucene/dev/branches/branch_3x/build.xml Mon May 23 00:20:35 2011
@@ -75,14 +75,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
</echo>
@@ -92,14 +84,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/branch_3x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath?rev=1126281&r1=1126280&r2=1126281&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath Mon May 23 00:20:35 2011
@@ -12,15 +12,8 @@
<classpathentry kind="src" path="lucene/contrib/analyzers/stempel/src/java"/>
<classpathentry kind="src" path="lucene/contrib/analyzers/stempel/src/resources"/>
<classpathentry kind="src" path="lucene/contrib/analyzers/stempel/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/benchmark/src/java"/>
<classpathentry kind="src" path="lucene/contrib/benchmark/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/grouping/src/java"/>
@@ -32,8 +25,6 @@
<classpathentry kind="src" path="lucene/contrib/icu/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"/>
@@ -49,8 +40,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,17 +73,13 @@
<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/benchmark/lib/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib" path="lucene/contrib/benchmark/lib/commons-collections-3.1.jar"/>
<classpathentry kind="lib" path="lucene/contrib/benchmark/lib/commons-compress-1.1.jar"/>
<classpathentry kind="lib" path="lucene/contrib/benchmark/lib/commons-digester-1.7.jar"/>
<classpathentry kind="lib" path="lucene/contrib/benchmark/lib/commons-logging-1.0.4.jar"/>
<classpathentry kind="lib" path="lucene/contrib/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.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/icu/lib/icu4j-4_6.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="solr/lib/apache-solr-noggit-r1099557.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-beanutils-1.7.0.jar"/>
Modified: lucene/dev/branches/branch_3x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/build.xml?rev=1126281&r1=1126280&r2=1126281&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/build.xml Mon May 23 00:20:35 2011
@@ -230,23 +230,18 @@
<packageset dir="contrib/analyzers/common/src/java"/>
<packageset dir="contrib/analyzers/smartcn/src/java"/>
<packageset dir="contrib/analyzers/stempel/src/java"/>
- <packageset dir="contrib/ant/src/java"/>
<packageset dir="contrib/benchmark/src/java"/>
<packageset dir="contrib/demo/src/java"/>
<packageset dir="contrib/grouping/src/java"/>
<packageset dir="contrib/icu/src/java"/>
- <packageset dir="contrib/db/bdb-je/src/java"/>
- <packageset dir="contrib/db/bdb/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/remote/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"/>
@@ -259,22 +254,18 @@
<group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*:org.apache.lucene.analysis.tokenattributes*"/>
<group title="contrib: Analysis" packages="org.apache.lucene.analysis.*:org.tartarus.snowball*:org.egothor.stemmer*"/>
- <group title="contrib: Ant" packages="org.apache.lucene.ant*"/>
<group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
<group title="contrib: ICU" packages="org.apache.lucene.collation*"/>
<group title="contrib: Demo" packages="org.apache.lucene.demo*"/>
- <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
<group title="contrib: Grouping" packages="org.apache.lucene.search.grouping*"/>
<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/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1126281&r1=1126280&r2=1126281&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Mon May 23 00:20:35 2011
@@ -852,13 +852,6 @@
<arg value="-c" />
<arg value="${common.dir}/lib" />
<arg value="-c" />
- <arg value="${common.dir}/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="${common.dir}/contrib/benchmark/lib" />
<arg value="-c" />
<arg value="${common.dir}/contrib/icu/lib" />
Modified: lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt?rev=1126281&r1=1126280&r2=1126281&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt Mon May 23 00:20:35 2011
@@ -2,6 +2,10 @@ Lucene contrib change Log
======================= 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/branch_3x/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml?rev=1126281&r1=1126280&r2=1126281&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml Mon May 23 00:20:35 2011
@@ -55,11 +55,6 @@
<p>See <a href="../api/contrib-analyzers/index.html">analyzers javadoc</a></p>
</section>
- <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>
@@ -71,11 +66,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="grouping"><title>grouping</title>
<p>Groups search results according to a specified field</p>
<p>See <a href="../api/contrib-grouping/index.html">grouping javadoc</a></p>
@@ -96,11 +86,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>
@@ -137,11 +122,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/branch_3x/lucene/src/site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/site.xml?rev=1126281&r1=1126280&r2=1126281&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/site.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/src/site/src/documentation/content/xdocs/site.xml Mon May 23 00:20:35 2011
@@ -55,16 +55,12 @@ See http://forrest.apache.org/docs/linki
<javadoc-contrib-analyzers label="Analyzers" href="ext:javadocs-contrib-analyzers"/>
<javadoc-contrib-smartcn label="Smart Chinese Analyzer" href="ext:javadocs-contrib-smartcn"/>
<javadoc-contrib-stempel label="Stempel Polish Analyzer" href="ext:javadocs-contrib-stempel"/>
- <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-grouping label="Grouping" href="ext:javadocs-contrib-grouping"/>
<javadoc-contrib-highlighter label="Highlighter" href="ext:javadocs-contrib-highlighter"/>
<javadoc-contrib-icu label="ICU" href="ext:javadocs-contrib-icu"/>
<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"/>
@@ -74,8 +70,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>
@@ -105,19 +100,21 @@ 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"/>
+<<<<<<< .working
<javadocs-contrib-analyzers href="api/contrib-analyzers/index.html"/>
<javadocs-contrib-smartcn href="api/contrib-smartcn/index.html"/>
<javadocs-contrib-stempel href="api/contrib-stempel/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"/>
+=======
+>>>>>>> .merge-right.r1126280
<javadocs-contrib-benchmark href="api/contrib-benchmark/index.html"/>
<javadocs-contrib-demo href="api/contrib-demo/index.html"/>
<javadocs-contrib-grouping href="api/contrib-grouping/index.html"/>
<javadocs-contrib-highlighter href="api/contrib-highlighter/index.html"/>
<javadocs-contrib-icu href="api/contrib-icu/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"/>
@@ -126,7 +123,6 @@ See http://forrest.apache.org/docs/linki
<javadocs-contrib-similarity href="api/contrib-similarity/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"/>