modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
| 17 +++++-----
1 file changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 11e7474de60d30533b9e339014ad5d035fa6a0b4
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Mar 28 17:49:37 2012 -0400
fix bug where wrong path was being used for mgmt-users.properties file
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
index 6139dc1..8641df1 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/AbstractBaseDiscovery.java
@@ -255,7 +255,7 @@ public class AbstractBaseDiscovery {
return realm;
}
- String getSecurityPropertyFileFromHostXml(String baseDir, AS7Mode mode, String realm)
{
+ String getSecurityPropertyFileFromHostXml(File baseDir, AS7Mode mode, String realm)
{
if (hostXml == null)
throw new IllegalArgumentException(CALL_READ_STANDALONE_OR_HOST_XML_FIRST);
@@ -270,14 +270,15 @@ public class AbstractBaseDiscovery {
else
dmode = "domain";
- String fullName;
- if (relDir.equals("jboss." + dmode + ".config.dir"))
- fullName = baseDir + File.separator + mode.getBaseDir() + File.separator +
"configuration" + File.separator
- + fileName;
- else
- fullName = relDir + File.separator + fileName;
+ File configDir;
+ if (relDir.equals("jboss." + dmode + ".config.dir")) {
+ configDir = new File(baseDir, "configuration");
+ } else {
+ configDir = new File(relDir);
+ }
+ File securityPropertyFile = new File(configDir, fileName);
- return fullName;
+ return securityPropertyFile.getPath();
}
protected File getHomeDir(ProcessInfo processInfo) {
Show replies by date