Mailing-List: contact bigtop-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: bigtop-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1189518 - in
 /incubator/bigtop/trunk/bigtop-packages/src:
 common/oozie/create-package-layout common/oozie/oozie.init
 deb/oozie/control rpm/oozie/SPECS/oozie.spec
Date: Wed, 26 Oct 2011 22:51:42 -0000
To: bigtop-commits@incubator.apache.org
From: bmahe@apache.org
Message-Id: <20111026225142.CD67E2388A36@eris.apache.org>

Author: bmahe
Date: Wed Oct 26 22:51:42 2011
New Revision: 1189518

URL: http://svn.apache.org/viewvc?rev=1189518&view=rev
Log:
BIGTOP-182. All of Oozie wrapper scripts and init.d scripts need to start include find-java code from bigtop-utils

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/create-package-layout
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie.init
    incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control
    incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/oozie/create-package-layout
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/oozie/create-package-layout?rev=1189518&r1=1189517&r2=1189518&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/oozie/create-package-layout (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/oozie/create-package-layout Wed Oct 26 22:51:42 2011
@@ -156,24 +156,27 @@ failIfNotOK
 cat > ${BIN_DIR}/oozie <<EOF
 #!/bin/sh
 #
-#  Licensed to Cloudera, Inc. under one or more contributor license
-#  agreements.  See the NOTICE file distributed with this work for
-#  additional information regarding copyright ownership.  Cloudera,
-#  Inc. licenses this file to you under the Apache License, Version
-#  2.0 (the "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-#
-# Copyright (c) 2010-2011 Cloudera, inc.
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+  source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+  source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
 
 exec /usr/lib/oozie/bin/oozie "\$@"
 EOF

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie.init
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie.init?rev=1189518&r1=1189517&r2=1189518&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie.init (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/oozie/oozie.init Wed Oct 26 22:51:42 2011
@@ -31,6 +31,13 @@
 # Short-Description: Oozie server daemon
 ### END INIT INFO
 
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+  source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+  source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
 is_oozie_alive() {
   if [ ! -f "$OOZIE_PID" ]; then
     #not running

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control?rev=1189518&r1=1189517&r2=1189518&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/control Wed Oct 26 22:51:42 2011
@@ -23,6 +23,7 @@ Homepage: http://archive.cloudera.com/cd
 
 Package: oozie-client
 Architecture: all
+Depends: bigtop-utils
 Description: Command line utility that allows
  remote access and operation of oozie. Using this utility, the
  user can deploy workflows and perform other administrative and

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1189518&r1=1189517&r2=1189518&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec Wed Oct 26 22:51:42 2011
@@ -90,6 +90,8 @@ URL: http://www.cloudera.com
 Group: Development/Libraries
 License: APL2
 BuildArch: noarch
+Requires: bigtop-utils
+
 
 %description client
  Oozie client is a command line client utility that allows remote