From: <bra...@us...> - 2007-10-10 20:43:24
|
Revision: 2033 http://archive-access.svn.sourceforge.net/archive-access/?rev=2033&view=rev Author: bradtofel Date: 2007-10-10 13:43:24 -0700 (Wed, 10 Oct 2007) Log Message: ----------- RENAME: this tool now just generates a CDX for a single ARC Added Paths: ----------- trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer Removed Paths: ------------- trunk/archive-access/projects/wayback/dist/src/scripts/index-client Copied: trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer (from rev 1983, trunk/archive-access/projects/wayback/dist/src/scripts/index-client) =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer (rev 0) +++ trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer 2007-10-10 20:43:24 UTC (rev 2033) @@ -0,0 +1,82 @@ +#!/usr/bin/env sh +## +## This script creates a CDX file for all ARC files in a directory +## PUTs those CDX files into a remote pipeline, and informs a remote +## LocationDB of the locations of all the ARC files. +## +## Optional environment variables +## +## JAVA_HOME Point at a JDK install to use. +## +## WAYBACK_HOME Pointer to your wayback install. If not present, we +## make an educated guess based of position relative to this +## script. +## +## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. +## + +# Resolve links - $0 may be a softlink +PRG="$0" +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '.*/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done +PRGDIR=`dirname "$PRG"` + +# Set WAYBACK_HOME. +if [ -z "$WAYBACK_HOME" ] +then + WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` +fi + +# Find JAVA_HOME. +if [ -z "$JAVA_HOME" ] +then + JAVA=`which java` + if [ -z "$JAVA" ] + then + echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." + exit 1 + fi + JAVA_BINDIR=`dirname $JAVA` + JAVA_HOME=$JAVA_BINDIR/.. +fi + +if [ -z "$JAVACMD" ] +then + # It may be defined in env - including flags!! + JAVACMD=$JAVA_HOME/bin/java +fi + +# Ignore previous classpath. Build one that contains heritrix jar and content +# of the lib directory into the variable CP. +for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` +do + CP=${CP}:${jar} +done + +# cygwin path translation +if expr `uname` : 'CYGWIN*' > /dev/null; then + CP=`cygpath -p -w "$CP"` + WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` +fi + +# Make sure of java opts. +if [ -z "$JAVA_OPTS" ] +then + JAVA_OPTS=" -Xmx256m" +fi + +# Main ArcIndexer class. +if [ -z "$CLASS_MAIN" ] +then + CLASS_MAIN='org.archive.wayback.resourcestore.ArcIndexer' +fi + +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ + Deleted: trunk/archive-access/projects/wayback/dist/src/scripts/index-client =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/index-client 2007-10-02 03:35:05 UTC (rev 2032) +++ trunk/archive-access/projects/wayback/dist/src/scripts/index-client 2007-10-10 20:43:24 UTC (rev 2033) @@ -1,82 +0,0 @@ -#!/usr/bin/env sh -## -## This script creates a CDX file for all ARC files in a directory -## PUTs those CDX files into a remote pipeline, and informs a remote -## LocationDB of the locations of all the ARC files. -## -## Optional environment variables -## -## JAVA_HOME Point at a JDK install to use. -## -## WAYBACK_HOME Pointer to your wayback install. If not present, we -## make an educated guess based of position relative to this -## script. -## -## JAVA_OPTS Java runtime options. Default setting is '-Xmx256m'. -## - -# Resolve links - $0 may be a softlink -PRG="$0" -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '.*/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done -PRGDIR=`dirname "$PRG"` - -# Set WAYBACK_HOME. -if [ -z "$WAYBACK_HOME" ] -then - WAYBACK_HOME=`cd "$PRGDIR/.." ; pwd` -fi - -# Find JAVA_HOME. -if [ -z "$JAVA_HOME" ] -then - JAVA=`which java` - if [ -z "$JAVA" ] - then - echo "Cannot find JAVA. Please set JAVA_HOME or your PATH." - exit 1 - fi - JAVA_BINDIR=`dirname $JAVA` - JAVA_HOME=$JAVA_BINDIR/.. -fi - -if [ -z "$JAVACMD" ] -then - # It may be defined in env - including flags!! - JAVACMD=$JAVA_HOME/bin/java -fi - -# Ignore previous classpath. Build one that contains heritrix jar and content -# of the lib directory into the variable CP. -for jar in `ls $WAYBACK_HOME/lib/*.jar $WAYBACK_HOME/*.jar 2> /dev/null` -do - CP=${CP}:${jar} -done - -# cygwin path translation -if expr `uname` : 'CYGWIN*' > /dev/null; then - CP=`cygpath -p -w "$CP"` - WAYBACK_HOME=`cygpath -p -w "$WAYBACK_HOME"` -fi - -# Make sure of java opts. -if [ -z "$JAVA_OPTS" ] -then - JAVA_OPTS=" -Xmx256m" -fi - -# Main ArcIndexer class. -if [ -z "$CLASS_MAIN" ] -then - CLASS_MAIN='org.archive.wayback.resourceindex.indexer.IndexClient' -fi - -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bra...@us...> - 2008-02-01 01:59:56
|
Revision: 2168 http://archive-access.svn.sourceforge.net/archive-access/?rev=2168&view=rev Author: bradtofel Date: 2008-01-31 17:59:59 -0800 (Thu, 31 Jan 2008) Log Message: ----------- BUGFIX: need to pass arguments to Java via sh's '"$@"' not '$@'. Modified Paths: -------------- trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer trunk/archive-access/projects/wayback/dist/src/scripts/bdb-client trunk/archive-access/projects/wayback/dist/src/scripts/bin-search trunk/archive-access/projects/wayback/dist/src/scripts/create-test-arc trunk/archive-access/projects/wayback/dist/src/scripts/location-client trunk/archive-access/projects/wayback/dist/src/scripts/url-client trunk/archive-access/projects/wayback/dist/src/scripts/warc-indexer Modified: trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer 2008-02-01 01:44:53 UTC (rev 2167) +++ trunk/archive-access/projects/wayback/dist/src/scripts/arc-indexer 2008-02-01 01:59:59 UTC (rev 2168) @@ -78,5 +78,5 @@ CLASS_MAIN='org.archive.wayback.resourcestore.ArcIndexer' fi -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN "$@" Modified: trunk/archive-access/projects/wayback/dist/src/scripts/bdb-client =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/bdb-client 2008-02-01 01:44:53 UTC (rev 2167) +++ trunk/archive-access/projects/wayback/dist/src/scripts/bdb-client 2008-02-01 01:59:59 UTC (rev 2168) @@ -78,5 +78,5 @@ CLASS_MAIN='org.archive.wayback.resourceindex.bdb.BDBIndex' fi -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN "$@" Modified: trunk/archive-access/projects/wayback/dist/src/scripts/bin-search =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/bin-search 2008-02-01 01:44:53 UTC (rev 2167) +++ trunk/archive-access/projects/wayback/dist/src/scripts/bin-search 2008-02-01 01:59:59 UTC (rev 2168) @@ -78,5 +78,5 @@ CLASS_MAIN='org.archive.wayback.util.flatfile.FlatFile' fi -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN "$@" Modified: trunk/archive-access/projects/wayback/dist/src/scripts/create-test-arc =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/create-test-arc 2008-02-01 01:44:53 UTC (rev 2167) +++ trunk/archive-access/projects/wayback/dist/src/scripts/create-test-arc 2008-02-01 01:59:59 UTC (rev 2168) @@ -78,5 +78,5 @@ CLASS_MAIN='org.archive.wayback.util.ARCCreator' fi -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN "$@" Modified: trunk/archive-access/projects/wayback/dist/src/scripts/location-client =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/location-client 2008-02-01 01:44:53 UTC (rev 2167) +++ trunk/archive-access/projects/wayback/dist/src/scripts/location-client 2008-02-01 01:59:59 UTC (rev 2168) @@ -78,5 +78,5 @@ CLASS_MAIN='org.archive.wayback.resourcestore.http.FileLocationDBClient' fi -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN "$@" Modified: trunk/archive-access/projects/wayback/dist/src/scripts/url-client =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/url-client 2008-02-01 01:44:53 UTC (rev 2167) +++ trunk/archive-access/projects/wayback/dist/src/scripts/url-client 2008-02-01 01:59:59 UTC (rev 2168) @@ -78,5 +78,5 @@ CLASS_MAIN='org.archive.wayback.util.url.AggressiveUrlCanonicalizer' fi -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN "$@" Modified: trunk/archive-access/projects/wayback/dist/src/scripts/warc-indexer =================================================================== --- trunk/archive-access/projects/wayback/dist/src/scripts/warc-indexer 2008-02-01 01:44:53 UTC (rev 2167) +++ trunk/archive-access/projects/wayback/dist/src/scripts/warc-indexer 2008-02-01 01:59:59 UTC (rev 2168) @@ -78,5 +78,5 @@ CLASS_MAIN='org.archive.wayback.resourcestore.WarcIndexer' fi -CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN $@ +CLASSPATH=${CP} $JAVACMD ${JAVA_OPTS} $CLASS_MAIN "$@" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |