[pkg-java] r3965 - trunk/lucene2/debian

Wed Aug 1 20:31:54 UTC 2007

Author: janpascal-guest
Date: 2007-08-01 20:31:54 +0000 (Wed, 01 Aug 2007)
New Revision: 3965

Modified:
   trunk/lucene2/debian/README.Debian
   trunk/lucene2/debian/get-orig-source.sh
Log:
Updated README.Debian for tomcat5.5

Modified: trunk/lucene2/debian/README.Debian
===================================================================

--- trunk/lucene2/debian/README.Debian	2007-08-01 20:31:49 UTC (rev 3964)
+++ trunk/lucene2/debian/README.Debian	2007-08-01 20:31:54 UTC (rev 3965)
@@ -8,7 +8,6 @@
   docs, and example applications
 
 Not all contrib libraries are included:
-- ant depends on jtidy, which is not (yet) in Debian
 - db/bdb-je depends on je-2.0.90 from www.sleepycat.com, not
   in Debian
 - gdata-server depends on many libraries, of which at least the 
@@ -24,15 +23,7 @@
 the following documentation and source code walkthrough:
 
  /usr/share/doc/liblucene2-java-doc/docs/demo.html
- /usr/share/doc/liblucene2-java-doc/docs/demo2.html
 
-For information on configuring the Lucene web application to be run in
-a Java(TM) web container such as Tomcat, see the following
-documentation and source code walkthrough:
-
- /usr/share/doc/liblucene2-java-doc/docs/demo3.html
- /usr/share/doc/liblucene2-java-doc/docs/demo4.html
-
 Several modifications are required if you wish to run the Lucene web
 application on a stock Debian tomcat5.5 configuration. Note that Debian's
 default Tomcat configuration may have changed since these instructions
@@ -40,21 +31,30 @@
 
 1) The Lucene web application looks for Lucene index data in
    /opt/lucene/index, although we may change this location in a 
-   future version of the Debian package. 
+   future version of the Debian package. When calling IndexHTML,
+   make sure the index files are stored there.
 
-2) You will need to add the following permissions to the
-   grant {...} section of /etc/tomcat4/policy.d/04webapps.policy.
-   Debian's default tomcat configuration
+2) Install the Lucene demo application by decompressing
+   /usr/share/doc/liblucene2-java-doc/demo/luceneweb.war.gz
+   and copying the resulting luceneweb.war file to 
+   /var/lib/tomcat5.5/webapps:
+   gzip -cd /usr/share/doc/liblucene2-java-doc/demo/luceneweb.war.gz  > /var/lib/tomcat5.5/webapps/luceneweb.war 
 
-// Allows luceneweb demo to work
-permission java.util.PropertyPermission "disableLuceneLocks", "read";
-permission java.util.PropertyPermission "java.io.tmpdir", "read";
-permission java.util.PropertyPermission "org.apache.lucene.*", "read";
-permission java.io.FilePermission "/opt/lucene/index", "read";
-permission java.io.FilePermission "/opt/lucene/index/*", "read";
-permission java.io.FilePermission "/var/lib/tomcat4/temp", "read,write,delete";
-permission java.io.FilePermission "/var/lib/tomcat4/temp/*", "read,write,delete";
+3) You will need to add a file (e.g., named 60lucenedemo.policy)
+   to /etc/tomcat5.5/policy.d/ to allow the Lucene demo web application
+   to access a number of files and settings:
 
+      // Allows luceneweb demo to work
+      grant codeBase "file:${catalina.base}/webapps/luceneweb/-" {
+	      permission java.util.PropertyPermission "disableLuceneLocks", "read";
+	      permission java.util.PropertyPermission "java.io.tmpdir", "read";
+	      permission java.util.PropertyPermission "org.apache.lucene.*", "read";
+	      permission java.io.FilePermission "/opt/lucene/index", "read,write";
+	      permission java.io.FilePermission "/opt/lucene/index/*", "read,write";
+	      permission java.io.FilePermission "/var/lib/tomcat5.5/temp", "read,write,delete";
+	      permission java.io.FilePermission "/var/lib/tomcat5.5/temp/*", "read,write,delete";
+      };
+
  -- Barry Hawkins <barryh at case.internal.alltc.org>, Fri,  5 May 2006 23:53:38 -0400
     Jan-Pascal van Best <janpascal at vanbest.org>, Thu, 12 Jul 2007 07:57:20 +0200
 

Modified: trunk/lucene2/debian/get-orig-source.sh
===================================================================
--- trunk/lucene2/debian/get-orig-source.sh	2007-08-01 20:31:49 UTC (rev 3964)
+++ trunk/lucene2/debian/get-orig-source.sh	2007-08-01 20:31:54 UTC (rev 3965)
@@ -6,17 +6,16 @@
 VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
 
 DESTDIR=$PWD/..
-PRISTINE_SOURCEFILE=$DESTDIR/lucene-$VERSION-src.tar.gz
+SOURCEFILE=$DESTDIR/lucene-$VERSION-src.tar.gz
 SIGFILE=$DESTDIR/lucene-$VERSION-src.tar.gz.asc
 SOURCETAR=$DESTDIR/lucene2_$VERSION.orig.tar
-SOURCETARGZ=$DESTDIR/lucene2_$VERSION.orig.tar.gz
 
 KEYURL="http://www.apache.org/dist/lucene/java/KEYS"
 KEYFILE="debian/KEYS"
 KEYRING="debian/lucene-keyring.gpg"
 
 # Download source tarball and signature file
-wget "$URL" -O $PRISTINE_SOURCEFILE
+wget "$URL" -O $SOURCEFILE
 wget "$URL.asc" -O $SIGFILE
 
 # If necessary, recreate keyring used for signing
@@ -31,20 +30,20 @@
 fi
 
 # Check signature
-gpgv --quiet --keyring $KEYRING $SIGFILE $PRISTINCE_SOURCEFILE
+gpgv --quiet --keyring $KEYRING $SIGFILE $SOURCEFILE
 
 echo "Check whether the archive has been signed by Michael Busch (Lucene Committer) <buschmi at apache.org>, key ID 6BD872A0"
 
 # Repackage upstream source file without the third party jars
 TEMPDIR=`mktemp -d`
 echo "Unpacking into tempdir $TEMPDIR..."
-tar xzf $PRISTINE_SOURCEFILE -C $TEMPDIR
+tar xzf $SOURCEFILE -C $TEMPDIR
 
 echo "Removing third party jars..."
 find $TEMPDIR -name \*.jar -exec rm {} \;
 
-echo "Packing new orig source tarball $SOURCEFILE..."
-rm -f $SOURCETAR $SOURCETARGZ
+echo "Packing new orig source tarball $SOURCETAR..."
+rm -f $SOURCETAR $SOURCETAR.gz
 cd $TEMPDIR
 tar cf $SOURCETAR *
 gzip -9 $SOURCETAR


