incubator-accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1295920 - in /incubator/accumulo/trunk: ./ src/core/ src/packages/deb/accumulo-native/postinst src/packages/deb/accumulo/postinst src/server/
Date Thu, 01 Mar 2012 21:42:17 GMT
Author: vines
Date: Thu Mar  1 21:42:16 2012
New Revision: 1295920

URL: http://svn.apache.org/viewvc?rev=1295920&view=rev
Log:
Merging ACCUMULO-435



Modified:
    incubator/accumulo/trunk/   (props changed)
    incubator/accumulo/trunk/src/core/   (props changed)
    incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst
    incubator/accumulo/trunk/src/packages/deb/accumulo/postinst
    incubator/accumulo/trunk/src/server/   (props changed)

Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 21:42:16 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,1236873,1245632
 /incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1295709
+/incubator/accumulo/branches/1.4:1201902-1295918

Propchange: incubator/accumulo/trunk/src/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 21:42:16 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-1295709
+/incubator/accumulo/branches/1.4/src/core:1201902-1295918

Modified: incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst?rev=1295920&r1=1295919&r2=1295920&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst (original)
+++ incubator/accumulo/trunk/src/packages/deb/accumulo-native/postinst Thu Mar  1 21:42:16
2012
@@ -16,11 +16,11 @@
 # limitations under the License.
 
 # postinst script for Apache Accumulo native libraries
-JAVA_HOME=/usr/lib/jvm/default-java
-if [ ! -d $JAVA_HOME ]; then 
-  export JAVA_HOME=/usr/lib/jvm/java-6-openjdk;
+if [ -z $JAVA_HOME ]; then
+  JAVA_HOME=`!readlink -f /usr/bin/java`
+  JAVA_HOME=`dirname $JAVA_HOME`
+  JAVA_HOME=`ci $JAVA_HOME/../../; pwd`
 fi
 export JAVA_HOME
-echo $JAVA_HOME
 cd /usr/lib/accumulo/src/server/src/main/c++
 make

Modified: incubator/accumulo/trunk/src/packages/deb/accumulo/postinst
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/packages/deb/accumulo/postinst?rev=1295920&r1=1295919&r2=1295920&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/packages/deb/accumulo/postinst (original)
+++ incubator/accumulo/trunk/src/packages/deb/accumulo/postinst Thu Mar  1 21:42:16 2012
@@ -26,8 +26,19 @@ mkdir -p /var/log/accumulo/walogs
 ln -fs /var/log/accumulo/logs /usr/lib/accumulo/logs 
 ln -fs /var/log/accumulo/walogs /usr/lib/accumulo/walogs 
 
+if [ -z $JAVA_HOME ]; then
+  JAVA_HOME=`!readlink -f /usr/bin/java`
+  JAVA_HOME=`dirname $JAVA_HOME`
+  JAVA_HOME=`ci $JAVA_HOME/../../; pwd`
+fi
+if [ -z $ZOOKEEPER_HOME ]; then
+  ZOOKEEPER_HOME="/usr/lib/zookeeper"
+fi
+if [ -z $HADOOP_HOME ]; then
+  HADOOP_HOME="/usr/lib/hadoop"
+fi
 for files in `ls /etc/accumulo/conf/accumulo-env.sh.*`; do
-  sed -i -e 's:/path/to/java:/usr/lib/jvm/default-java:' $files 
-  sed -i -e 's:/path/to/zookeeper:/usr/lib/zookeeper:' $files 
-  sed -i -e 's:/path/to/hadoop:/usr/lib/hadoop:' $files 
+  sed -i -e "s:/path/to/java:$JAVA_HOME:" $files 
+  sed -i -e "s:/path/to/zookeeper:$ZOOKEEPER_HOME:" $files 
+  sed -i -e "s:/path/to/hadoop:$HADOOP_HOME:" $files 
 done 

Propchange: incubator/accumulo/trunk/src/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 21:42:16 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-1295709
+/incubator/accumulo/branches/1.4/src/server:1201902-1295918



Mime
View raw message