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/02/19 05:49:39 UTC
svn commit: r1072250 [1/6] - in /lucene/dev/trunk:
dev-tools/idea/lucene/contrib/demo/ dev-tools/idea/modules/benchmark/
dev-tools/maven/lucene/contrib/demo/ dev-tools/maven/modules/benchmark/
lucene/ lucene/contrib/demo/ lucene/contrib/demo/src/java/ ...
Author: sarowe
Date: Sat Feb 19 04:49:36 2011
New Revision: 1072250
URL: http://svn.apache.org/viewvc?rev=1072250&view=rev
Log:
LUCENE-2923: Cleanup contrib/demo
Added:
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.0.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.1.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache2.0.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/cpl1.0.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/epl1.0.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/freebsd.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/gpl1.0.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/gpl2.0.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/gpl3.0.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/lgpl2.1.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/lgpl3.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/lpgl2.0.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mit.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mozilla1.1.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mozilla_eula_firefox3.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/mozilla_eula_thunderbird2.txt
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/
- copied from r1071687, lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/html/
lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/demohtml/
- copied from r1071687, lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/html/
Removed:
lucene/dev/trunk/lucene/contrib/demo/src/java/demo-build.template
lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/DeleteFiles.java
lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/FileDocument.java
lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/HTMLDocument.java
lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexHTML.java
lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/html/
lucene/dev/trunk/lucene/contrib/demo/src/jsp/
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/html/
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/html/
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/queries.txt
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/queries2.txt
lucene/dev/trunk/lucene/docs/demo3.html
lucene/dev/trunk/lucene/docs/demo3.pdf
lucene/dev/trunk/lucene/docs/demo4.html
lucene/dev/trunk/lucene/docs/demo4.pdf
lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/demo3.xml
lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/demo4.xml
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/Test.java
Modified:
lucene/dev/trunk/dev-tools/idea/lucene/contrib/demo/demo.iml
lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml
lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template
lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template
lucene/dev/trunk/lucene/build.xml
lucene/dev/trunk/lucene/contrib/demo/build.xml
lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/TestDemo.java
lucene/dev/trunk/lucene/docs/contributions.html
lucene/dev/trunk/lucene/docs/demo.html
lucene/dev/trunk/lucene/docs/demo.pdf
lucene/dev/trunk/lucene/docs/demo2.html
lucene/dev/trunk/lucene/docs/demo2.pdf
lucene/dev/trunk/lucene/docs/fileformats.html
lucene/dev/trunk/lucene/docs/gettingstarted.html
lucene/dev/trunk/lucene/docs/gettingstarted.pdf
lucene/dev/trunk/lucene/docs/index.html
lucene/dev/trunk/lucene/docs/linkmap.html
lucene/dev/trunk/lucene/docs/linkmap.pdf
lucene/dev/trunk/lucene/docs/lucene-contrib/index.html
lucene/dev/trunk/lucene/docs/lucene-contrib/index.pdf
lucene/dev/trunk/lucene/docs/queryparsersyntax.html
lucene/dev/trunk/lucene/docs/scoring.html
lucene/dev/trunk/lucene/docs/systemrequirements.html
lucene/dev/trunk/lucene/src/java/overview.html
lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/demo.xml
lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/demo2.xml
lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/gettingstarted.xml
lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
lucene/dev/trunk/lucene/src/site/src/documentation/content/xdocs/site.xml
lucene/dev/trunk/modules/benchmark/build.xml
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/Entities.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParser.jj
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParserConstants.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/HTMLParserTokenManager.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/ParseException.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/ParserThread.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/SimpleCharStream.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/Tags.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/Token.java
lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/demohtml/TokenMgrError.java
lucene/dev/trunk/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/demohtml/TestHtmlParser.java
Modified: lucene/dev/trunk/dev-tools/idea/lucene/contrib/demo/demo.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/lucene/contrib/demo/demo.iml?rev=1072250&r1=1072249&r2=1072250&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/lucene/contrib/demo/demo.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/lucene/contrib/demo/demo.iml Sat Feb 19 04:49:36 2011
@@ -6,13 +6,10 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/jsp" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
<orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="lucene" />
- <orderEntry type="module" module-name="queries" />
- <orderEntry type="module" module-name="misc" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
Modified: lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml?rev=1072250&r1=1072249&r2=1072250&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml (original)
+++ lucene/dev/trunk/dev-tools/idea/modules/benchmark/benchmark.iml Sat Feb 19 04:49:36 2011
@@ -17,7 +17,6 @@
<orderEntry type="module" module-name="queries" />
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="memory" />
- <orderEntry type="module" module-name="demo" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
Modified: lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template?rev=1072250&r1=1072249&r2=1072250&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/lucene/contrib/demo/pom.xml.template Sat Feb 19 04:49:36 2011
@@ -28,8 +28,8 @@
</parent>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-demo</artifactId>
- <packaging>war</packaging>
- <name>Lucene Demos</name>
+ <packaging>jar</packaging>
+ <name>Lucene Demo</name>
<description>This is the demo for Apache Lucene Java</description>
<properties>
<module-directory>lucene/contrib/demo</module-directory>
@@ -54,11 +54,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -80,15 +75,6 @@
</testResources>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <warSourceDirectory>src/jsp</warSourceDirectory>
- <attachClasses>true</attachClasses>
- <classesClassifier/>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>appassembler-maven-plugin</artifactId>
<configuration>
@@ -101,18 +87,10 @@
</platforms>
<programs>
<program>
- <mainClass>org.apache.lucene.demo.DeleteFiles</mainClass>
- <name>DeleteFiles</name>
- </program>
- <program>
<mainClass>org.apache.lucene.demo.IndexFiles</mainClass>
<name>IndexFiles</name>
</program>
<program>
- <mainClass>org.apache.lucene.demo.IndexHTML</mainClass>
- <name>IndexHTML</name>
- </program>
- <program>
<mainClass>org.apache.lucene.demo.SearchFiles</mainClass>
<name>SearchFiles</name>
</program>
Modified: lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template?rev=1072250&r1=1072249&r2=1072250&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/modules/benchmark/pom.xml.template Sat Feb 19 04:49:36 2011
@@ -55,12 +55,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-demo</artifactId>
- <version>${project.version}</version>
- <classifier>classes</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>lucene-highlighter</artifactId>
<version>${project.version}</version>
</dependency>
Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1072250&r1=1072249&r2=1072250&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Sat Feb 19 04:49:36 2011
@@ -497,9 +497,6 @@
<fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
- <fileset dir="contrib/demo/src/java/org/apache/lucene/demo/html" includes="*.java">
- <containsregexp expression="Generated.*By.*JavaCC"/>
- </fileset>
</delete>
</target>
Modified: lucene/dev/trunk/lucene/contrib/demo/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/build.xml?rev=1072250&r1=1072249&r2=1072250&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/demo/build.xml Sat Feb 19 04:49:36 2011
@@ -17,81 +17,40 @@
limitations under the License.
-->
-<project name="demo" default="default" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="demo" default="jar-core" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<description>
Lucene Demo
</description>
- <property name="build.demo.template" value="src/java/demo-build.template"/>
-
<property name="demo.name" value="lucene-demos-${version}"/>
- <property name="demo.war.name" value="luceneweb"/>
<import file="../contrib-build.xml"/>
<module-uptodate name="analysis/common" jarfile="${common.dir}/../modules/analysis/build/common/lucene-analyzers-common-${version}.jar"
property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
-
+
+ <property name="lucene.jar" value="${common.dir}/build/lucene-core-${version}.jar"/>
+ <target name="lucene-jar-uptodate" unless="lucene.jar.uptodate">
+ <uptodate property="lucene.jar.uptodate" targetfile="${lucene.jar}">
+ <srcfiles dir="${common.dir}/src/java" includes="**/*.java"/>
+ </uptodate>
+ </target>
+ <target name="jar-lucene" depends="build-lucene" unless="lucene.jar.uptodate">
+ <ant dir="${common.dir}" target="jar-core" inheritAll="false"/>
+ </target>
+ <target name="init" depends="contrib-build.init,lucene-jar-uptodate,jar-lucene"/>
+
<path id="classpath">
<pathelement path="${analyzers-common.jar}"/>
- <path refid="base.classpath"/>
+ <pathelement path="${lucene.jar}"/>
</path>
- <target name="compile-core" depends="compile-analyzers-common, common.compile-core, war-demo" />
+ <target name="compile-core" depends="jar-analyzers-common,common.compile-core" />
- <target name="compile-analyzers-common" unless="analyzers-common.uptodate">
- <subant target="default">
+ <target name="jar-analyzers-common" unless="analyzers-common.uptodate">
+ <subant target="jar-core">
<fileset dir="${common.dir}/../modules/analysis/common" includes="build.xml"/>
</subant>
</target>
-
- <target name="war-demo">
- <sequential>
- <build-manifest title="Lucene Search Engine: demos"/>
- <war destfile="${build.dir}/${demo.war.name}.war"
- webxml="src/jsp/WEB-INF/web.xml"
- manifest="${manifest.file}">
- <fileset dir="src/jsp" excludes="WEB-INF/web.xml"/>
- <lib dir="${build.dir}/../.." includes="lucene-core-${version}.jar"/>
- <lib dir="${common.dir}/../modules/analysis/build/common" includes="lucene-analyzers-common-${version}.jar"/>
- <lib dir="${build.dir}" includes="${final.name}.jar"/>
- <metainf dir="${common.dir}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </metainf>
- </war>
- </sequential>
- </target>
-
- <target name="clean-javacc">
- <fileset dir="src/java/org/apache/lucene/demo/html" includes="*.java">
- <containsregexp expression="Generated.*By.*JavaCC"/>
- </fileset>
- </target>
-
- <target name="javacc" depends="init,javacc-check" if="javacc.present">
- <invoke-javacc target="src/java/org/apache/lucene/demo/html/HTMLParser.jj"
- outputDir="src/java/org/apache/lucene/demo/html"
- />
- </target>
-
- <target name="dist-maven" if="pom.xml.present" depends="compile-core,jar-src">
- <sequential>
- <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
- <artifact:pom id="maven.project" file="pom.xml"/>
- <artifact:deploy file="${build.dir}/${demo.war.name}.war">
- <attach file="${build.dir}/${maven.project.build.finalName}.jar"
- classifier="classes"/>
- <attach file="${build.dir}/${final.name}-src.jar"
- classifier="sources"/>
- <attach file="${build.dir}/${final.name}-javadoc.jar"
- classifier="javadoc"/>
- <remoteRepository url="${m2.repository.url}">
- <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
- </remoteRepository>
- <pom refid="maven.project"/>
- </artifact:deploy>
- </sequential>
- </target>
</project>
Modified: lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1072250&r1=1072249&r2=1072250&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java Sat Feb 19 04:49:36 2011
@@ -17,39 +17,59 @@ package org.apache.lucene.demo;
* limitations under the License.
*/
+import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.NumericField;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.Version;
+import java.io.BufferedReader;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.Date;
-/** Index all text files under a directory. */
+/** Index all text files under a directory. See http://lucene.apache.org/java/4_0/demo.html. */
public class IndexFiles {
private IndexFiles() {}
- static final File INDEX_DIR = new File("index");
-
/** Index all text files under a directory. */
public static void main(String[] args) {
- String usage = "java org.apache.lucene.demo.IndexFiles <root_directory>";
- if (args.length == 0) {
- System.err.println("Usage: " + usage);
- System.exit(1);
+ String usage = "java org.apache.lucene.demo.IndexFiles <root_directory>"
+ + " [-index INDEX_PATH] [-docs DOCS_PATH] [-update]\n\n"
+ // TODO: Change the link with every release (or: fill in some less error-prone alternative here...)
+ + "See http://lucene.apache.org/java/4_0/demo.html for details.";
+ String indexPath = "index";
+ String docsPath = null;
+ boolean create = true;
+ for(int i=0;i<args.length;i++) {
+ if ("-index".equals(args[i])) {
+ indexPath = args[i+1];
+ i++;
+ } else if ("-docs".equals(args[i])) {
+ docsPath = args[i+1];
+ i++;
+ } else if ("-update".equals(args[i])) {
+ create = false;
+ }
}
- if (INDEX_DIR.exists()) {
- System.out.println("Cannot save index to '" +INDEX_DIR+ "' directory, please delete it first");
+ if (docsPath == null) {
+ System.err.println("Usage: " + usage);
System.exit(1);
}
-
- final File docDir = new File(args[0]);
+
+ final File docDir = new File(docsPath);
if (!docDir.exists() || !docDir.canRead()) {
System.out.println("Document directory '" +docDir.getAbsolutePath()+ "' does not exist or is not readable, please check the path");
System.exit(1);
@@ -57,13 +77,39 @@ public class IndexFiles {
Date start = new Date();
try {
- IndexWriter writer = new IndexWriter(FSDirectory.open(INDEX_DIR),
- new IndexWriterConfig(Version.LUCENE_CURRENT, new StandardAnalyzer(
- Version.LUCENE_CURRENT)).setOpenMode(OpenMode.CREATE));
- System.out.println("Indexing to directory '" +INDEX_DIR+ "'...");
+ System.out.println("Indexing to directory '" + indexPath + "'...");
+
+ Directory dir = FSDirectory.open(new File(indexPath));
+ Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_40);
+ IndexWriterConfig iwc = new IndexWriterConfig(Version.LUCENE_40, analyzer);
+
+ if (create) {
+ // Create a new index in the directory, removing any
+ // previously indexed documents:
+ iwc.setOpenMode(OpenMode.CREATE);
+ } else {
+ // Add new documents to an existing index:
+ iwc.setOpenMode(OpenMode.CREATE_OR_APPEND);
+ }
+
+ // Optional: for better indexing performance, if you
+ // are indexing many documents, increase the RAM
+ // buffer. But if you do this, increase the max heap
+ // size to the JVM (eg add -Xmx512m or -Xmx1g):
+ //
+ // iwc.setRAMBufferSizeMB(256.0);
+
+ IndexWriter writer = new IndexWriter(dir, iwc);
indexDocs(writer, docDir);
- System.out.println("Optimizing...");
- writer.optimize();
+
+ // NOTE: if you want to maximize search performance,
+ // you can optionally call optimize here. This can be
+ // a costly operation, so generally it's only worth
+ // it when your index is relatively static (ie you're
+ // done adding documents to it):
+ //
+ // writer.optimize();
+
writer.close();
Date end = new Date();
@@ -75,6 +121,21 @@ public class IndexFiles {
}
}
+ /**
+ * Indexes the given file using the given writer, or if a directory is given,
+ * recurses over files and directories found under the given directory.
+ *
+ * NOTE: This method indexes one document per input file. This is slow. For good
+ * throughput, put multiple documents into your input file(s). An example of this is
+ * in the benchmark module, which can create "line doc" files, one document per line,
+ * using the
+ * <a href="../../../../../contrib-benchmark/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.html"
+ * >WriteLineDocTask</a>.
+ *
+ * @param writer Writer to the index where the given file/dir info will be stored
+ * @param file The file to index, or the directory to recurse into to find files to index
+ * @throws IOException
+ */
static void indexDocs(IndexWriter writer, File file)
throws IOException {
// do not try to index files that cannot be read
@@ -88,16 +149,62 @@ public class IndexFiles {
}
}
} else {
- System.out.println("adding " + file);
+
+ FileInputStream fis;
try {
- writer.addDocument(FileDocument.Document(file));
+ fis = new FileInputStream(file);
+ } catch (FileNotFoundException fnfe) {
+ // at least on windows, some temporary files raise this exception with an "access denied" message
+ // checking if the file can be read doesn't help
+ return;
}
- // at least on windows, some temporary files raise this exception with an "access denied" message
- // checking if the file can be read doesn't help
- catch (FileNotFoundException fnfe) {
+
+ try {
+
+ // make a new, empty document
+ Document doc = new Document();
+
+ // Add the path of the file as a field named "path". Use a
+ // field that is indexed (i.e. searchable), but don't tokenize
+ // the field into separate words and don't index term frequency
+ // or positional information:
+ Field pathField = new Field("path", file.getPath(), Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
+ pathField.setOmitTermFreqAndPositions(true);
+ doc.add(pathField);
+
+ // Add the last modified date of the file a field named "modified".
+ // Use a NumericField that is indexed (i.e. efficiently filterable with
+ // NumericRangeFilter). This indexes to milli-second resolution, which
+ // is often too fine. You could instead create a number based on
+ // year/month/day/hour/minutes/seconds, down the resolution you require.
+ // For example the long value 2011021714 would mean
+ // February 17, 2011, 2-3 PM.
+ NumericField modifiedField = new NumericField("modified");
+ modifiedField.setLongValue(file.lastModified());
+ doc.add(modifiedField);
+
+ // Add the contents of the file to a field named "contents". Specify a Reader,
+ // so that the text of the file is tokenized and indexed, but not stored.
+ // Note that FileReader expects the file to be in UTF-8 encoding.
+ // If that's not the case searching for special characters will fail.
+ doc.add(new Field("contents", new BufferedReader(new InputStreamReader(fis, "UTF-8"))));
+
+ if (writer.getConfig().getOpenMode() == OpenMode.CREATE) {
+ // New index, so we just add the document (no old document can be there):
+ System.out.println("adding " + file);
+ writer.addDocument(doc);
+ } else {
+ // Existing index (an old copy of this document may have been indexed) so
+ // we use updateDocument instead to replace the old one matching the exact
+ // path, if present:
+ System.out.println("updating " + file);
+ writer.updateDocument(new Term("path", file.getPath()), doc);
+ }
+
+ } finally {
+ fis.close();
}
}
}
}
-
}
Modified: lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java?rev=1072250&r1=1072249&r2=1072250&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/dev/trunk/lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java Sat Feb 19 04:49:36 2011
@@ -27,7 +27,6 @@ import java.util.Date;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Collector;
@@ -35,7 +34,7 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.Scorer;
-import org.apache.lucene.search.TopScoreDocCollector;
+import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.Version;
@@ -47,7 +46,7 @@ public class SearchFiles {
/** Simple command-line based search demo. */
public static void main(String[] args) throws Exception {
String usage =
- "Usage:\tjava org.apache.lucene.demo.SearchFiles [-index dir] [-field f] [-repeat n] [-queries file] [-raw] [-paging hitsPerPage]";
+ "Usage:\tjava org.apache.lucene.demo.SearchFiles [-index dir] [-field f] [-repeat n] [-queries file] [-query string] [-raw] [-paging hitsPerPage]\n\nSee http://lucene.apache.org/java/4_0/demo.html for details.";
usage += "\n\tSpecify 'false' for hitsPerPage to use streaming instead of paging search.";
if (args.length > 0 && ("-h".equals(args[0]) || "-help".equals(args[0]))) {
System.out.println(usage);
@@ -60,9 +59,10 @@ public class SearchFiles {
int repeat = 0;
boolean raw = false;
boolean paging = true;
+ String queryString = null;
int hitsPerPage = 10;
- for (int i = 0; i < args.length; i++) {
+ for(int i = 0;i < args.length;i++) {
if ("-index".equals(args[i])) {
index = args[i+1];
i++;
@@ -72,6 +72,9 @@ public class SearchFiles {
} else if ("-queries".equals(args[i])) {
queries = args[i+1];
i++;
+ } else if ("-query".equals(args[i])) {
+ queryString = args[i+1];
+ i++;
} else if ("-repeat".equals(args[i])) {
repeat = Integer.parseInt(args[i+1]);
i++;
@@ -90,10 +93,8 @@ public class SearchFiles {
}
}
- IndexReader reader = IndexReader.open(FSDirectory.open(new File(index)), true); // only searching, so read-only=true
-
- IndexSearcher searcher = new IndexSearcher(reader);
- Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_CURRENT);
+ IndexSearcher searcher = new IndexSearcher(FSDirectory.open(new File(index)));
+ Analyzer analyzer = new StandardAnalyzer(Version.LUCENE_40);
BufferedReader in = null;
if (queries != null) {
@@ -101,23 +102,25 @@ public class SearchFiles {
} else {
in = new BufferedReader(new InputStreamReader(System.in, "UTF-8"));
}
- QueryParser parser = new QueryParser(Version.LUCENE_CURRENT, field, analyzer);
+ QueryParser parser = new QueryParser(Version.LUCENE_40, field, analyzer);
while (true) {
- if (queries == null) // prompt the user
+ if (queries == null && queryString == null) { // prompt the user
System.out.println("Enter query: ");
+ }
- String line = in.readLine();
+ String line = queryString != null ? queryString : in.readLine();
- if (line == null || line.length() == -1)
+ if (line == null || line.length() == -1) {
break;
+ }
line = line.trim();
- if (line.length() == 0)
+ if (line.length() == 0) {
break;
+ }
Query query = parser.parse(line);
System.out.println("Searching for: " + query.toString(field));
-
if (repeat > 0) { // repeat & time as benchmark
Date start = new Date();
@@ -129,16 +132,20 @@ public class SearchFiles {
}
if (paging) {
- doPagingSearch(in, searcher, query, hitsPerPage, raw, queries == null);
+ doPagingSearch(in, searcher, query, hitsPerPage, raw, queries == null && queryString == null);
} else {
doStreamingSearch(searcher, query);
}
+
+ if (queryString != null) {
+ break;
+ }
}
- reader.close();
+ searcher.close();
}
/**
- * This method uses a custom HitCollector implementation which simply prints out
+ * This method uses a custom Collector implementation which simply prints out
* the docId and score of every matching document.
*
* This simulates the streaming search use case, where all hits are supposed to
@@ -190,12 +197,10 @@ public class SearchFiles {
int hitsPerPage, boolean raw, boolean interactive) throws IOException {
// Collect enough docs to show 5 pages
- TopScoreDocCollector collector = TopScoreDocCollector.create(
- 5 * hitsPerPage, false);
- searcher.search(query, collector);
- ScoreDoc[] hits = collector.topDocs().scoreDocs;
+ TopDocs results = searcher.search(query, 5 * hitsPerPage);
+ ScoreDoc[] hits = results.scoreDocs;
- int numTotalHits = collector.getTotalHits();
+ int numTotalHits = results.totalHits;
System.out.println(numTotalHits + " total matching documents");
int start = 0;
@@ -210,9 +215,7 @@ public class SearchFiles {
break;
}
- collector = TopScoreDocCollector.create(numTotalHits, false);
- searcher.search(query, collector);
- hits = collector.topDocs().scoreDocs;
+ hits = searcher.search(query, numTotalHits).scoreDocs;
}
end = Math.min(hits.length, start + hitsPerPage);
@@ -279,8 +282,6 @@ public class SearchFiles {
if (quit) break;
end = Math.min(numTotalHits, start + hitsPerPage);
}
-
}
-
}
}
Modified: lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/TestDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/TestDemo.java?rev=1072250&r1=1072249&r2=1072250&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/TestDemo.java (original)
+++ lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/TestDemo.java Sat Feb 19 04:49:36 2011
@@ -24,43 +24,30 @@ import java.io.PrintStream;
import org.apache.lucene.util.LuceneTestCase;
public class TestDemo extends LuceneTestCase {
- // LUCENE-589
- public void testUnicodeHtml() throws Exception {
- File dir = getDataFile("test-files/html");
- File indexDir = new File(TEMP_DIR, "demoIndex");
- IndexHTML.main(new String[] { "-create", "-index", indexDir.getPath(), dir.getPath() });
- File queries = getDataFile("test-files/queries.txt");
+
+ private void testOneSearch(String query, int expectedHitCount) throws Exception {
PrintStream outSave = System.out;
try {
ByteArrayOutputStream bytes = new ByteArrayOutputStream();
PrintStream fakeSystemOut = new PrintStream(bytes);
System.setOut(fakeSystemOut);
- SearchFiles.main(new String[] { "-index", indexDir.getPath(), "-queries", queries.getPath()});
+ SearchFiles.main(new String[] {"-query", query});
fakeSystemOut.flush();
String output = bytes.toString(); // intentionally use default encoding
- assertTrue(output.contains("1 total matching documents"));
+ assertTrue("output=" + output, output.contains(expectedHitCount + " total matching documents"));
} finally {
System.setOut(outSave);
}
}
-
- // LUCENE-591
- public void testIndexKeywords() throws Exception {
- File dir = getDataFile("test-files/html");
- File indexDir = new File(TEMP_DIR, "demoIndex2");
- IndexHTML.main(new String[] { "-create", "-index", indexDir.getPath(), dir.getPath() });
- File queries = getDataFile("test-files/queries2.txt");
- PrintStream outSave = System.out;
- try {
- ByteArrayOutputStream bytes = new ByteArrayOutputStream();
- PrintStream fakeSystemOut = new PrintStream(bytes);
- System.setOut(fakeSystemOut);
- SearchFiles.main(new String[] { "-index", indexDir.getPath(), "-queries", queries.getPath()});
- fakeSystemOut.flush();
- String output = bytes.toString(); // intentionally use default encoding
- assertTrue(output.contains("1 total matching documents"));
- } finally {
- System.setOut(outSave);
- }
+
+ public void testIndexSearch() throws Exception {
+ File dir = getDataFile("test-files/docs");
+ IndexFiles.main(new String[] { "-create", "-docs", dir.getPath() });
+ testOneSearch("apache", 3);
+ testOneSearch("patent", 8);
+ testOneSearch("lucene", 0);
+ testOneSearch("gnu", 6);
+ testOneSearch("derivative", 8);
+ testOneSearch("license", 13);
}
}
Added: lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.0.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.0.txt?rev=1072250&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.0.txt (added)
+++ lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.0.txt Sat Feb 19 04:49:36 2011
@@ -0,0 +1,56 @@
+/* ====================================================================
+ * Copyright (c) 1995-1999 The Apache Group. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ * software must display the following acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * 4. The names "Apache Server" and "Apache Group" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For written permission, please contact
+ * apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ * acknowledgment:
+ * "This product includes software developed by the Apache Group
+ * for use in the Apache HTTP server project (http://www.apache.org/)."
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ * EXPRESSED 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 APACHE GROUP OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Group and was originally based
+ * on public domain software written at the National Center for
+ * Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ * For more information on the Apache Group and the Apache HTTP server
+ * project, please see <http://www.apache.org/>.
+ *
+ */
Added: lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.1.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.1.txt?rev=1072250&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.1.txt (added)
+++ lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache1.1.txt Sat Feb 19 04:49:36 2011
@@ -0,0 +1,58 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. 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.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
+ * ITS 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.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
+ */
+
Added: lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache2.0.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache2.0.txt?rev=1072250&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache2.0.txt (added)
+++ lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/apache2.0.txt Sat Feb 19 04:49:36 2011
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.
Added: lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/cpl1.0.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/cpl1.0.txt?rev=1072250&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/cpl1.0.txt (added)
+++ lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/cpl1.0.txt Sat Feb 19 04:49:36 2011
@@ -0,0 +1,74 @@
+Common Public License - V1.0
+
+
+
+03 Mar 2005
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+ 1. DEFINITIONS
+
+ "Contribution" means:
+ 1. in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+ 2. in the case of each subsequent Contributor:
+ 1. changes to the Program, and
+ 2. additions to the Program;
+
+ where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+ "Contributor" means any person or entity that distributes the Program.
+
+ "Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+ "Program" means the Contributions distributed in accordance with this Agreement.
+
+ "Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+ 2. GRANT OF RIGHTS
+
+ 1. Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+ 2. Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+ 3. Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+ 4. Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+ 3. REQUIREMENTS
+
+ A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+ 1. it complies with the terms and conditions of this Agreement; and
+ 2. its license agreement:
+ 1. effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ 2. effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+ 3. states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+ 4. states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+ When the Program is made available in source code form:
+ 1. it must be made available under this Agreement; and
+ 2. a copy of this Agreement must be included with each copy of the Program.
+
+ Contributors may not remove or alter any copyright notices contained within the Program.
+
+ Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+ 4. COMMERCIAL DISTRIBUTION
+
+ Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any
claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+ For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+ 5. NO WARRANTY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+ 6. DISCLAIMER OF LIABILITY
+
+ EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ 7. GENERAL
+
+ If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+ If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+ All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+ Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receive
s no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+ This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
Added: lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/epl1.0.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/epl1.0.txt?rev=1072250&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/epl1.0.txt (added)
+++ lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/epl1.0.txt Sat Feb 19 04:49:36 2011
@@ -0,0 +1,88 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claim
s or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) a
nd 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
+
+
Added: lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/freebsd.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/freebsd.txt?rev=1072250&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/freebsd.txt (added)
+++ lucene/dev/trunk/lucene/contrib/demo/src/test/org/apache/lucene/demo/test-files/docs/freebsd.txt Sat Feb 19 04:49:36 2011
@@ -0,0 +1,10 @@
+Copyright 1994-2008 The FreeBSD Project. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 2. 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.
+
+THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT ``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 FREEBSD PROJECT 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.
+
+The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project.