[jboss-cvs] JBoss Messaging SVN: r3045 - in trunk: src/etc/xmdesc and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 23 14:11:48 EDT 2007
Author: timfox
Date: 2007-08-23 14:11:48 -0400 (Thu, 23 Aug 2007)
New Revision: 3045
Modified:
trunk/src/etc/server/default/deploy/db2-persistence-service.xml
trunk/src/etc/server/default/deploy/mssql-persistence-service.xml
trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml
trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
trunk/src/etc/xmdesc/JDBCPersistenceManager-xmbean.xml
trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
trunk/src/main/org/jboss/messaging/core/jmx/JDBCPersistenceManagerService.java
trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java
trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java
trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java
Log:
Added reaperPeriod MBean parameter
Modified: trunk/src/etc/server/default/deploy/db2-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/db2-persistence-service.xml 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/src/etc/server/default/deploy/db2-persistence-service.xml 2007-08-23 18:11:48 UTC (rev 3045)
@@ -81,6 +81,8 @@
<!-- The maximum number of parameters to include in a prepared statement -->
<attribute name="MaxParams">500</attribute>
+
+ <attribute name="ReaperPeriod">5000</attribute>
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/server/default/deploy/mssql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-08-23 18:11:48 UTC (rev 3045)
@@ -84,6 +84,8 @@
<!-- The maximum number of parameters to include in a prepared statement -->
<attribute name="MaxParams">500</attribute>
+
+ <attribute name="ReaperPeriod">5000</attribute>
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-08-23 18:11:48 UTC (rev 3045)
@@ -82,6 +82,8 @@
<!-- The maximum number of parameters to include in a prepared statement -->
<attribute name="MaxParams">500</attribute>
+
+ <attribute name="ReaperPeriod">5000</attribute>
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-08-23 18:11:48 UTC (rev 3045)
@@ -84,6 +84,8 @@
<!-- The maximum number of parameters to include in a prepared statement -->
<attribute name="MaxParams">500</attribute>
+
+ <attribute name="ReaperPeriod">5000</attribute>
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-08-23 18:11:48 UTC (rev 3045)
@@ -84,6 +84,8 @@
<!-- The maximum number of parameters to include in a prepared statement -->
<attribute name="MaxParams">500</attribute>
+
+ <attribute name="ReaperPeriod">5000</attribute>
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-08-23 18:11:48 UTC (rev 3045)
@@ -89,6 +89,8 @@
<!-- The maximum number of parameters to include in a prepared statement -->
<attribute name="MaxParams">500</attribute>
+
+ <attribute name="ReaperPeriod">5000</attribute>
</mbean>
<!-- Messaging Post Office MBean configuration
Modified: trunk/src/etc/xmdesc/JDBCPersistenceManager-xmbean.xml
===================================================================
--- trunk/src/etc/xmdesc/JDBCPersistenceManager-xmbean.xml 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/src/etc/xmdesc/JDBCPersistenceManager-xmbean.xml 2007-08-23 18:11:48 UTC (rev 3045)
@@ -63,7 +63,13 @@
<description>The max number of params to be used in a generated PreparedStatement</description>
<name>MaxParams</name>
<type>int</type>
- </attribute>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getReaperPeriod" setMethod="setReaperPeriod">
+ <description>The period in ms for the reaper to kick in and delete unreferenced messages from the database</description>
+ <name>ReaperPeriod</name>
+ <type>long</type>
+ </attribute>
<!-- Managed operations -->
Modified: trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java 2007-08-23 18:11:48 UTC (rev 3045)
@@ -108,7 +108,8 @@
public JDBCPersistenceManager(DataSource ds, TransactionManager tm, Properties sqlProperties,
boolean createTablesOnStartup, boolean usingBatchUpdates,
- boolean usingBinaryStream, boolean usingTrailingByte, int maxParams)
+ boolean usingBinaryStream, boolean usingTrailingByte, int maxParams,
+ long reaperPeriod)
{
super(ds, tm, sqlProperties, createTablesOnStartup);
@@ -120,7 +121,7 @@
this.maxParams = maxParams;
- this.reaperPeriod = 5000;
+ this.reaperPeriod = reaperPeriod;
reaperTimer = new Timer(true);
Modified: trunk/src/main/org/jboss/messaging/core/jmx/JDBCPersistenceManagerService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/jmx/JDBCPersistenceManagerService.java 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/src/main/org/jboss/messaging/core/jmx/JDBCPersistenceManagerService.java 2007-08-23 18:11:48 UTC (rev 3045)
@@ -53,6 +53,8 @@
private int maxParams = 100;
+ private long reaperPeriod = 5000;
+
// Constructors --------------------------------------------------------
public JDBCPersistenceManagerService()
@@ -84,7 +86,7 @@
persistenceManager =
new JDBCPersistenceManager(ds, tm, sqlProperties,
createTablesOnStartup, usingBatchUpdates,
- usingBinaryStream, usingTrailingByte, maxParams);
+ usingBinaryStream, usingTrailingByte, maxParams, reaperPeriod);
persistenceManager.start();
@@ -160,4 +162,19 @@
{
usingTrailingByte = b;
}
+
+ public void setReaperPeriod(long reaperPeriod)
+ {
+ if (reaperPeriod <= 0)
+ {
+ throw new IllegalArgumentException("reaperPeriod must be >= 0");
+ }
+
+ this.reaperPeriod = reaperPeriod;
+ }
+
+ public long getReaperPeriod()
+ {
+ return reaperPeriod;
+ }
}
Modified: trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/tests/src/org/jboss/test/messaging/core/IdManagerTest.java 2007-08-23 18:11:48 UTC (rev 3045)
@@ -68,7 +68,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100);
+ true, true, true, false, 100, 5000);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/tests/src/org/jboss/test/messaging/core/JDBCPersistenceManagerTest.java 2007-08-23 18:11:48 UTC (rev 3045)
@@ -99,7 +99,7 @@
JDBCPersistenceManager p =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, batch, useBinaryStream, trailingByte, maxParams);
+ true, batch, useBinaryStream, trailingByte, maxParams, 5000);
((JDBCPersistenceManager)p).injectNodeID(1);
p.start();
return p;
Modified: trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java 2007-08-23 18:11:48 UTC (rev 3045)
@@ -108,7 +108,7 @@
pm = new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100);
+ true, true, true, false, 100, 5000);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java 2007-08-23 18:11:48 UTC (rev 3045)
@@ -244,7 +244,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100);
+ true, true, true, false, 100, 5000);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/PagingStateTestBase.java 2007-08-23 18:11:48 UTC (rev 3045)
@@ -93,7 +93,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100);
+ true, true, true, false, 100, 5000);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java 2007-08-23 18:11:48 UTC (rev 3045)
@@ -87,7 +87,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100);
+ true, true, true, false, 100, 5000);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2007-08-23 18:11:48 UTC (rev 3045)
@@ -112,7 +112,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100);
+ true, true, true, false, 100, 5000);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
@@ -204,7 +204,7 @@
pm =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, true, true, false, 100);
+ true, true, true, false, 100, 5000);
((JDBCPersistenceManager)pm).injectNodeID(1);
pm.start();
Modified: trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java 2007-08-23 15:43:29 UTC (rev 3044)
+++ trunk/tests/src/org/jboss/test/messaging/jms/persistence/MessagePersistenceManagerTest.java 2007-08-23 18:11:48 UTC (rev 3045)
@@ -73,7 +73,7 @@
JDBCPersistenceManager p =
new JDBCPersistenceManager(sc.getDataSource(), sc.getTransactionManager(),
sc.getPersistenceManagerSQLProperties(),
- true, batch, true, false, maxParams);
+ true, batch, true, false, maxParams, 5000);
((JDBCPersistenceManager)pm).injectNodeID(1);
p.start();
return p;
More information about the jboss-cvs-commits
mailing list