From: <hr...@rh...> - 2008-11-28 19:26:30
|
<!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] [2131] Change the way the binaries are detected.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2131</dd> <dt>Author</dt> <dd>hrupp</dd> <dt>Date</dt> <dd>2008-11-28 13:26:26 -0600 (Fri, 28 Nov 2008)</dd> </dl> <h3>Log Message</h3> <pre>Change the way the binaries are detected. Fixes RHQ-842 and RHQ-625.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulespluginsapachesrcmainjavaorgrhqpluginsapacheApacheServerComponentjava">rhq/trunk/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulespluginsapachesrcmainjavaorgrhqpluginsapacheApacheServerComponentjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java (2130 => 2131)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java 2008-11-28 16:32:33 UTC (rev 2130) +++ rhq/trunk/modules/plugins/apache/src/main/java/org/rhq/plugins/apache/ApacheServerComponent.java 2008-11-28 19:26:26 UTC (rev 2131) </span><span class="lines">@@ -301,11 +301,14 @@ </span><span class="cx"> SystemInfo systemInfo = this.resourceContext.getSystemInformation(); if (systemInfo.getOperatingSystemType() != OperatingSystemType.WINDOWS) // UNIX { </span><span class="rem">- if (this.binaryInfo.getVersion().startsWith("2.")) { </span><span class="add">+ // Try some combinations in turn + executableFile = new File(serverRoot, "bin/httpd"); + if (!executableFile.exists()) { </span><span class="cx"> executableFile = new File(serverRoot, "bin/apache2"); </span><span class="rem">- } else { - executableFile = new File(serverRoot, "bin/httpd"); </span><span class="cx"> } </span><span class="add">+ if (!executableFile.exists()) { + executableFile = new File(serverRoot, "bin/apache"); + } </span><span class="cx"> } else // Windows { executableFile = new File(serverRoot, "bin/Apache.exe"); </span><span class="lines">@@ -334,11 +337,14 @@ </span><span class="cx"> if (systemInfo.getOperatingSystemType() != OperatingSystemType.WINDOWS) // UNIX { String serverRoot = getRequiredPropertyValue(pluginConfig, PLUGIN_CONFIG_PROP_SERVER_ROOT); </span><span class="rem">- if (this.binaryInfo.getVersion().startsWith("2.")) { </span><span class="add">+ // Try different possibilities, as even on apache2 this is not always apache2ctl + controlScriptFile = new File(serverRoot, "bin/apachectl"); + if (!controlScriptFile.exists()) { </span><span class="cx"> controlScriptFile = new File(serverRoot, "bin/apache2ctl"); </span><span class="rem">- } else { - controlScriptFile = new File(serverRoot, "bin/apachectl"); </span><span class="cx"> } </span><span class="add">+ if (!controlScriptFile.exists()) { + controlScriptFile = getExecutablePath(); // fall back to the httpd binary + } </span><span class="cx"> } else // Windows { controlScriptFile = getExecutablePath(); </span> </pre> </div> </div> </body> </html> |