modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java
| 8 +-------
modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java
| 2 +-
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 1e8fb58daad6cf30d410480714e8b3fe93e41551
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Mar 26 14:29:48 2010 +0100
Fix an omission and clean up
diff --git
a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java
b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java
index 3b47e95..6f6235a 100644
---
a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java
+++
b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ConfigurationBean.java
@@ -768,19 +768,13 @@ public class ConfigurationBean {
Class clazz = SecureIdentityLoginModule.class;
Method m = clazz.getDeclaredMethod("encode",String.class);
m.setAccessible(true);
- String res = (String) m.invoke(lm,"rhqadmin");
+ String res = (String) m.invoke(lm,password);
return res;
} catch (Exception e) {
throw new Exception("Encoding db password failed: " , e);
}
}
- private boolean isWindows() {
- String osName = System.getProperty("os.name").toLowerCase(Locale.US);
-
- return osName.indexOf("windows") > -1;
- }
-
private Properties getConfigurationAsProperties(List<PropertyItemWithValue>
config) {
Properties props = new Properties();
diff --git
a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java
b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java
index 5af10d0..425dc01 100644
---
a/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java
+++
b/modules/enterprise/gui/installer-war/src/main/java/org/rhq/enterprise/installer/ServerInformation.java
@@ -529,7 +529,7 @@ public class ServerInformation {
return deployDirectory;
}
- protected File getBinDirectory() {
+ private File getBinDirectory() {
if (binDirectory == null) {
MBeanServer mbs = getMBeanServer();
ObjectName name =
ObjectNameFactory.create("jboss.system:type=ServerConfig");
Show replies by date