[jboss-cvs] JBoss Messaging SVN: r8279 - in branches/Branch_1_4: integration/AS5/etc/xmdesc and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 26 02:03:23 EDT 2011
Author: gaohoward
Date: 2011-04-26 02:03:22 -0400 (Tue, 26 Apr 2011)
New Revision: 8279
Modified:
branches/Branch_1_4/docs/userguide/en/modules/configuration.xml
branches/Branch_1_4/integration/AS5/etc/xmdesc/ServerPeer-xmbean.xml
branches/Branch_1_4/integration/EAP4/etc/xmdesc/ServerPeer-xmbean.xml
branches/Branch_1_4/integration/EAP5/etc/xmdesc/ServerPeer-xmbean.xml
branches/Branch_1_4/src/main/org/jboss/jms/server/ServerPeer.java
branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java
Log:
JBMESSAGING-1853
rename the attribute
Modified: branches/Branch_1_4/docs/userguide/en/modules/configuration.xml
===================================================================
--- branches/Branch_1_4/docs/userguide/en/modules/configuration.xml 2011-04-25 04:56:36 UTC (rev 8278)
+++ branches/Branch_1_4/docs/userguide/en/modules/configuration.xml 2011-04-26 06:03:22 UTC (rev 8279)
@@ -394,8 +394,8 @@
to false, transaction creation time won't be recorded. Default is false.</para>
</section>
- <section id="conf.serverpeer.attributes.crashserverondbfailure">
- <title>CrashServerOnDBFailure</title>
+ <section id="conf.serverpeer.attributes.stopserverpeerondbfailure">
+ <title>StopServerPeerOnDBFailure</title>
<para>Controls Whether or not to crash the server if DB failed to work. If this
parameter is set to true, the server will crash itself at the moment when it encounters
Modified: branches/Branch_1_4/integration/AS5/etc/xmdesc/ServerPeer-xmbean.xml
===================================================================
--- branches/Branch_1_4/integration/AS5/etc/xmdesc/ServerPeer-xmbean.xml 2011-04-25 04:56:36 UTC (rev 8278)
+++ branches/Branch_1_4/integration/AS5/etc/xmdesc/ServerPeer-xmbean.xml 2011-04-26 06:03:22 UTC (rev 8279)
@@ -247,9 +247,9 @@
<type>boolean</type>
</attribute>
- <attribute access="read-write" getMethod="isCrashServerOnDBFailure" setMethod="setCrashServerOnDBFailure">
+ <attribute access="read-write" getMethod="isStopServerPeerOnDBFailure" setMethod="setStopServerPeerOnDBFailure">
<description>Whether or not to crash the server if DB failed to work.</description>
- <name>CrashServerOnDBFailure</name>
+ <name>StopServerPeerOnDBFailure</name>
<type>boolean</type>
</attribute>
Modified: branches/Branch_1_4/integration/EAP4/etc/xmdesc/ServerPeer-xmbean.xml
===================================================================
--- branches/Branch_1_4/integration/EAP4/etc/xmdesc/ServerPeer-xmbean.xml 2011-04-25 04:56:36 UTC (rev 8278)
+++ branches/Branch_1_4/integration/EAP4/etc/xmdesc/ServerPeer-xmbean.xml 2011-04-26 06:03:22 UTC (rev 8279)
@@ -248,9 +248,9 @@
<type>boolean</type>
</attribute>
- <attribute access="read-write" getMethod="isCrashServerOnDBFailure" setMethod="setCrashServerOnDBFailure">
+ <attribute access="read-write" getMethod="isStopServerPeerOnDBFailure" setMethod="setStopServerPeerOnDBFailure">
<description>Whether or not to crash the server if DB failed to work.</description>
- <name>CrashServerOnDBFailure</name>
+ <name>StopServerPeerOnDBFailure</name>
<type>boolean</type>
</attribute>
Modified: branches/Branch_1_4/integration/EAP5/etc/xmdesc/ServerPeer-xmbean.xml
===================================================================
--- branches/Branch_1_4/integration/EAP5/etc/xmdesc/ServerPeer-xmbean.xml 2011-04-25 04:56:36 UTC (rev 8278)
+++ branches/Branch_1_4/integration/EAP5/etc/xmdesc/ServerPeer-xmbean.xml 2011-04-26 06:03:22 UTC (rev 8279)
@@ -253,9 +253,9 @@
<type>boolean</type>
</attribute>
- <attribute access="read-write" getMethod="isCrashServerOnDBFailure" setMethod="setCrashServerOnDBFailure">
+ <attribute access="read-write" getMethod="isStopServerPeerOnDBFailure" setMethod="setStopServerPeerOnDBFailure">
<description>Whether or not to crash the server if DB failed to work.</description>
- <name>CrashServerOnDBFailure</name>
+ <name>StopServerPeerOnDBFailure</name>
<type>boolean</type>
</attribute>
Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/server/ServerPeer.java 2011-04-25 04:56:36 UTC (rev 8278)
+++ branches/Branch_1_4/src/main/org/jboss/jms/server/ServerPeer.java 2011-04-26 06:03:22 UTC (rev 8279)
@@ -186,7 +186,7 @@
private boolean supportsTxAge;
- private volatile boolean crashServerOnDBFailure;
+ private volatile boolean stopServerPeerOnDBFailure;
// wired components
@@ -273,7 +273,7 @@
if (persistenceManager instanceof JDBCPersistenceManager)
{
((JDBCPersistenceManager)persistenceManager).injectNodeID(serverPeerID);
- ((JDBCPersistenceManager)persistenceManager).setCrashServerOnDBFailure(this.crashServerOnDBFailure);
+ ((JDBCPersistenceManager)persistenceManager).setStopServerPeerOnDBFailure(this.stopServerPeerOnDBFailure);
}
else if (persistenceManager instanceof NullPersistenceManager)
{
@@ -2070,17 +2070,17 @@
}
}
- public boolean isCrashServerOnDBFailure()
+ public boolean isStopServerPeerOnDBFailure()
{
- return crashServerOnDBFailure;
+ return stopServerPeerOnDBFailure;
}
- public void setCrashServerOnDBFailure(boolean crashServer)
+ public void setStopServerPeerOnDBFailure(boolean crashServer)
{
- this.crashServerOnDBFailure = crashServer;
+ this.stopServerPeerOnDBFailure = crashServer;
if (persistenceManager != null && (persistenceManager instanceof JDBCPersistenceManager))
{
- ((JDBCPersistenceManager)persistenceManager).setCrashServerOnDBFailure(crashServer);
+ ((JDBCPersistenceManager)persistenceManager).setStopServerPeerOnDBFailure(crashServer);
}
}
Modified: branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2011-04-25 04:56:36 UTC (rev 8278)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2011-04-26 06:03:22 UTC (rev 8279)
@@ -112,7 +112,7 @@
private boolean retryOnConnectionFailure = false;
- private volatile boolean crashServerOnDBFailure = false;
+ private volatile boolean stopServerPeerOnDBFailure = false;
// Constructors --------------------------------------------------
@@ -3455,7 +3455,7 @@
@Override
public void handleFatalDBError(String msg) throws Exception
{
- if (crashServerOnDBFailure)
+ if (stopServerPeerOnDBFailure)
{
log.error(this + " Crash the server due to fatal DB error: " + msg);
Runtime.getRuntime().halt(1853);
@@ -3608,9 +3608,9 @@
}
}
- public void setCrashServerOnDBFailure(boolean crashServerOnDBFailure)
+ public void setStopServerPeerOnDBFailure(boolean crashServerOnDBFailure)
{
- this.crashServerOnDBFailure = crashServerOnDBFailure;
+ this.stopServerPeerOnDBFailure = crashServerOnDBFailure;
}
}
Modified: branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2011-04-25 04:56:36 UTC (rev 8278)
+++ branches/Branch_1_4/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java 2011-04-26 06:03:22 UTC (rev 8279)
@@ -1292,7 +1292,7 @@
@Override
public void handleFatalDBError(String msg) throws Exception
{
- if (serverPeer.isCrashServerOnDBFailure())
+ if (serverPeer.isStopServerPeerOnDBFailure())
{
log.error(this + " Crash the server due to fatal DB error: " + msg);
Runtime.getRuntime().halt(1853);
Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java 2011-04-25 04:56:36 UTC (rev 8278)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java 2011-04-26 06:03:22 UTC (rev 8279)
@@ -216,20 +216,20 @@
assertEquals(on, defaultExpiry);
}
- public void testSetGetCrashServerOnDBFailure() throws Exception
+ public void testSetGetStopServerPeerOnDBFailure() throws Exception
{
if(!ServerManagement.isServerPeerStarted())
{
ServerManagement.startServerPeer();
}
- Boolean defValue = (Boolean)ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "CrashServerOnDBFailure");
+ Boolean defValue = (Boolean)ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "StopServerPeerOnDBFailure");
assertFalse(defValue);
- ServerManagement.setAttribute(ServerManagement.getServerPeerObjectName(), "CrashServerOnDBFailure", "true");
+ ServerManagement.setAttribute(ServerManagement.getServerPeerObjectName(), "StopServerPeerOnDBFailure", "true");
- Boolean newValue = (Boolean)ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "CrashServerOnDBFailure");
+ Boolean newValue = (Boolean)ServerManagement.getAttribute(ServerManagement.getServerPeerObjectName(), "StopServerPeerOnDBFailure");
assertTrue(newValue);
}
More information about the jboss-cvs-commits
mailing list