Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2001] remove tabs
|
From: <ma...@rh...> - 2008-11-14 16:48:05
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [2001] remove tabs</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2001</dd> <dt>Author</dt> <dd>mazz</dd> <dt>Date</dt> <dd>2008-11-14 10:47:59 -0600 (Fri, 14 Nov 2008)</dd> </dl> <h3>Log Message</h3> <pre>remove tabs</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseservercontainersrcmainbinresourcesbinrhqserversh">rhq/trunk/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseservercontainersrcmainbinresourcesbinrhqserversh"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh (2000 => 2001)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh 2008-11-14 04:48:33 UTC (rev 2000) +++ rhq/trunk/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh 2008-11-14 16:47:59 UTC (rev 2001) </span><span class="lines">@@ -233,9 +233,9 @@ </span><span class="cx"> # ---------------------------------------------------------------------- if [ -z "$RHQ_SERVER_CMDLINE_OPTS" ]; then </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> _PROPS_FILE_PATH=${RHQ_SERVER_HOME}/bin/rhq-server.properties </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> # convert paths if we are on Windows if [ -n "$_CYGWIN" ]; then _PROPS_FILE_PATH=`cygpath --windows --path "$_PROPS_FILE_PATH"` </span><span class="lines">@@ -285,15 +285,15 @@ </span><span class="cx"> echo Starting RHQ Server in console... echo "$$" > $PIDFILE </span><span class="rem">- - # start the server, making sure its working directory is the JBossAS bin directory </span><span class="add">+ + # start the server, making sure its working directory is the JBossAS bin directory </span><span class="cx"> cd ${RHQ_SERVER_HOME}/jbossas/bin $_JBOSS_RUN_SCRIPT $RHQ_SERVER_CMDLINE_OPTS </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> JBOSS_STATUS=$? </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> rm $PIDFILE </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> exit $JBOSS_STATUS ;; </span><span class="lines">@@ -307,8 +307,8 @@ </span><span class="cx"> LAUNCH_JBOSS_IN_BACKGROUND=true export LAUNCH_JBOSS_IN_BACKGROUND </span><span class="rem">- - # start the server, making sure its working directory is the JBossAS bin directory </span><span class="add">+ + # start the server, making sure its working directory is the JBossAS bin directory </span><span class="cx"> cd ${RHQ_SERVER_HOME}/jbossas/bin if [ -z "$RHQ_SERVER_DEBUG" ]; then $_JBOSS_RUN_SCRIPT $RHQ_SERVER_CMDLINE_OPTS > /dev/null 2>&1 & </span><span class="lines">@@ -317,7 +317,7 @@ </span><span class="cx"> fi echo "$!" > $PIDFILE </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> sleep 5 check_status "starting" echo $STATUS </span><span class="lines">@@ -338,10 +338,10 @@ </span><span class="cx"> fi echo Trying to stop the RHQ Server... </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> if [ -n "$_SOLARIS" ]; then </span><span class="rem">- kill -TERM `cat ${RHQ_SERVER_HOME}/jbossas/.jboss_pid` - sleep 3 </span><span class="add">+ kill -TERM `cat ${RHQ_SERVER_HOME}/jbossas/.jboss_pid` + sleep 3 </span><span class="cx"> fi echo "RHQ Server (pid=${PID}) is stopping..." </span><span class="lines">@@ -369,10 +369,10 @@ </span><span class="cx"> fi echo Trying to kill the RHQ Server... </span><span class="rem">- </span><span class="add">+ </span><span class="cx"> if [ -n "$_SOLARIS" ]; then </span><span class="rem">- kill -9 `cat ${RHQ_SERVER_HOME}/jbossas/.jboss_pid` - sleep 3 </span><span class="add">+ kill -9 `cat ${RHQ_SERVER_HOME}/jbossas/.jboss_pid` + sleep 3 </span><span class="cx"> fi echo "RHQ Server (pid=${PID}) is being killed..." </span> </pre> </div> </div> </body> </html> |