You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ve...@apache.org on 2014/03/20 00:14:34 UTC

[2/4] git commit: FALCON-363 Jetty is started with war when the war is already expanded. Contributed by Venkatesh Seetharam

FALCON-363 Jetty is started with war when the war is already expanded. Contributed by Venkatesh Seetharam


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/6504e7a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/6504e7a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/6504e7a1

Branch: refs/heads/master
Commit: 6504e7a11dc029baaa414087ed6c4d2128b6b5f2
Parents: f769933
Author: Venkatesh Seetharam <ve...@hortonworks.com>
Authored: Tue Mar 18 11:49:12 2014 -0700
Committer: Venkatesh Seetharam <ve...@hortonworks.com>
Committed: Tue Mar 18 11:49:12 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt              | 3 +++
 src/bin/service-start.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/6504e7a1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 68d900a..6aedbf0 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -257,6 +257,9 @@ Release Version: 0.4-incubating
 
     FALCON-198 Update LICENSE.txt to contain license information for all third-party libraries
 
+    FALCON-363 Jetty is started with war when the war is already expanded
+    (Venkatesh Seetharam)
+
   BUG FIXES
 
     FALCON-223: hive-exec bundles protobuf-2.4.1 which is incompatible with hadoop-2 requiring protobuf-2.5

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/6504e7a1/src/bin/service-start.sh
----------------------------------------------------------------------
diff --git a/src/bin/service-start.sh b/src/bin/service-start.sh
index 6d06ede..4a030de 100755
--- a/src/bin/service-start.sh
+++ b/src/bin/service-start.sh
@@ -52,7 +52,7 @@ while [[ ${1} =~ ^\-D ]]; do
 done
 TIME=`date +%Y%m%d%H%M%s`
 
-nohup ${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${FALCONCPPATH} org.apache.falcon.Main -app ${BASEDIR}/server/webapp/${APP_TYPE}.war $* > "${FALCON_LOG_DIR}/$APP_TYPE.out.$TIME" 2>&1 < /dev/null &
+nohup ${JAVA_BIN} ${JAVA_PROPERTIES} -cp ${FALCONCPPATH} org.apache.falcon.Main -app ${BASEDIR}/server/webapp/${APP_TYPE} $* > "${FALCON_LOG_DIR}/$APP_TYPE.out.$TIME" 2>&1 < /dev/null &
 echo $! > $FALCON_PID_FILE
 popd > /dev/null