ACCUMULO-381 git-svn-id: https://svn.apache.org/repos/asf/incubator/accumulo/branches/1.4@1241941 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/commit/dfe26ba1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/tree/dfe26ba1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/diff/dfe26ba1 Branch: refs/heads/master Commit: dfe26ba11ff25ce3e4c283447bebae887303a936 Parents: 57bf9cf Author: Adam Fuchs <afu...@apache.org> Authored: Wed Feb 8 15:37:21 2012 +0000 Committer: Adam Fuchs <afu...@apache.org> Committed: Wed Feb 8 15:37:21 2012 +0000 ---------------------------------------------------------------------- README | 3 +-- README.parallel | 3 +-- ingest/bin/ingest.sh | 30 +----------------------------- ingest/bin/ingest_parallel.sh | 30 +----------------------------- ingest/pom.xml | 14 ++++++++++++-- 5 files changed, 16 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/dfe26ba1/README ---------------------------------------------------------------------- diff --git a/README b/README index b4391eb..4c06eda 100644 --- a/README +++ b/README @@ -8,8 +8,7 @@ Prerequisites ------------- 1. Accumulo, Hadoop, and ZooKeeper must be installed and running - 2. ACCUMULO_HOME and ZOOKEEPER_HOME must be defined in the environment - 3. One or more wikipedia dump files (http://dumps.wikimedia.org/backup-index.html) placed in an HDFS directory. + 2. One or more wikipedia dump files (http://dumps.wikimedia.org/backup-index.html) placed in an HDFS directory. You will want to grab the files with the link name of pages-articles.xml.bz2 http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/dfe26ba1/README.parallel ---------------------------------------------------------------------- diff --git a/README.parallel b/README.parallel index 18cab71..04c95f4 100644 --- a/README.parallel +++ b/README.parallel @@ -8,8 +8,7 @@ Prerequisites ------------- 1. Accumulo, Hadoop, and ZooKeeper must be installed and running - 2. ACCUMULO_HOME and ZOOKEEPER_HOME must be defined in the environment - 3. One or more wikipedia dump files (http://dumps.wikimedia.org/backup-index.html) placed in an HDFS directory. + 2. One or more wikipedia dump files (http://dumps.wikimedia.org/backup-index.html) placed in an HDFS directory. You will want to grab the files with the link name of pages-articles.xml.bz2 http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/dfe26ba1/ingest/bin/ingest.sh ---------------------------------------------------------------------- diff --git a/ingest/bin/ingest.sh b/ingest/bin/ingest.sh index 2759669..f743412 100755 --- a/ingest/bin/ingest.sh +++ b/ingest/bin/ingest.sh @@ -22,34 +22,6 @@ SCRIPT_DIR="${THIS_SCRIPT%/*}" SCRIPT_DIR=`cd $SCRIPT_DIR ; pwd` echo $SCRIPT_DIR -ACCUMULO_HOME=${ACCUMULO_HOME} -ZOOKEEPER_HOME=${ZOOKEEPER_HOME} - -# -# Check ZOOKEEPER_HOME -# -if [[ -z $ZOOKEEPER_HOME ]]; then - echo "You must set ZOOKEEPER_HOME environment variable" - exit -1; -else - for f in $ZOOKEEPER_HOME/zookeeper-*.jar; do - CLASSPATH=$f - break - done -fi - -# -# Check ACCUMULO_HOME -# -if [[ -z $ACCUMULO_HOME ]]; then - echo "You must set ACCUMULO_HOME environment variable" - exit -1; -else - for f in $ACCUMULO_HOME/lib/*.jar; do - CLASSPATH=${CLASSPATH}:$f - done -fi - # # Add our jars # @@ -60,7 +32,7 @@ done # # Transform the classpath into a comma-separated list also # -LIBJARS=`echo $CLASSPATH | sed 's/:/,/g'` +LIBJARS=`echo $CLASSPATH | sed 's/^://' | sed 's/:/,/g'` # http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/dfe26ba1/ingest/bin/ingest_parallel.sh ---------------------------------------------------------------------- diff --git a/ingest/bin/ingest_parallel.sh b/ingest/bin/ingest_parallel.sh index e921494..74dce9c 100755 --- a/ingest/bin/ingest_parallel.sh +++ b/ingest/bin/ingest_parallel.sh @@ -22,34 +22,6 @@ SCRIPT_DIR="${THIS_SCRIPT%/*}" SCRIPT_DIR=`cd $SCRIPT_DIR ; pwd` echo $SCRIPT_DIR -ACCUMULO_HOME=${ACCUMULO_HOME} -ZOOKEEPER_HOME=${ZOOKEEPER_HOME} - -# -# Check ZOOKEEPER_HOME -# -if [[ -z $ZOOKEEPER_HOME ]]; then - echo "You must set ZOOKEEPER_HOME environment variable" - exit -1; -else - for f in $ZOOKEEPER_HOME/zookeeper-*.jar; do - CLASSPATH=$f - break - done -fi - -# -# Check ACCUMULO_HOME -# -if [[ -z $ACCUMULO_HOME ]]; then - echo "You must set ACCUMULO_HOME environment variable" - exit -1; -else - for f in $ACCUMULO_HOME/lib/*.jar; do - CLASSPATH=${CLASSPATH}:$f - done -fi - # # Add our jars # @@ -60,7 +32,7 @@ done # # Transform the classpath into a comma-separated list also # -LIBJARS=`echo $CLASSPATH | sed 's/:/,/g'` +LIBJARS=`echo $CLASSPATH | sed 's/^://' | sed 's/:/,/g'` # http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/dfe26ba1/ingest/pom.xml ---------------------------------------------------------------------- diff --git a/ingest/pom.xml b/ingest/pom.xml index 68e4fb9..ac123c7 100644 --- a/ingest/pom.xml +++ b/ingest/pom.xml @@ -76,6 +76,16 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-server</artifactId> </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>cloudtrace</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + <scope>runtime</scope> + </dependency> </dependencies> <build> @@ -93,8 +103,8 @@ <configuration> <outputDirectory>lib</outputDirectory> <!-- just grab the non-provided runtime dependencies --> - <includeArtifactIds>commons-lang,google-collections,lucene-core,lucene-analyzers,lucene-wikipedia,protobuf-java</includeArtifactIds> - <excludeTransitive>true</excludeTransitive> + <includeArtifactIds>commons-lang,google-collections,lucene-core,lucene-analyzers,lucene-wikipedia,protobuf-java,accumulo-core,hadoop-core,libthrift,cloudtrace,zookeeper</includeArtifactIds> + <excludeTransitive>false</excludeTransitive> </configuration> </execution> </executions>
