modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Mode.java | 13 ++++++---- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java | 3 +- modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java | 4 --- 3 files changed, 12 insertions(+), 8 deletions(-)
New commits: commit ac5e0b33dd673f1d61562e93b98ef7ba5315f330 Author: Ian Springer ian.springer@redhat.com Date: Mon Apr 30 10:05:33 2012 -0400
fix regression where discovery was defaulting the 'startScript' plugin config prop to 'bin/standalone', rather than 'bin/standalone.sh'
diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Mode.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Mode.java index 81d7ee3..ebd5ab5 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Mode.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AS7Mode.java @@ -18,6 +18,8 @@ */ package org.rhq.modules.plugins.jbossas7;
+import java.io.File; + /** * Various definitions for the operation modes of AS7 (HOST is strictly not a mode, but fits here nicely) * @@ -29,6 +31,9 @@ public enum AS7Mode { DOMAIN("domain.xml", "domain", "--domain-config", "domain", "domainConfig"), HOST("host.xml", "domain", "--host-config", "domain", "hostConfig");
+ private static final boolean OS_IS_WINDOWS = (File.separatorChar == '\'); + private static final String SCRIPT_EXTENSION = (OS_IS_WINDOWS) ? "bat" : "sh"; + private String defaultXmlFile; private String defaultBaseDir; private String configArg; @@ -55,12 +60,12 @@ public enum AS7Mode { return configArg; }
- public String getStartScriptBaseName() { - return startScriptBaseName; - } - public String getConfigPropertyName() { return configPropertyName; }
+ public String getStartScriptFileName() { + return startScriptBaseName + '.' + SCRIPT_EXTENSION; + } + } \ No newline at end of file diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java index 5428016..34f87e9 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java @@ -248,7 +248,8 @@ public abstract class BaseProcessDiscovery implements ResourceDiscoveryComponent File startScript = ServerStartScriptDiscoveryUtility.getStartScript(parentProcess); if (startScript == null) { // The parent process is not a script - fallback to the default value (e.g. "bin/standalone.sh"). - startScript = new File(getMode().getStartScriptBaseName()); + String startScriptFileName = getMode().getStartScriptFileName(); + startScript = new File(startScriptFileName); } if (!startScript.exists()) { if (!startScript.isAbsolute()) { diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java index 7b70b94..fcbdbc5 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java @@ -68,8 +68,6 @@ import org.rhq.modules.plugins.jbossas7.json.Result; public abstract class BaseServerComponent<T extends ResourceComponent<?>> extends BaseComponent<T> implements MeasurementFacet {
private static final String SEPARATOR = "\n-----------------------\n"; - private static final boolean OS_IS_WINDOWS = (File.separatorChar == '\'); - private static final String SCRIPT_EXTENSION = (OS_IS_WINDOWS) ? "bat" : "sh";
final Log log = LogFactory.getLog(BaseServerComponent.class);
@@ -282,7 +280,7 @@ public abstract class BaseServerComponent<T extends ResourceComponent<?>> extend } } else { // Use the default start script. - String startScriptFileName = getMode().getStartScriptBaseName() + "." + SCRIPT_EXTENSION; + String startScriptFileName = getMode().getStartScriptFileName(); File binDir = new File(homeDir, "bin"); startScriptFile = new File(binDir, startScriptFileName); }
rhq-commits@lists.fedorahosted.org