You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by vi...@apache.org on 2012/08/17 01:50:05 UTC
svn commit: r1374108 - in /incubator/oozie/trunk:
distro/src/main/bin/addtowar.sh release-log.txt
Author: virag
Date: Thu Aug 16 23:50:05 2012
New Revision: 1374108
URL: http://svn.apache.org/viewvc?rev=1374108&view=rev
Log:
OOZIE-947 Forward porting OOZIE-733 to 3.2 and trunk (mona via virag)
Modified:
incubator/oozie/trunk/distro/src/main/bin/addtowar.sh
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/distro/src/main/bin/addtowar.sh
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/distro/src/main/bin/addtowar.sh?rev=1374108&r1=1374107&r2=1374108&view=diff
==============================================================================
--- incubator/oozie/trunk/distro/src/main/bin/addtowar.sh (original)
+++ incubator/oozie/trunk/distro/src/main/bin/addtowar.sh Thu Aug 16 23:50:05 2012
@@ -21,9 +21,9 @@
function prepare() {
tmpDir=/tmp/oozie-war-packing-$$
rm -rf ${tmpDir}
- mkdir ${tmpDir}
+ mkdir ${tmpDir}
tmpWarDir=${tmpDir}/oozie-war
- mkdir ${tmpWarDir}
+ mkdir ${tmpWarDir}
checkExec "creating staging directory ${tmpDir}"
}
@@ -71,7 +71,7 @@ function checkFileDoesNotExist() {
#finds a file under a directory any depth, file returns in variable RET
function findFile() {
- RET=`find -H ${1} -name ${2}`
+ RET=`find -H ${1} -name ${2} | grep -e "[0-9.a${hadoopJarsSuffix}].jar"`
RET=`echo ${RET} | sed "s/ .*//"`
if [ "${RET}" = "" ]; then
echo
@@ -97,19 +97,23 @@ function getHadoopJars() {
version=$1
if [ "${version}" = "0.20.1" ]; then
#List is separated by ":"
- hadoopJars="hadoop*core*.jar"
+ hadoopJars="hadoop-core*.jar"
elif [ "${version}" = "0.20.2" ]; then
#List is separated by ":"
- hadoopJars="hadoop*core*.jar"
+ hadoopJars="hadoop-core*.jar"
elif [ "${version}" = "0.20.104" ]; then
#List is separated by ":"
- hadoopJars="hadoop*core*.jar:jackson-core-asl-*.jar:jackson-mapper-asl-*.jar"
+ hadoopJars="hadoop-core*.jar:jackson-core-asl-*.jar:jackson-mapper-asl-*.jar"
elif [ "${version}" = "0.20.200" ]; then
#List is separated by ":"
- hadoopJars="hadoop*core*.jar:jackson-core-asl-*.jar:jackson-mapper-asl-*.jar:commons-configuration-*.jar"
+ hadoopJars="hadoop-core*.jar:jackson-core-asl-*.jar:jackson-mapper-asl-*.jar:commons-configuration-*.jar"
+ elif [[ "${version}" =~ .*23 ]]; then
+ suffix="-[0-9.]*"
+ #List is separated by ":"
+ hadoopJars="hadoop-mapreduce-client-core${suffix}.jar:hadoop-mapreduce-client-common${suffix}.jar:hadoop-mapreduce-client-jobclient${suffix}.jar:hadoop-mapreduce-client-app${suffix}.jar:hadoop-yarn-common${suffix}.jar:hadoop-yarn-api${suffix}.jar:hadoop-hdfs${suffix}.jar:hadoop-common${suffix}.jar:hadoop-auth${suffix}.jar:guava*.jar:protobuf-*.jar:avro-ipc-*.jar:jackson-core-asl-*.jar:jackson-mapper-asl-*.jar:commons-configuration-*.jar"
else
echo
- echo "Exiting: Unsupported Hadoop version '${hadoopVer}', supported versions: 0.20.1, 0.20.2, 0.20.104 and 0.20.200"
+ echo "Exiting: Unsupported Hadoop version '${hadoopVer}', supported versions: 0.20.1, 0.20.2, 0.20.104, 0.20.200 and 0.23.x"
echo
cleanUp
exit -1;
@@ -121,6 +125,7 @@ function printUsage() {
echo " Options: -inputwar INPUT_OOZIE_WAR"
echo " -outputwar OUTPUT_OOZIE_WAR"
echo " [-hadoop HADOOP_VERSION HADOOP_PATH]"
+ echo " [-hadoopJarsSNAPSHOT] (if Hadoop jars version on system is SNAPSHOT)"
echo " [-extjs EXTJS_PATH] (expanded or ZIP)"
echo " [-jars JARS_PATH] (multiple JAR path separated by ':')"
echo
@@ -139,6 +144,7 @@ addExtjs=""
addJars=""
hadoopVersion=""
hadoopHome=""
+hadoopJarsSuffix=""
extjsHome=""
jarsPath=""
inputWar=""
@@ -166,6 +172,9 @@ do
fi
hadoopHome=$1
addHadoop=true
+ elif [ "$1" = "-hadoopJarsSNAPSHOT" ]; then
+ shift
+ hadoopJarsSuffix="SNAPSHOT"
elif [ "$1" = "-extjs" ]; then
shift
if [ $# -eq 0 ]; then
@@ -261,15 +270,18 @@ if [ "${addHadoop}" = "true" ]; then
exit -1
fi
## adding hadoop
+ echo "Injecting following Hadoop JARs"
+ echo
for jar in ${hadoopJars//:/$'\n'}
do
findFile ${hadoopHome} ${jar}
jar=${RET}
+ echo ${jar}
cp ${jar} ${tmpWarDir}/WEB-INF/lib/
checkExec "copying jar ${jar} to staging"
- done
+ done
fi
-
+
if [ "${addExtjs}" = "true" ]; then
if [ ! "${components}" = "" ];then
components="${components}, "
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1374108&r1=1374107&r2=1374108&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Thu Aug 16 23:50:05 2012
@@ -1,5 +1,6 @@
-- Oozie 3.3.0 release (trunk - unreleased)
+OOZIE-947 Forward porting OOZIE-733 to 3.2 and trunk (mona via virag)
OOZIE-889 Adding HCat credentials class for job conf (mona via virag)
OOZIE-940 Junk messages appear in tomcat log (egashira via virag)
OOZIE-955 TestCoordELFunctions and TestELConstantFunctions failing (bcry via tucu)