Return-Path: X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 40BCE91B8 for ; Tue, 13 Mar 2012 18:44:27 +0000 (UTC) Received: (qmail 6409 invoked by uid 500); 13 Mar 2012 18:44:27 -0000 Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org Received: (qmail 6381 invoked by uid 500); 13 Mar 2012 18:44:27 -0000 Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: accumulo-dev@incubator.apache.org Delivered-To: mailing list accumulo-commits@incubator.apache.org Received: (qmail 6374 invoked by uid 99); 13 Mar 2012 18:44:27 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2012 18:44:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Mar 2012 18:44:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 00F7E2388860; Tue, 13 Mar 2012 18:44:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1300284 - in /incubator/accumulo/branches/1.4.0rc: ./ bin/ docs/ src/core/ src/core/src/main/java/org/apache/accumulo/core/ src/examples/ src/examples/simple/ src/examples/wikisearch/ src/examples/wikisearch/ingest/ src/examples/wikisearch... Date: Tue, 13 Mar 2012 18:43:58 -0000 To: accumulo-commits@incubator.apache.org From: kturner@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120313184400.00F7E2388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kturner Date: Tue Mar 13 18:43:58 2012 New Revision: 1300284 URL: http://svn.apache.org/viewvc?rev=1300284&view=rev Log: ACCUMULO-145 modified version Modified: incubator/accumulo/branches/1.4.0rc/README incubator/accumulo/branches/1.4.0rc/bin/config.sh incubator/accumulo/branches/1.4.0rc/docs/combiners.html incubator/accumulo/branches/1.4.0rc/docs/config.html incubator/accumulo/branches/1.4.0rc/pom.xml incubator/accumulo/branches/1.4.0rc/src/core/pom.xml incubator/accumulo/branches/1.4.0rc/src/core/src/main/java/org/apache/accumulo/core/Constants.java incubator/accumulo/branches/1.4.0rc/src/examples/pom.xml incubator/accumulo/branches/1.4.0rc/src/examples/simple/pom.xml incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest.sh incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest_parallel.sh incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/pom.xml incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/pom.xml incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query-war/pom.xml incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query/pom.xml incubator/accumulo/branches/1.4.0rc/src/server/pom.xml incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/mlock/Makefile incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/nativeMap/Makefile incubator/accumulo/branches/1.4.0rc/src/server/src/main/resources/config.html incubator/accumulo/branches/1.4.0rc/src/start/pom.xml incubator/accumulo/branches/1.4.0rc/src/trace/pom.xml Modified: incubator/accumulo/branches/1.4.0rc/README URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/README?rev=1300284&r1=1300283&r2=1300284&view=diff ============================================================================== --- incubator/accumulo/branches/1.4.0rc/README (original) +++ incubator/accumulo/branches/1.4.0rc/README Tue Mar 13 18:43:58 2012 @@ -37,7 +37,7 @@ easier to install. Copy the accumulo tar file produced by "mvn package && mvn assembly:single -N" from the target/ directory to the desired destination, then untar it (e.g. -tar xvzf accumulo-1.4.0-incubating-SNAPSHOT-dist.tar.gz). +tar xvzf accumulo-1.4.0-incubating-dist.tar.gz). If you are using the RPM/deb, install the RPM/deb on every machine that will run accumulo. @@ -64,7 +64,7 @@ found in the same location on every mach have password-less ssh set up as described in the hadoop documentation. You will need to have hadoop installed and configured on your system. -Accumulo 1.4.0-incubating-SNAPSHOT has been tested with hadoop version 0.20.2. +Accumulo 1.4.0-incubating has been tested with hadoop version 0.20.2. The example accumulo configuration files are placed in directories based on the memory footprint for the accumulo processes. If you are using native libraries @@ -159,7 +159,7 @@ scanned. Shell - Apache Accumulo Interactive Shell - - - version: 1.4.0-incubating-SNAPSHOT + - version: 1.4.0-incubating - instance name: accumulo - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f - @@ -180,7 +180,7 @@ certain column. Shell - Apache Accumulo Interactive Shell - - - version: 1.4.0-incubating-SNAPSHOT + - version: 1.4.0-incubating - instance name: accumulo - instance id: f5947fe6-081e-41a8-9877-43730c4dfc6f - Modified: incubator/accumulo/branches/1.4.0rc/bin/config.sh URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/bin/config.sh?rev=1300284&r1=1300283&r2=1300284&view=diff ============================================================================== --- incubator/accumulo/branches/1.4.0rc/bin/config.sh (original) +++ incubator/accumulo/branches/1.4.0rc/bin/config.sh Tue Mar 13 18:43:58 2012 @@ -46,7 +46,7 @@ mkdir -p $ACCUMULO_LOG_DIR 2>/dev/null export ACCUMULO_LOG_DIR if [ -z ${ACCUMULO_VERSION} ]; then - ACCUMULO_VERSION=1.4.0-incubating-SNAPSHOT + ACCUMULO_VERSION=1.4.0-incubating fi if [ -z "$HADOOP_HOME" ] Modified: incubator/accumulo/branches/1.4.0rc/docs/combiners.html URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/docs/combiners.html?rev=1300284&r1=1300283&r2=1300284&view=diff ============================================================================== --- incubator/accumulo/branches/1.4.0rc/docs/combiners.html (original) +++ incubator/accumulo/branches/1.4.0rc/docs/combiners.html Tue Mar 13 18:43:58 2012 @@ -30,7 +30,7 @@

 
 Shell - Apache Accumulo Interactive Shell
-- version: 1.4.0-incubating-SNAPSHOT
+- version: 1.4.0-incubating
 - instance id: 863fc0d1-3623-4b6c-8c23-7d4fdb1c8a49
 - 
 - type 'help' for a list of available commands

Modified: incubator/accumulo/branches/1.4.0rc/docs/config.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/docs/config.html?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/docs/config.html (original)
+++ incubator/accumulo/branches/1.4.0rc/docs/config.html Tue Mar 13 18:43:58 2012
@@ -55,7 +55,7 @@
 
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.4.0-incubating-SNAPSHOT
+    - version: 1.4.0-incubating
     - instance name: ac14
     - instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
     - 

Modified: incubator/accumulo/branches/1.4.0rc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/pom.xml?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/pom.xml Tue Mar 13 18:43:58 2012
@@ -27,7 +27,7 @@
   org.apache.accumulo
   accumulo
   pom
-  1.4.0-incubating-SNAPSHOT
+  1.4.0-incubating
   accumulo
 
   
@@ -670,22 +670,22 @@
       
         org.apache.accumulo
         cloudtrace
-        1.4.0-incubating-SNAPSHOT
+        1.4.0-incubating
       
       
         org.apache.accumulo
         accumulo-start
-        1.4.0-incubating-SNAPSHOT
+        1.4.0-incubating
       
       
         org.apache.accumulo
         accumulo-core
-        1.4.0-incubating-SNAPSHOT
+        1.4.0-incubating
       
       
         org.apache.accumulo
         accumulo-server
-        1.4.0-incubating-SNAPSHOT
+        1.4.0-incubating
       
 
       

Modified: incubator/accumulo/branches/1.4.0rc/src/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/core/pom.xml?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/core/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/core/pom.xml Tue Mar 13 18:43:58 2012
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.0-incubating-SNAPSHOT
+    1.4.0-incubating
     ../../
   
 

Modified: incubator/accumulo/branches/1.4.0rc/src/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/core/src/main/java/org/apache/accumulo/core/Constants.java (original)
+++ incubator/accumulo/branches/1.4.0rc/src/core/src/main/java/org/apache/accumulo/core/Constants.java Tue Mar 13 18:43:58 2012
@@ -28,7 +28,7 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 
 public class Constants {
-  public static final String VERSION = "1.4.0-incubating-SNAPSHOT";
+  public static final String VERSION = "1.4.0-incubating";
   public static final int DATA_VERSION = 4;
   public static final int PREV_DATA_VERSION = 3;
   

Modified: incubator/accumulo/branches/1.4.0rc/src/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/pom.xml?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/pom.xml Tue Mar 13 18:43:58 2012
@@ -20,7 +20,7 @@
   
         accumulo
         org.apache.accumulo
-        1.4.0-incubating-SNAPSHOT
+        1.4.0-incubating
         ../../
   
   accumulo-examples

Modified: incubator/accumulo/branches/1.4.0rc/src/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/simple/pom.xml?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/simple/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/simple/pom.xml Tue Mar 13 18:43:58 2012
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo-examples
-    1.4.0-incubating-SNAPSHOT
+    1.4.0-incubating
     ../
   
 

Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest.sh?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest.sh (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest.sh Tue Mar 13 18:43:58 2012
@@ -38,7 +38,7 @@ LIBJARS=`echo $CLASSPATH | sed 's/^://' 
 #
 # Map/Reduce job
 #
-JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.0-incubating-SNAPSHOT.jar
+JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.0-incubating.jar
 CONF=$SCRIPT_DIR/../conf/wikipedia.xml
 HDFS_DATA_DIR=$1
 export HADOOP_CLASSPATH=$CLASSPATH

Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest_parallel.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest_parallel.sh?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest_parallel.sh (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/bin/ingest_parallel.sh Tue Mar 13 18:43:58 2012
@@ -38,7 +38,7 @@ LIBJARS=`echo $CLASSPATH | sed 's/^://' 
 #
 # Map/Reduce job
 #
-JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.0-incubating-SNAPSHOT.jar
+JAR=$SCRIPT_DIR/../lib/wikisearch-ingest-1.4.0-incubating.jar
 CONF=$SCRIPT_DIR/../conf/wikipedia.xml
 HDFS_DATA_DIR=$1
 export HADOOP_CLASSPATH=$CLASSPATH

Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/pom.xml?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/ingest/pom.xml Tue Mar 13 18:43:58 2012
@@ -20,7 +20,7 @@
   
     accumulo-wikisearch
     org.apache.accumulo
-    1.4.0-incubating-SNAPSHOT
+    1.4.0-incubating
     ../
   
 

Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/pom.xml?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/pom.xml Tue Mar 13 18:43:58 2012
@@ -20,7 +20,7 @@
   
         accumulo-examples
         org.apache.accumulo
-        1.4.0-incubating-SNAPSHOT
+        1.4.0-incubating
         ../
   
   accumulo-wikisearch

Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query-war/pom.xml?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query-war/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query-war/pom.xml Tue Mar 13 18:43:58 2012
@@ -20,7 +20,7 @@
   
     accumulo-wikisearch
     org.apache.accumulo
-    1.4.0-incubating-SNAPSHOT
+    1.4.0-incubating
   
 
   wikisearch-query-war

Modified: incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query/pom.xml?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/examples/wikisearch/query/pom.xml Tue Mar 13 18:43:58 2012
@@ -19,7 +19,7 @@
   
     accumulo-wikisearch
     org.apache.accumulo
-    1.4.0-incubating-SNAPSHOT
+    1.4.0-incubating
     ../
   
 

Modified: incubator/accumulo/branches/1.4.0rc/src/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/server/pom.xml?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/server/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/server/pom.xml Tue Mar 13 18:43:58 2012
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.0-incubating-SNAPSHOT
+    1.4.0-incubating
     ../../
   
 

Modified: incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/mlock/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/server/src/main/c%2B%2B/mlock/Makefile?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/mlock/Makefile (original)
+++ incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/mlock/Makefile Tue Mar 13 18:43:58 2012
@@ -37,7 +37,7 @@ clean:
 	rm -f $(INSTALLED_LIBS) $(LIBS)
 
 org_apache_accumulo_server_tabletserver_$(LIB).h : ../../java/org/apache/accumulo/server/tabletserver/$(LIB).java
-	javah -classpath ../../../../../../lib/accumulo-server-1.4.0-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
+	javah -classpath ../../../../../../lib/accumulo-server-1.4.0-incubating.jar org.apache.accumulo.server.tabletserver.$(LIB)
 
 $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
 	cp $(LIBS) $(INSTALL_DIR)

Modified: incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/nativeMap/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/nativeMap/Makefile (original)
+++ incubator/accumulo/branches/1.4.0rc/src/server/src/main/c++/nativeMap/Makefile Tue Mar 13 18:43:58 2012
@@ -36,7 +36,7 @@ clean:
 	rm -f $(INSTALLED_LIBS) $(LIBS)
 
 org_apache_accumulo_server_tabletserver_NativeMap.h : ../../java/org/apache/accumulo/server/tabletserver/NativeMap.java
-	javah -classpath ../../../../../../lib/accumulo-server-1.4.0-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
+	javah -classpath ../../../../../../lib/accumulo-server-1.4.0-incubating.jar org.apache.accumulo.server.tabletserver.NativeMap
 
 $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
 	cp $(LIBS) $(INSTALL_DIR)

Modified: incubator/accumulo/branches/1.4.0rc/src/server/src/main/resources/config.html
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/server/src/main/resources/config.html?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/server/src/main/resources/config.html (original)
+++ incubator/accumulo/branches/1.4.0rc/src/server/src/main/resources/config.html Tue Mar 13 18:43:58 2012
@@ -55,7 +55,7 @@
 
     Shell - Apache Accumulo Interactive Shell
     - 
-    - version: 1.4.0-incubating-SNAPSHOT
+    - version: 1.4.0-incubating
     - instance name: ac14
     - instance id: 4f48fa03-f692-43ce-ae03-94c9ea8b7181
     - 

Modified: incubator/accumulo/branches/1.4.0rc/src/start/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/start/pom.xml?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/start/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/start/pom.xml Tue Mar 13 18:43:58 2012
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.0-incubating-SNAPSHOT
+    1.4.0-incubating
     ../../
   
 

Modified: incubator/accumulo/branches/1.4.0rc/src/trace/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4.0rc/src/trace/pom.xml?rev=1300284&r1=1300283&r2=1300284&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4.0rc/src/trace/pom.xml (original)
+++ incubator/accumulo/branches/1.4.0rc/src/trace/pom.xml Tue Mar 13 18:43:58 2012
@@ -21,7 +21,7 @@
   
     org.apache.accumulo
     accumulo
-    1.4.0-incubating-SNAPSHOT
+    1.4.0-incubating
     ../../