Author: vines
Date: Wed Jan 2 22:51:19 2013
New Revision: 1428099
URL: http://svn.apache.org/viewvc?rev=1428099&view=rev
Log:
Merging ACCUMULO-789 1428098 to trunk
Modified:
accumulo/trunk/assemble/pom.xml
accumulo/trunk/packages/ (props changed)
accumulo/trunk/packages/deb/accumulo-native/postinst
accumulo/trunk/packages/deb/accumulo/postinst
Modified: accumulo/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1428099&r1=1428098&r2=1428099&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Wed Jan 2 22:51:19 2013
@@ -271,14 +271,6 @@
</mapper>
</data>
<data>
- <src>${accumulo-top}/NOTICE</src>
- <type>file</type>
- <mapper>
- <type>perm</type>
- <prefix>/usr/lib/accumulo</prefix>
- </mapper>
- </data>
- <data>
<src>${accumulo-top}/CHANGES</src>
<type>file</type>
<mapper>
@@ -322,6 +314,15 @@
</mapper>
<excludes>**/.svn/**,**/accumulo-site.xml,**/accumulo-env.sh,**/accumulo-metrics.xml,**/test-*,**/slaves,**/masters,**/tracers,**/gc,**/monitor</excludes>
</data>
+ <data>
+ <src>${accumulo-top}/conf/examples</src>
+ <type>directory</type>
+ <mapper>
+ <type>perm</type>
+ <prefix>/usr/lib/accumulo/conf/examples</prefix>
+ </mapper>
+ <excludes>**/.svn/**</excludes>
+ </data>
</dataSet>
</configuration>
</execution>
Propchange: accumulo/trunk/packages/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Jan 2 22:51:19 2013
@@ -0,0 +1,17 @@
+/accumulo/branches/1.3/packages:1309369,1328076,1330246,1330264,1330944,1349971,1354669
+/accumulo/branches/1.3/src/packages:1309369,1328076,1330246,1349971,1354669
+/accumulo/branches/1.4/packages:1305403-1382577,1382613,1388120,1388629,1393868,1396065,1396572,1396616,1396758,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1398514,1398801,1399211,1399717,1400976,1402571,1402682,1407301,1423032,1423629,1427864
+/accumulo/branches/1.4/src/packages:1305403-1356900,1358206,1363430,1364778,1365213,1382566,1382923,1388120,1396772,1397048,1397113,1397117,1397176,1397189,1397383,1397700,1397921,1398286,1398308,1398359,1398393,1398399,1398438,1399211,1400976,1402571,1402682,1407157,1423032,1423624,1427919,1428054,1428098
+/accumulo/branches/1.4.2/packages:1399210,1402681
+/accumulo/branches/1.4.2/src/packages:1399210,1402681
+/accumulo/branches/ACCUMULO-672/packages:1357826,1357829,1357842,1357858,1358236,1359163
+/accumulo/trunk/src/packages:1329425,1332224,1332278,1332347,1333047,1333070,1341000,1342373,1350779,1351691,1356400,1359721
+/incubator/accumulo/branches/1.3/packages: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/src/packages: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/packages:1209938
+/incubator/accumulo/branches/1.3.5rc/src/packages:1209938
+/incubator/accumulo/branches/1.4/packages:1201902-1305402
+/incubator/accumulo/branches/1.4/src/packages:1201899-1305402
+/incubator/accumulo/branches/1.4.0rc/packages:1304025,1305326
+/incubator/accumulo/branches/1.4.0rc/src/packages:1304025,1305326
+/incubator/accumulo/trunk/src/packages:1178656-1201898,1205476,1205570,1208726,1222413,1222719,1222725,1222733-1222734,1296160-1296495
Modified: accumulo/trunk/packages/deb/accumulo-native/postinst
URL:
http://svn.apache.org/viewvc/accumulo/trunk/packages/deb/accumulo-native/postinst?rev=1428099&r1=1428098&r2=1428099&view=diff
==============================================================================
--- accumulo/trunk/packages/deb/accumulo-native/postinst (original)
+++ accumulo/trunk/packages/deb/accumulo-native/postinst Wed Jan 2 22:51:19
2013
@@ -16,11 +16,19 @@
# limitations under the License.
# postinst script for Apache Accumulo native libraries
+echo JAVA HOME IS $JAVA_HOME
if [ -z "$JAVA_HOME" -o ! -f "$JAVA_HOME/jre/bin/" ] ; then
JAVA_HOME=`readlink -f /usr/bin/java`
JAVA_HOME=`dirname $JAVA_HOME`
- JAVA_HOME=`cd $JAVA_HOME/../../; pwd`
+ JAVA_HOME=`cd $JAVA_HOME/../; pwd`
fi
export JAVA_HOME
+export PATH=$PATH:$JAVA_HOME/bin
+echo $JAVA_HOME
+echo $PATH
cd /usr/lib/accumulo/src/server/src/main/c++
make
+
+if [ $? -ne 0 ]; then
+ echo "Issues building native libraries. Make sure root has javah on it's
classpath"
+fi
Modified: accumulo/trunk/packages/deb/accumulo/postinst
URL:
http://svn.apache.org/viewvc/accumulo/trunk/packages/deb/accumulo/postinst?rev=1428099&r1=1428098&r2=1428099&view=diff
==============================================================================
--- accumulo/trunk/packages/deb/accumulo/postinst (original)
+++ accumulo/trunk/packages/deb/accumulo/postinst Wed Jan 2 22:51:19 2013
@@ -37,7 +37,7 @@ fi
if [ -z $HADOOP_HOME ]; then
HADOOP_HOME="/usr/lib/hadoop"
fi
-for files in `ls /etc/accumulo/conf/accumulo-env.sh.*`; do
+for files in `ls /etc/accumulo/conf/examples/*/*/accumulo-env.sh`; do
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
