You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dd...@apache.org on 2011/12/12 06:53:04 UTC
svn commit: r1213148 - in /incubator/ambari/trunk: CHANGES.txt
client/bin/ambari client/bin/ambari-config.sh client/conf/ambari-env.sh
controller/conf/ambari-env.sh
Author: ddas
Date: Mon Dec 12 05:53:03 2011
New Revision: 1213148
URL: http://svn.apache.org/viewvc?rev=1213148&view=rev
Log:
AMBARI-152. Fixes issues in the shell scripts.
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/client/bin/ambari
incubator/ambari/trunk/client/bin/ambari-config.sh
incubator/ambari/trunk/client/conf/ambari-env.sh
incubator/ambari/trunk/controller/conf/ambari-env.sh
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1213148&r1=1213147&r2=1213148&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Mon Dec 12 05:53:03 2011
@@ -2,6 +2,8 @@ Ambari Change log
Release 0.1.0 - unreleased
+ AMBARI-152. Fixes issues in the shell scripts (ddas)
+
AMBARI-148. Refactors StateMachineInvoker (ddas)
AMBARI-151. Fix TestHardware when in offline mode. (omalley)
Modified: incubator/ambari/trunk/client/bin/ambari
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/bin/ambari?rev=1213148&r1=1213147&r2=1213148&view=diff
==============================================================================
--- incubator/ambari/trunk/client/bin/ambari (original)
+++ incubator/ambari/trunk/client/bin/ambari Mon Dec 12 05:53:03 2011
@@ -97,7 +97,7 @@ else
echo
else
# run command
- RUN="${JAVA_HOME}/bin/java ${JAVA_OPT} -Djava.library.path=${JAVA_LIBRARY_PATH} -DPID=${PID} -DAMBARI_HOME=${AMBARI_HOME} -DAMBARI_CONF_DIR=${AMBARI_CONF_DIR} -DAMBARI_LOG_DIR=${AMBARI_LOG_DIR} -DAMBARI_DATA_DIR=${AMBARI_DATA_DIR} -DAPP=${APP} -Dlog4j.configuration=log4j.properties -classpath ${AMBARI_CONF_DIR}:${CLASSPATH}:${AMBARI_CORE}:${AMBARI_JAR}:${COMMON}:${tools} ${CLASS} $OPTS $@"
+ RUN="${JAVA_HOME}/bin/java ${JAVA_OPT} -Djava.library.path=${JAVA_LIBRARY_PATH} -DPID=${PID} -DAMBARI_HOME=${AMBARI_HOME} -DAMBARI_CONF_DIR=${AMBARI_CONF_DIR} -DAMBARI_LOG_DIR=${AMBARI_LOG_DIR} -DAMBARI_DATA_DIR=${AMBARI_DATA_DIR} -DAPP=${APP} -Dlog4j.configuration=log4j.properties -classpath ${AMBARI_CONF_DIR}:${CLASSPATH}:${AMBARI_CONTROLLER}:${AMBARI_JAR}:${COMMON}:${tools} ${CLASS} $OPTS $@"
if [ "$BACKGROUND" = "true" ]; then
exec ${RUN} &
else
Modified: incubator/ambari/trunk/client/bin/ambari-config.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/bin/ambari-config.sh?rev=1213148&r1=1213147&r2=1213148&view=diff
==============================================================================
--- incubator/ambari/trunk/client/bin/ambari-config.sh (original)
+++ incubator/ambari/trunk/client/bin/ambari-config.sh Mon Dec 12 05:53:03 2011
@@ -78,7 +78,7 @@ fi
COMMON="${AMBARI_HOME}/share/ambari/*:${AMBARI_HOME}/share/ambari/lib/*"
-export AMBARI_CORE=${AMBARI_HOME}/ambari-core-${AMBARI_VERSION}.jar
+export AMBARI_CONTROLLER=${AMBARI_HOME}/ambari-controller-${AMBARI_VERSION}.jar
export AMBARI_AGENT=${AMBARI_HOME}/ambari-agent-${AMBARI_VERSION}.jar
export CURRENT_DATE=`date +%Y%m%d%H%M`
Modified: incubator/ambari/trunk/client/conf/ambari-env.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/client/conf/ambari-env.sh?rev=1213148&r1=1213147&r2=1213148&view=diff
==============================================================================
--- incubator/ambari/trunk/client/conf/ambari-env.sh (original)
+++ incubator/ambari/trunk/client/conf/ambari-env.sh Mon Dec 12 05:53:03 2011
@@ -1 +0,0 @@
-export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home
Modified: incubator/ambari/trunk/controller/conf/ambari-env.sh
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/controller/conf/ambari-env.sh?rev=1213148&r1=1213147&r2=1213148&view=diff
==============================================================================
--- incubator/ambari/trunk/controller/conf/ambari-env.sh (original)
+++ incubator/ambari/trunk/controller/conf/ambari-env.sh Mon Dec 12 05:53:03 2011
@@ -13,5 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home
AMBARI_PID_DIR=/tmp