You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2012/01/13 18:33:55 UTC
svn commit: r1231201 - in /incubator/accumulo/trunk: ./ bin/accumulo
conf/accumulo-env.sh.example src/core/ src/server/
Author: vines
Date: Fri Jan 13 17:33:54 2012
New Revision: 1231201
URL: http://svn.apache.org/viewvc?rev=1231201&view=rev
Log:
ACCUMULO-252 - merging
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/bin/accumulo
incubator/accumulo/trunk/conf/accumulo-env.sh.example
incubator/accumulo/trunk/src/core/ (props changed)
incubator/accumulo/trunk/src/server/ (props changed)
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 13 17:33:54 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611,1228195,1230180,1230736,1231043
/incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1231149
+/incubator/accumulo/branches/1.4:1201902-1231200
Modified: incubator/accumulo/trunk/bin/accumulo
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/bin/accumulo?rev=1231201&r1=1231200&r2=1231201&view=diff
==============================================================================
--- incubator/accumulo/trunk/bin/accumulo (original)
+++ incubator/accumulo/trunk/bin/accumulo Fri Jan 13 17:33:54 2012
@@ -84,18 +84,25 @@ fi
XML_FILES=${ACCUMULO_HOME}/conf
CLASSPATH=${XML_FILES}:${START_JAR}:${COMMONS_JCI_JARS}
-if [ -z $JAVA_HOME ] ; then
+if [ -z $JAVA_HOME ] || [ ! -d $JAVA_HOME ]; then
echo "JAVA_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh"
exit 1
fi
-if [ -z $HADOOP_HOME ] ; then
+if [ -z $HADOOP_HOME ] || [ ! -d $HADOOP_HOME ]; then
echo "HADOOP_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh"
exit 1
fi
-if [ -z $ZOOKEEPER_HOME ] ; then
+if [ -z $ZOOKEEPER_HOME ] || [ ! -d $ZOOKEEPER_HOME ]; then
echo "ZOOKEEPER_HOME is not set. Please make sure it's set globally or in conf/accumulo-env.sh"
exit 1
fi
+
+#Export the variables just in case they are not exported
+#This makes them available to java
+export JAVA_HOME=$JAVA_HOME
+export HADOOP_HOME=$HADOOP_HOME
+export ZOOKEEPER_HOME=$ZOOKEEPER_HOME
+
JAVA=$JAVA_HOME/bin/java
PLATFORM="`$JAVA -cp $CLASSPATH org.apache.accumulo.start.Platform`"
Modified: incubator/accumulo/trunk/conf/accumulo-env.sh.example
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/conf/accumulo-env.sh.example?rev=1231201&r1=1231200&r2=1231201&view=diff
==============================================================================
--- incubator/accumulo/trunk/conf/accumulo-env.sh.example (original)
+++ incubator/accumulo/trunk/conf/accumulo-env.sh.example Fri Jan 13 17:33:54 2012
@@ -28,10 +28,10 @@
### on a single machine.
###
-test -z "$JAVA_HOME" && export JAVA_HOME=$JAVA_HOME
-test -z "$HADOOP_HOME" && export HADOOP_HOME=$HADOOP_LOCATION
+test -z "$JAVA_HOME" && export JAVA_HOME=/path/to/java
+test -z "$HADOOP_HOME" && export HADOOP_HOME=/path/to/hadoop
+test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME=/path/to/zookeeper
test -z "$ACCUMULO_LOG_DIR" && export ACCUMULO_LOG_DIR=$ACCUMULO_HOME/logs
-test -z "$ZOOKEEPER_HOME" && export ZOOKEEPER_HOME="$ZOOKEEPER_HOME"
if [ -f ${ACCUMULO_HOME}/conf/accumulo.policy ]
then
POLICY="-Djava.security.manager -Djava.security.policy=${ACCUMULO_HOME}/conf/accumulo.policy"
Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 13 17:33:54 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3/src/core:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215
/incubator/accumulo/branches/1.3.5rc/src/core:1209938
-/incubator/accumulo/branches/1.4/src/core:1201902-1231149
+/incubator/accumulo/branches/1.4/src/core:1201902-1231200
Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 13 17:33:54 2012
@@ -1,3 +1,3 @@
/incubator/accumulo/branches/1.3/src/server:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006,1227215,1227231,1227611
/incubator/accumulo/branches/1.3.5rc/src/server:1209938
-/incubator/accumulo/branches/1.4/src/server:1201902-1231149
+/incubator/accumulo/branches/1.4/src/server:1201902-1231200