accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From afu...@apache.org
Subject svn commit: r1241941 - in /incubator/accumulo/branches/1.4/src/examples/wikisearch: README README.parallel ingest/bin/ingest.sh ingest/bin/ingest_parallel.sh ingest/pom.xml
Date Wed, 08 Feb 2012 15:37:21 GMT
Author: afuchs
Date: Wed Feb  8 15:37:21 2012
New Revision: 1241941

URL: http://svn.apache.org/viewvc?rev=1241941&view=rev
Log:
ACCUMULO-381

Modified:
    incubator/accumulo/branches/1.4/src/examples/wikisearch/README
    incubator/accumulo/branches/1.4/src/examples/wikisearch/README.parallel
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh
    incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/README
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/README?rev=1241941&r1=1241940&r2=1241941&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/README (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/README Wed Feb  8 15:37:21 2012
@@ -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
  
  

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/README.parallel
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/README.parallel?rev=1241941&r1=1241940&r2=1241941&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/README.parallel (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/README.parallel Wed Feb  8 15:37:21
2012
@@ -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
  
  

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh?rev=1241941&r1=1241940&r2=1241941&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest.sh Wed Feb 
8 15:37:21 2012
@@ -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'`
 
 
 #

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh?rev=1241941&r1=1241940&r2=1241941&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh
(original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/bin/ingest_parallel.sh
Wed Feb  8 15:37:21 2012
@@ -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'`
 
 
 #

Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml?rev=1241941&r1=1241940&r2=1241941&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/ingest/pom.xml Wed Feb  8 15:37:21
2012
@@ -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>



Mime
View raw message