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 2010/10/14 12:04:28 UTC
svn commit: r1022450 - in /lucene/dev/branches/branch_3x/lucene: ./ contrib/
contrib/benchmark/ contrib/demo/ contrib/demo/lib/ contrib/demo/src/
contrib/demo/src/java/ contrib/demo/src/jsp/ contrib/demo/src/test/ lib/
src/demo/ src/jsp/
Author: rmuir
Date: Thu Oct 14 10:04:27 2010
New Revision: 1022450
URL: http://svn.apache.org/viewvc?rev=1022450&view=rev
Log:
LUCENE-2413: move the demo out of lucene core into contrib/demo (backport)
Added:
lucene/dev/branches/branch_3x/lucene/contrib/demo/
lucene/dev/branches/branch_3x/lucene/contrib/demo/build.xml (with props)
lucene/dev/branches/branch_3x/lucene/contrib/demo/lib/
lucene/dev/branches/branch_3x/lucene/contrib/demo/lib/servlet-api-2.4.jar
- copied unchanged from r1022424, lucene/dev/branches/branch_3x/lucene/lib/servlet-api-2.4.jar
lucene/dev/branches/branch_3x/lucene/contrib/demo/src/
lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/
- copied from r1022424, lucene/dev/branches/branch_3x/lucene/src/demo/
lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/overview.html (with props)
lucene/dev/branches/branch_3x/lucene/contrib/demo/src/jsp/
- copied from r1022424, lucene/dev/branches/branch_3x/lucene/src/jsp/
lucene/dev/branches/branch_3x/lucene/contrib/demo/src/test/
Removed:
lucene/dev/branches/branch_3x/lucene/lib/servlet-api-2.4.jar
lucene/dev/branches/branch_3x/lucene/src/demo/
lucene/dev/branches/branch_3x/lucene/src/jsp/
Modified:
lucene/dev/branches/branch_3x/lucene/README.txt
lucene/dev/branches/branch_3x/lucene/build.xml
lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml
Modified: lucene/dev/branches/branch_3x/lucene/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/README.txt?rev=1022450&r1=1022449&r2=1022450&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/README.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/README.txt Thu Oct 14 10:04:27 2010
@@ -17,10 +17,10 @@ FILES
lucene-core-XX.jar
The compiled lucene library.
-lucene-demos-XX.jar
+contrib/demo/lucene-demos-XX.jar
The compiled simple example code.
-luceneweb.war
+contrib/demo/luceneweb.war
The compiled simple example Web Application.
contrib/*
@@ -40,5 +40,5 @@ docs/api/index.html
src/java
The Lucene source code.
-src/demo
+contrib/demo/src
Some example code.
Modified: lucene/dev/branches/branch_3x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/build.xml?rev=1022450&r1=1022449&r2=1022450&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/build.xml Thu Oct 14 10:04:27 2010
@@ -23,11 +23,6 @@
<import file="common-build.xml"/>
- <property name="build.demo.template" value="src/demo/demo-build.template"/>
-
- <property name="demo.name" value="lucene-demos-${version}"/>
- <property name="demo.war.name" value="luceneweb"/>
-
<!-- Build classpath -->
<path id="classpath">
<pathelement location="${build.dir}/classes/java"/>
@@ -57,10 +52,10 @@
excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/,contrib/benchmark/temp/,contrib/benchmark/work/"
/>
<patternset id="binary.build.dist.patterns"
- includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
+ includes="${final.name}.jar,docs/,contrib/*/*.jar,contrib/*/*.war, contrib/*/*/*.jar"
/>
<patternset id="binary.root.dist.patterns"
- includes="src/demo/,src/jsp/,docs/,*.txt,contrib/*/README*,**/CHANGES.txt,lib/servlet-api-*.jar"
+ includes="docs/,*.txt,contrib/*/README*,**/CHANGES.txt"
excludes="${build.demo.template}"
/>
@@ -150,72 +145,9 @@
<!-- -->
<!-- ================================================================== -->
- <target name="jar-demo" depends="compile-demo">
- <sequential>
- <build-manifest title="Lucene Search Engine: demos"/>
- <jar
- destfile="${build.dir}/${demo.name}.jar"
- basedir="${build.dir}/classes/demo"
- excludes="**/*.java"
- manifest="${manifest.file}">
- <metainf dir="${common.dir}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </metainf>
- </jar>
- </sequential>
- </target>
-
- <target name="jar-demo-src" depends="compile-demo">
- <sequential>
- <build-manifest title="Lucene Search Engine: demos"/>
- <jar
- destfile="${build.dir}/${demo.name}-src.jar"
- basedir="src/demo"
- manifest="${manifest.file}">
- <metainf dir="${common.dir}">
- <include name="LICENSE.txt"/>
- <include name="NOTICE.txt"/>
- </metainf>
- </jar>
- </sequential>
- </target>
-
- <target name="war-demo" depends="jar-core,jar-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="${demo.name}.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="compile-core" depends="jflex-notice, javacc-notice, common.compile-core"/>
<!-- ================================================================== -->
- <!-- B U I L D D E M O -->
- <!-- ================================================================== -->
- <!-- -->
- <!-- ================================================================== -->
- <target name="compile-demo" depends="compile-core">
- <mkdir dir="${build.dir}/classes/demo"/>
-
- <compile
- srcdir="src/demo"
- destdir="${build.dir}/classes/demo">
- <classpath refid="demo.classpath"/>
- </compile>
- </target>
-
- <!-- ================================================================== -->
<!-- D O C U M E N T A T I O N -->
<!-- ================================================================== -->
<!-- -->
@@ -225,7 +157,7 @@
</target>
<target name="javadocs" description="Generate javadoc"
- depends="javadocs-all, javadocs-core, javadocs-demo, javadocs-contrib">
+ depends="javadocs-all, javadocs-core, javadocs-contrib">
<echo file="${javadoc.dir}/index.html" append="false">
<![CDATA[<html><head><title>${Name} ${version} Javadoc Index</title></head>
<body>
@@ -239,7 +171,6 @@
<contrib-crawl target="javadocs-index.html" failonerror="false"/>
<echo file="${javadoc.dir}/index.html" append="true"><![CDATA[
</ul>
- <li><a href="demo/index.html">Demo</a></li>
</ul></body>]]></echo>
</target>
@@ -257,28 +188,13 @@
<jarify basedir="${javadoc.dir}/core" destfile="${build.dir}/${final.name}-javadoc.jar"/>
</sequential>
</target>
-
- <target name="javadocs-demo" description="Generate javadoc for demo classes">
- <sequential>
- <mkdir dir="${javadoc.dir}/demo"/>
- <invoke-javadoc
- destdir="${javadoc.dir}/demo"
- title="${Name} ${version} demo API">
- <sources>
- <packageset dir="src/demo"/>
- <link href=""/>
- </sources>
- </invoke-javadoc>
- <jarify basedir="${javadoc.dir}/demo" destfile="${build.dir}/${demo.name}-javadoc.jar"/>
- </sequential>
- </target>
<target name="javadocs-contrib" description="Generate javadoc for contrib classes">
<contrib-crawl target="javadocs"
failonerror="false"/>
</target>
- <target name="javadocs-all" description="Generate javadoc for core, demo and contrib classes" depends="build-contrib">
+ <target name="javadocs-all" description="Generate javadoc for core and contrib classes" depends="build-contrib">
<sequential>
<mkdir dir="${javadoc.dir}/all"/>
<invoke-javadoc
@@ -287,8 +203,6 @@
<!-- TODO: find a dynamic way to do include multiple source roots -->
<packageset dir="src/java"/>
- <packageset dir="src/demo"/>
-
<!-- please keep this list up to date, and in alpha order... -->
<!-- ie: `find contrib/* -path \*src/java | sort` -->
@@ -302,6 +216,7 @@
<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/icu/src/java"/>
<packageset dir="contrib/db/bdb-je/src/java"/>
<packageset dir="contrib/db/bdb/src/java"/>
@@ -326,12 +241,11 @@
<group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*:org.apache.lucene.analysis.tokenattributes*"/>
- <group title="Demo" packages="org.apache.lucene.demo*"/>
-
<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: Highlighter" packages="org.apache.lucene.search.highlight*:org.apache.lucene.search.vectorhighlight*"/>
<group title="contrib: Instantiated" packages="org.apache.lucene.store.instantiated*"/>
@@ -357,15 +271,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="jar-core, javadocs, war-demo, build-contrib, init-dist, changes-to-html">
- <copy file="${build.demo.template}" tofile="${build.dir}/build-demo.xml">
- <filterset begintoken="@PLACEHOLDER_" endtoken="@">
- <filter token="version" value="${version}"/>
- <filter token="javac.source" value="${javac.source}"/>
- <filter token="javac.target" value="${javac.target}"/>
- </filterset>
- </copy>
- </target>
+ <target name="package" depends="jar-core, javadocs, build-contrib, init-dist, changes-to-html"/>
<target name="nightly" depends="test, package-tgz">
</target>
@@ -405,7 +311,6 @@
<tarfileset prefix="lucene-${version}" dir=".">
<patternset refid="binary.root.dist.patterns"/>
</tarfileset>
- <tarfileset dir="${build.dir}" includes="build-demo.xml" fullpath="lucene-${version}/build.xml"/>
<tarfileset prefix="lucene-${version}" dir="${build.dir}">
<patternset refid="binary.build.dist.patterns"/>
</tarfileset>
@@ -496,7 +401,7 @@
<target name="dist-all" depends="dist, dist-src"/>
- <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, jar-demo-src, javadocs">
+ <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src, javadocs">
<sequential>
<m2-deploy pom.xml="lucene-parent-pom.xml.template"/>
<m2-deploy pom.xml="lucene-core-pom.xml.template">
@@ -508,15 +413,6 @@
</artifact-attachments>
</m2-deploy>
- <m2-deploy pom.xml="lucene-demos-pom.xml.template">
- <artifact-attachments>
- <attach file="${build.dir}/${demo.name}-src.jar"
- classifier="sources"/>
- <attach file="${build.dir}/${demo.name}-javadoc.jar"
- classifier="javadoc"/>
- </artifact-attachments>
- </m2-deploy>
-
<m2-deploy pom.xml="lucene-contrib-pom.xml.template"/>
<contrib-crawl target="dist-maven"/>
</sequential>
@@ -582,13 +478,13 @@
<fileset dir="contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/parser" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
- <fileset dir="src/demo/org/apache/lucene/demo/html" includes="*.java">
+ <fileset dir="contrib/demo/src/java/org/apache/lucene/demo/html" includes="*.java">
<containsregexp expression="Generated.*By.*JavaCC"/>
</fileset>
</delete>
</target>
- <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-HTMLParser,javacc-contrib-queryparser"/>
+ <target name="javacc" depends="init,javacc-check,clean-javacc,javacc-QueryParser,javacc-contrib-queryparser,javacc-contrib-demo"/>
<target name="javacc-QueryParser" depends="init,javacc-check" if="javacc.present">
<sequential>
@@ -608,12 +504,6 @@
</sequential>
</target>
- <target name="javacc-HTMLParser" depends="init,javacc-check" if="javacc.present">
- <invoke-javacc target="src/demo/org/apache/lucene/demo/html/HTMLParser.jj"
- outputDir="src/demo/org/apache/lucene/demo/html"
- />
- </target>
-
<target name="javacc-contrib-queryparser" depends="init,javacc-check" if="javacc.present">
<ant target="javacc"
dir="contrib/queryparser"
@@ -621,6 +511,13 @@
/>
</target>
+ <target name="javacc-contrib-demo" depends="init,javacc-check" if="javacc.present">
+ <ant target="javacc"
+ dir="contrib/demo"
+ antfile="build.xml"
+ />
+ </target>
+
<!-- ================================================================== -->
<!-- Build the JFlex files into the source tree -->
<!-- ================================================================== -->
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=1022450&r1=1022449&r2=1022450&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/CHANGES.txt Thu Oct 14 10:04:27 2010
@@ -241,6 +241,9 @@ Build
* LUCENE-2399, LUCENE-2683: Upgrade contrib/icu's ICU jar file to ICU 4.4.2
(Robert Muir)
+
+ * LUCENE-2413: Moved the demo out of lucene core and into contrib/demo.
+ (Robert Muir)
Optimizations
Modified: lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml?rev=1022450&r1=1022449&r2=1022450&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml Thu Oct 14 10:04:27 2010
@@ -17,6 +17,7 @@
<contrib-uptodate name="analyzers/common" jarfile="${common.dir}/build/contrib/analyzers/common/lucene-analyzers-${version}.jar"
property="analyzers-common.uptodate" classpath.property="analyzers-common.jar"/>
<contrib-uptodate name="memory" property="memory.uptodate" classpath.property="memory.jar"/>
+ <contrib-uptodate name="demo" property="demo.uptodate" classpath.property="demo.jar"/>
<target name="check-files">
<available file="temp/news20.tar.gz" property="news20.exists"/>
@@ -138,8 +139,8 @@
<pathelement path="${memory.jar}"/>
<pathelement path="${highlighter.jar}"/>
<pathelement path="${analyzers-common.jar}"/>
+ <pathelement path="${demo.jar}"/>
<path refid="base.classpath"/>
- <pathelement path="${common.dir}/build/classes/demo"/>
<fileset dir="lib">
<include name="**/*.jar"/>
</fileset>
@@ -227,9 +228,9 @@
<echo>Benchmark output in JIRA table format is in file: ${shingle.jira.output.file}</echo>
</target>
- <target name="compile-demo">
- <subant target="compile-demo">
- <fileset dir="${common.dir}" includes="build.xml"/>
+ <target name="compile-demo" unless="demo.uptodate">
+ <subant target="default">
+ <fileset dir="${common.dir}/contrib/demo" includes="build.xml"/>
</subant>
</target>
<target name="compile-highlighter" unless="highlighter.uptodate">
Added: lucene/dev/branches/branch_3x/lucene/contrib/demo/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/demo/build.xml?rev=1022450&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/demo/build.xml (added)
+++ lucene/dev/branches/branch_3x/lucene/contrib/demo/build.xml Thu Oct 14 10:04:27 2010
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+ -->
+
+<project name="demo" default="default">
+
+ <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"/>
+
+ <target name="compile-core" depends="common.compile-core, war-demo" />
+
+ <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="${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>
+</project>
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/demo/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/overview.html?rev=1022450&view=auto
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/overview.html (added)
+++ lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/overview.html Thu Oct 14 10:04:27 2010
@@ -0,0 +1,26 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<html>
+ <head>
+ <title>
+ demo
+ </title>
+ </head>
+ <body>
+ demo
+ </body>
+</html>
Propchange: lucene/dev/branches/branch_3x/lucene/contrib/demo/src/java/overview.html
------------------------------------------------------------------------------
svn:eol-style = native