modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseProcessDiscovery.java
| 6 +++---
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/BaseServerComponent.java
| 3 +++
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java
| 3 +--
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java
| 3 +--
4 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 5619c878efca96488a615418adda77d016b9a14a
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Mar 30 12:36:11 2012 +0200
config file arguments (option -c to start scripts) must be relative.
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 8557a5d..2eec0d5 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
@@ -76,7 +76,7 @@ public abstract class BaseProcessDiscovery extends
AbstractBaseDiscovery
// Only barf a stack trace for runtime exceptions.
log.error("Discovery of a " +
discoveryContext.getResourceType().getName()
+ " Resource failed for " +
processScanResult.getProcessInfo() + ".", e);
- } catch (Exception e) {
+ } catch (Exception e) {
log.error("Discovery of a " +
discoveryContext.getResourceType().getName()
+ " Resource failed for " +
processScanResult.getProcessInfo() + " - cause: " + e);
}
@@ -85,7 +85,7 @@ public abstract class BaseProcessDiscovery extends
AbstractBaseDiscovery
return discoveredResources;
}
- protected DiscoveredResourceDetails buildResourceDetails(ResourceDiscoveryContext
discoveryContext,
+ protected DiscoveredResourceDetails buildResourceDetails(ResourceDiscoveryContext
discoveryContext,
ProcessScanResult psr)
throws Exception {
Configuration pluginConfig = discoveryContext.getDefaultPluginConfiguration();
// IF SE, then look at domain/configuration/host.xml <management
interface="default" port="9990
@@ -172,7 +172,7 @@ public abstract class BaseProcessDiscovery extends
AbstractBaseDiscovery
String cwd = process.getExecutable().getCwd();
baseDir = new File(cwd, baseDirString);
if (!baseDir.exists()) {
- baseDir = new File(homeDir, baseDirString);
+ baseDir = new File(homeDir, baseDirString);
}
}
}
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 6fbfcef..20e5518 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
@@ -281,14 +281,17 @@ public class BaseServerComponent<T extends
ResourceComponent<?>> extends BaseCom
String configFile;
BaseProcessDiscovery processDiscovery;
+ String configDir = pluginConfig.getSimpleValue("configDir",null);
switch (mode) {
case STANDALONE:
processDiscovery = new StandaloneASDiscovery();
configFile = pluginConfig.getSimpleValue("config", null);
+ configFile = configDir + File.separator + configFile;
break;
case HOST:
processDiscovery = new HostControllerDiscovery();
configFile = pluginConfig.getSimpleValue("hostConfig", null);
+ configFile = configDir + File.separator + configFile;
break;
default:
throw new IllegalArgumentException("Unsupported mode: " +
mode);
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java
index 225468f..a7e684d 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/HostControllerDiscovery.java
@@ -101,8 +101,7 @@ public class HostControllerDiscovery extends BaseProcessDiscovery {
Configuration pluginConfig = details.getPluginConfiguration();
String domainConfig =
getServerConfigFromCommandLine(psr.getProcessInfo().getCommandLine(), getMode());
pluginConfig.put(new PropertySimple("domainConfig", domainConfig));
- String configDirString = pluginConfig.getSimpleValue("configDir",
null);
- pluginConfig.put(new PropertySimple("hostConfig",
getHostXmlFile(process, new File(configDirString))));
+ pluginConfig.put(new PropertySimple("hostConfig",
getHostXmlFileName(process)));
return details;
}
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java
index 4a80c60..2075385 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java
@@ -111,8 +111,7 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery {
DiscoveredResourceDetails details = super.buildResourceDetails(discoveryContext,
psr);
ProcessInfo process = psr.getProcessInfo();
Configuration pluginConfig = details.getPluginConfiguration();
- String configDirString = pluginConfig.getSimpleValue("configDir",
null);
- pluginConfig.put(new PropertySimple("config", getHostXmlFile(process,
new File(configDirString))));
+ pluginConfig.put(new PropertySimple("config",
getHostXmlFileName(process)));
return details;
}
Show replies by date