modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
| 2 ++
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
| 6 +++---
modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
| 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
New commits:
commit c72a6387fa4b79da75d53d27aef535ced9f1ef17
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sat Aug 24 19:36:40 2013 +0200
BZ 973299 - fix a typo.
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 82ff294..2c8bcbe 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -283,13 +283,13 @@
</resources>
</module>
]]></echo>
-
+
<echo>Updating JGroups module component for EAP to
${jgroups.patch.version}</echo>
<!-- Remove the unpatched version -->
<delete
file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar"
/>
<delete
file="${jboss.home}/modules/system/layers/base/org/jgroups/main/jgroups-${jgroups.initial.version}.jar.index"
/>
<!-- Update the module metadata to the patched version -->
- <replace
file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml"
+ <replace
file="${jboss.home}/modules/system/layers/base/org/jgroups/main/module.xml"
token="jgroups-${jgroups.initial.version}.jar"
value="jgroups-${jgroups.patch.version}.jar"/>
<!-- Copy in patched version -->
<copy
file="${settings.localRepository}/org/jgroups/jgroups/${jgroups.patch.version}/jgroups-${jgroups.patch.version}.jar"
@@ -461,7 +461,7 @@
rhq.server.quartz.driverDelegateClass=${rhq.server.quartz.driverDelegateClass}
#############################################################################
# Server Settings
# ---------------
-# These are miscallenous settings that the server will use to customize itself
+# These are miscellaneous settings that the server will use to customize itself
# to the environment in which it is running. These are settings you usually
# want to change or at least be aware of.
#############################################################################
commit 1f3165b51d29b72c71d88e5bc6d4f69caedf629b
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sat Aug 24 17:39:42 2013 +0200
BZ 991202 Also log JBAS014792 only at debug level
diff --git
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
index 662d6ef..1524816 100644
---
a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
+++
b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/ASConnection.java
@@ -322,7 +322,7 @@ public class ASConnection {
}
if (responseBody.contains("JBAS014807") ||
responseBody.contains("JBAS010850")
- || responseBody.contains("JBAS014793")) {
+ || responseBody.contains("JBAS014792") ||
responseBody.contains("JBAS014793")) {
// management resource not found or not readable or no known
child-type
if (LOG.isDebugEnabled()) {
LOG.debug("Requested management resource not found: " +
operation.getAddress().getPath());
commit d5baeca89902b35a8fadf49f163dc70e7e102084
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Sat Aug 24 17:36:55 2013 +0200
If the JMX-port is a string with quotes around, strip them.
diff --git
a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
index bc98a20..6b5c6cf 100644
---
a/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
+++
b/modules/common/cassandra-installer/src/main/java/org/rhq/storage/installer/StorageInstaller.java
@@ -750,6 +750,8 @@ public class StorageInstaller {
throw new RuntimeException("Cannot determine JMX port");
}
+ jmxPort = jmxPort.replaceAll("\"","");
+
return Integer.parseInt(jmxPort);
} catch (IOException e) {
log.error("Failed to parse JMX port. There was an unexpected IO
error", e);
Show replies by date