[jboss-cvs] JBoss Messaging SVN: r5983 - in trunk/tests/src/org/jboss/messaging/tests: util and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2009-03-03 22:24:16 -0500 (Tue, 03 Mar 2009)
New Revision: 5983

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
   trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
Log:
Setting NIO as the default journal on ServiceTestBase, until we speed up native buffers creation

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java	2009-03-04 02:48:49 UTC (rev 5982)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java	2009-03-04 03:24:16 UTC (rev 5983)
@@ -33,6 +33,7 @@
 import org.jboss.messaging.core.config.impl.ConfigurationImpl;
 import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
 import org.jboss.messaging.core.remoting.impl.invm.TransportConstants;
+import org.jboss.messaging.core.server.JournalType;
 import org.jboss.messaging.core.server.Messaging;
 
 /**
@@ -85,6 +86,8 @@
       backupConf.setBindingsDirectory(getBindingsDir(getTestDir() + "/backup"));
       backupConf.setPagingDirectory(getPageDir(getTestDir() + "/backup"));
       backupConf.setJournalFileSize(100 * 1024);
+      
+      backupConf.setJournalType(JournalType.NIO);
 
       backupConf.setSecurityEnabled(false);
       backupParams.put(TransportConstants.SERVER_ID_PROP_NAME, 1);
@@ -104,7 +107,10 @@
       liveConf.setPagingDirectory(getPageDir(getTestDir() + "/live"));
 
       liveConf.setJournalFileSize(100 * 1024);
+      
+      liveConf.setJournalType(JournalType.NIO);
 
+
       liveConf.setSecurityEnabled(false);
       liveConf.getAcceptorConfigurations()
               .add(new TransportConfiguration(InVMAcceptorFactory.class.getCanonicalName()));

Modified: trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java	2009-03-04 02:48:49 UTC (rev 5982)
+++ trunk/tests/src/org/jboss/messaging/tests/util/ServiceTestBase.java	2009-03-04 03:24:16 UTC (rev 5983)
@@ -37,6 +37,7 @@
 import org.jboss.messaging.core.logging.Logger;
 import org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory;
 import org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory;
+import org.jboss.messaging.core.server.JournalType;
 import org.jboss.messaging.core.server.Messaging;
 import org.jboss.messaging.core.server.MessagingService;
 import org.jboss.messaging.core.settings.impl.AddressSettings;
@@ -193,6 +194,7 @@
       configuration.setJournalMinFiles(2);
       configuration.setJournalDirectory(getJournalDir(index));
       configuration.setJournalFileSize(100 * 1024);
+      configuration.setJournalType(JournalType.NIO);
       configuration.setPagingDirectory(getPageDir(index));
       configuration.setLargeMessagesDirectory(getLargeMessagesDir(index));
 
@@ -217,6 +219,8 @@
       configuration.setJournalFileSize(100 * 1024);
       configuration.setPagingDirectory(getPageDir());
       configuration.setLargeMessagesDirectory(getLargeMessagesDir());
+      
+      configuration.setJournalType(JournalType.NIO);
 
       configuration.getAcceptorConfigurations().clear();