[jboss-cvs] JBoss Messaging SVN: r4951 - in trunk: src/main/org/jboss/messaging/core/config and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 16 10:42:31 EDT 2008
Author: clebert.suconic at jboss.com
Date: 2008-09-16 10:42:31 -0400 (Tue, 16 Sep 2008)
New Revision: 4951
Modified:
trunk/src/config/jbm-configuration.xml
trunk/src/config/queues.xml
trunk/src/main/org/jboss/messaging/core/config/Configuration.java
trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java
trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
trunk/tests/src/org/jboss/messaging/tests/stress/paging/MultipleDestinationPagingTest.java
Log:
JBMESSAGING-1314 - Renaming attribute on config and few tweaks on configs
Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml 2008-09-16 12:36:55 UTC (rev 4950)
+++ trunk/src/config/jbm-configuration.xml 2008-09-16 14:42:31 UTC (rev 4951)
@@ -98,7 +98,7 @@
<paging-directory>data/paging</paging-directory>
- <max-global-size-bytes>104857600</max-global-size-bytes>
+ <paging-max-global-size-bytes>104857600</paging-max-global-size-bytes>
<!-- Storage configuration -->
Modified: trunk/src/config/queues.xml
===================================================================
--- trunk/src/config/queues.xml 2008-09-16 12:36:55 UTC (rev 4950)
+++ trunk/src/config/queues.xml 2008-09-16 14:42:31 UTC (rev 4951)
@@ -94,7 +94,7 @@
</queue-settings>
<queue-settings match="queuejms.MyQueue">
- <max-size-bytes>104857600</max-size-bytes>
+ <max-size-bytes>-1</max-size-bytes>
<page-size-bytes>10485760</page-size-bytes>
<drop-messages-when-full>false</drop-messages-when-full>
</queue-settings>
Modified: trunk/src/main/org/jboss/messaging/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-09-16 12:36:55 UTC (rev 4950)
+++ trunk/src/main/org/jboss/messaging/core/config/Configuration.java 2008-09-16 14:42:31 UTC (rev 4951)
@@ -141,8 +141,8 @@
void setCreateJournalDir(boolean create);
- long getMaxGlobalSizeBytes();
+ long getPagingMaxGlobalSizeBytes();
- void setMaxGlobalSizeBytes(long maxGlobalSize);
+ void setPagingMaxGlobalSizeBytes(long maxGlobalSize);
}
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-09-16 12:36:55 UTC (rev 4950)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/ConfigurationImpl.java 2008-09-16 14:42:31 UTC (rev 4951)
@@ -116,7 +116,7 @@
// Paging related attributes
- protected long maxGlobalSize = -1;
+ protected long pagingMaxGlobalSize = -1;
protected String pagingDirectory = DEFAULT_PAGING_DIR;
@@ -397,14 +397,14 @@
}
- public long getMaxGlobalSizeBytes()
+ public long getPagingMaxGlobalSizeBytes()
{
- return this.maxGlobalSize;
+ return this.pagingMaxGlobalSize;
}
- public void setMaxGlobalSizeBytes(long maxGlobalSize)
+ public void setPagingMaxGlobalSizeBytes(long maxGlobalSize)
{
- this.maxGlobalSize = maxGlobalSize;
+ this.pagingMaxGlobalSize = maxGlobalSize;
}
Modified: trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-09-16 12:36:55 UTC (rev 4950)
+++ trunk/src/main/org/jboss/messaging/core/config/impl/FileConfiguration.java 2008-09-16 14:42:31 UTC (rev 4951)
@@ -314,7 +314,7 @@
pagingDirectory = getString(e, "paging-directory", pagingDirectory);
- maxGlobalSize = getLong(e, "max-global-size-bytes", maxGlobalSize);
+ pagingMaxGlobalSize = getLong(e, "paging-max-global-size-bytes", pagingMaxGlobalSize);
createJournalDir = getBoolean(e, "create-journal-dir", createJournalDir);
Modified: trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java 2008-09-16 12:36:55 UTC (rev 4950)
+++ trunk/src/main/org/jboss/messaging/core/management/MessagingServerControlMBean.java 2008-09-16 14:42:31 UTC (rev 4951)
@@ -98,7 +98,7 @@
public int getJournalBufferReuseSize();
- public long getMaxGlobalSizeBytes();
+ public long getPagingMaxGlobalSizeBytes();
public int getPacketConfirmationBatchSize();
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java 2008-09-16 12:36:55 UTC (rev 4950)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/MessagingServerControl.java 2008-09-16 14:42:31 UTC (rev 4951)
@@ -290,9 +290,9 @@
return configuration.getJournalType().toString();
}
- public long getMaxGlobalSizeBytes()
+ public long getPagingMaxGlobalSizeBytes()
{
- return configuration.getMaxGlobalSizeBytes();
+ return configuration.getPagingMaxGlobalSizeBytes();
}
public int getPacketConfirmationBatchSize()
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-09-16 12:36:55 UTC (rev 4950)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-09-16 14:42:31 UTC (rev 4951)
@@ -192,7 +192,7 @@
PagingStoreFactory storeFactory = new PagingManagerFactoryNIO(configuration.getPagingDirectory());
- pagingManager = new PagingManagerImpl(storeFactory, storageManager, queueSettingsRepository, configuration.getMaxGlobalSizeBytes());
+ pagingManager = new PagingManagerImpl(storeFactory, storageManager, queueSettingsRepository, configuration.getPagingMaxGlobalSizeBytes());
storeFactory.setPagingManager(pagingManager);
Modified: trunk/tests/src/org/jboss/messaging/tests/stress/paging/MultipleDestinationPagingTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/stress/paging/MultipleDestinationPagingTest.java 2008-09-16 12:36:55 UTC (rev 4950)
+++ trunk/tests/src/org/jboss/messaging/tests/stress/paging/MultipleDestinationPagingTest.java 2008-09-16 14:42:31 UTC (rev 4951)
@@ -39,8 +39,8 @@
/**
*
- * TODO: This is an integration-tests that will take some time to run.
- * Maybe it should be placed on stress-tests?
+ * This is an integration-tests that will take some time to run.
+ * TODO: Maybe this test belongs somewhere else?
*
* @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
*
@@ -79,7 +79,7 @@
if (globalPage)
{
- config.setMaxGlobalSizeBytes(20*1024*1024);
+ config.setPagingMaxGlobalSizeBytes(20*1024*1024);
}
else
{
More information about the jboss-cvs-commits
mailing list