modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-cache-service.xml
| 13 ++++++----
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainSocketBindingTest.java
| 2 -
modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SocketBindingTest.java
| 2 -
3 files changed, 10 insertions(+), 7 deletions(-)
New commits:
commit f5378271fb8e90481d30a08bf5c497350bf640d0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Mar 29 21:36:17 2012 +0200
Make the cache local for now.
diff --git
a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-cache-service.xml
b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-cache-service.xml
index 4381fbb..79a9677 100644
---
a/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-cache-service.xml
+++
b/modules/enterprise/server/container/src/main/resources/jbossas/server/default/deploy/rhq-cache-service.xml
@@ -24,7 +24,7 @@
<attribute name="NodeLockingScheme">OPTIMISTIC</attribute>
<!-- Valid modes are LOCAL, REPL_ASYNC and REPL_SYNC -->
- <attribute name="CacheMode">REPL_ASYNC</attribute>
+ <attribute name="CacheMode">LOCAL</attribute>
<!-- Just used for async repl: use a replication queue -->
<attribute name="UseReplQueue">false</attribute>
@@ -45,19 +45,21 @@
e.g. file:/home/bela/default.xml
<attribute name="ClusterProperties"></attribute>
-->
+<!--
+
<attribute name="ClusterConfig">
<config>
- <!-- UDP: if you have a multihomed machine,
+ <!– UDP: if you have a multihomed machine,
set the bind_addr attribute to the appropriate NIC IP address, e.g
bind_addr="192.168.0.2"
- -->
- <!-- UDP: On Windows machines, because of the media sense feature
+ –>
+ <!– UDP: On Windows machines, because of the media sense
feature
being broken with multicast (even after disabling media sense)
set the loopback attribute to true
TODO need to parametrize and add to installer
- -->
+ –>
<UDP
mcast_addr="${jgroups.udp.mcast_addr:230.1.2.3}"
mcast_port="${jboss.alertcachepartition.mcast_port:48899}"
@@ -97,6 +99,7 @@
<pbcast.STATE_TRANSFER up_thread="true"
down_thread="true" />
</config>
</attribute>
+-->
<!-- Whether or not to fetch state on joining a cluster -->
<attribute name="FetchStateOnStartup">true</attribute>
commit 0f4fba5d025d9fc7a6cb7593bc00a55676d6b548
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Mar 29 21:30:08 2012 +0200
Make the assertion print what was wrong.
diff --git
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainSocketBindingTest.java
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainSocketBindingTest.java
index f222224..f34f674 100644
---
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainSocketBindingTest.java
+++
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/domain/DomainSocketBindingTest.java
@@ -98,7 +98,7 @@ public class DomainSocketBindingTest extends AbstractJBossAS7PluginTest
{
configuration = loadConfig();
pl = (PropertyList) configuration.get("*");
- assert pl.getList().size() == count+1;
+ assert pl.getList().size() == count+1 : "Got only " +
pl.getList().size() + " items, expected "+ count+1;
}
@Test(priority = 11)
diff --git
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SocketBindingTest.java
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SocketBindingTest.java
index 8cd26d6..df9eb7a 100644
---
a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SocketBindingTest.java
+++
b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/standalone/SocketBindingTest.java
@@ -95,7 +95,7 @@ public class SocketBindingTest extends AbstractJBossAS7PluginTest {
configuration = loadConfig();
pl = (PropertyList) configuration.get("*");
- assert pl.getList().size() == count+1;
+ assert pl.getList().size() == count+1 : "Got only " +
pl.getList().size() + " items, expected "+ count+1;
}
@Test(priority = 11)
Show replies by date