JBoss hornetq SVN: r10715 - in trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress: journal and 1 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-23 09:21:24 -0400 (Mon, 23 May 2011)
New Revision: 10715
Modified:
trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/chunk/LargeMessageStressTest.java
trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/JournalCleanupCompactStressTest.java
trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageCursorStressTest.java
Log:
fixing build on stress-tests
Modified: trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/chunk/LargeMessageStressTest.java
===================================================================
--- trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/chunk/LargeMessageStressTest.java 2011-05-23 10:41:23 UTC (rev 10714)
+++ trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/chunk/LargeMessageStressTest.java 2011-05-23 13:21:24 UTC (rev 10715)
@@ -13,7 +13,7 @@
package org.hornetq.tests.stress.chunk;
-import org.hornetq.tests.largemessage.LargeMessageTestBase;
+import org.hornetq.tests.integration.largemessage.LargeMessageTestBase;
/**
* A MessageChunkSoakTest
Modified: trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/JournalCleanupCompactStressTest.java
===================================================================
--- trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/JournalCleanupCompactStressTest.java 2011-05-23 10:41:23 UTC (rev 10714)
+++ trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/journal/JournalCleanupCompactStressTest.java 2011-05-23 13:21:24 UTC (rev 10715)
@@ -40,8 +40,8 @@
import org.hornetq.core.journal.impl.JournalImpl;
import org.hornetq.core.journal.impl.NIOSequentialFileFactory;
import org.hornetq.core.persistence.impl.journal.OperationContextImpl;
+import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.tests.util.RandomUtil;
import org.hornetq.utils.HornetQThreadFactory;
import org.hornetq.utils.OrderedExecutorFactory;
import org.hornetq.utils.SimpleIDGenerator;
Modified: trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageCursorStressTest.java
===================================================================
--- trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageCursorStressTest.java 2011-05-23 10:41:23 UTC (rev 10714)
+++ trunk/tests/stress-tests/src/test/java/org/hornetq/tests/stress/paging/PageCursorStressTest.java 2011-05-23 13:21:24 UTC (rev 10715)
@@ -97,7 +97,7 @@
PageCursorProviderImpl cursorProvider = new PageCursorProviderImpl(lookupPageStore(ADDRESS),
server.getStorageManager(),
- server.getExecutorFactory(),
+ server.getExecutorFactory().getExecutor(),
5);
for (int i = 0; i < numberOfPages; i++)
14 years, 7 months
JBoss hornetq SVN: r10714 - trunk/tests/integration-tests.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-23 06:41:23 -0400 (Mon, 23 May 2011)
New Revision: 10714
Modified:
trunk/tests/integration-tests/pom.xml
Log:
Depend dependency scope be 'compile' (as there is code there)
Modified: trunk/tests/integration-tests/pom.xml
===================================================================
--- trunk/tests/integration-tests/pom.xml 2011-05-23 10:02:55 UTC (rev 10713)
+++ trunk/tests/integration-tests/pom.xml 2011-05-23 10:41:23 UTC (rev 10714)
@@ -16,13 +16,13 @@
<groupId>org.hornetq.tests</groupId>
<artifactId>jms-tests</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.hornetq.tests</groupId>
<artifactId>unit-tests</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
14 years, 7 months
JBoss hornetq SVN: r10713 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-23 06:02:55 -0400 (Mon, 23 May 2011)
New Revision: 10713
Modified:
trunk/README
Log:
Document maven 'release' profile.
Modified: trunk/README
===================================================================
--- trunk/README 2011-05-21 16:29:14 UTC (rev 10712)
+++ trunk/README 2011-05-23 10:02:55 UTC (rev 10713)
@@ -31,6 +31,10 @@
% mvn install
% mvn site # (this currently does not work)
+* To build a release artifact
+
+% mvn install -Prelease
+
* Eclipse
** Use the Maven eclipse plugin to configure the sub-projects
14 years, 7 months
JBoss hornetq SVN: r10712 - in trunk: tests/integration-tests/src/test/java/org/hornetq/tests/integration/client and 3 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-21 12:29:14 -0400 (Sat, 21 May 2011)
New Revision: 10712
Modified:
trunk/hornetq.ipr
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TemporaryQueueTest.java
trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
trunk/tests/unit-tests/src/main/java/org/hornetq/tests/util/RandomUtil.java
trunk/tests/unit-tests/src/main/java/org/hornetq/tests/util/UnitTestCase.java
trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java
Log:
fixing build with changes from Branch_2_2 on tests
Modified: trunk/hornetq.ipr
===================================================================
--- trunk/hornetq.ipr 2011-05-20 15:47:57 UTC (rev 10711)
+++ trunk/hornetq.ipr 2011-05-21 16:29:14 UTC (rev 10712)
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
+ <component name="ASMPluginConfiguration">
+ <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
+ <groovy codeStyle="LEGACY" />
+ </component>
<component name="AntConfiguration">
<defaultAnt bundledAnt="true" />
<buildFile url="file://$PROJECT_DIR$/build-hornetq.xml">
@@ -85,7 +89,7 @@
<element module="All" copyright="new" />
</module2copyright>
</component>
- <component name="CppTools.Loader" reportImplicitCastToBool="false" warnedAboutFileOutOfSourceRoot="true" version="1" currentProject="$PROJECT_DIR$/native/Makefile" />
+ <component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" warnedAboutFileOutOfSourceRoot="true" version="3" currentProject="$PROJECT_DIR$/native/Makefile" compilerSelect="AUTO" />
<component name="DependenciesAnalyzeManager">
<option name="myForwardDirection" value="false" />
</component>
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java 2011-05-20 15:47:57 UTC (rev 10711)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/PagingTest.java 2011-05-21 16:29:14 UTC (rev 10712)
@@ -13,10 +13,13 @@
package org.hornetq.tests.integration.client;
+import java.io.IOException;
+import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -42,9 +45,16 @@
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.DivertConfiguration;
import org.hornetq.core.journal.IOAsyncTask;
+import org.hornetq.core.journal.PreparedTransactionInfo;
+import org.hornetq.core.journal.RecordInfo;
+import org.hornetq.core.journal.impl.JournalImpl;
+import org.hornetq.core.journal.impl.NIOSequentialFileFactory;
import org.hornetq.core.logging.Logger;
+import org.hornetq.core.paging.Page;
+import org.hornetq.core.paging.PagedMessage;
import org.hornetq.core.paging.PagingManager;
import org.hornetq.core.paging.PagingStore;
+import org.hornetq.core.paging.cursor.impl.PagePositionImpl;
import org.hornetq.core.paging.impl.TestSupportPageStore;
import org.hornetq.core.persistence.OperationContext;
import org.hornetq.core.persistence.impl.journal.OperationContextImpl;
@@ -262,8 +272,7 @@
consumer = session.createConsumer(PagingTest.ADDRESS);
session.start();
-
-
+
assertEquals(numberOfMessages, queue.getMessageCount());
ClientMessage msg = consumer.receive(5000);
@@ -284,7 +293,7 @@
}
assertNull(msg);
- for (int i = xids.size() -1 ; i >= 0; i--)
+ for (int i = xids.size() - 1; i >= 0; i--)
{
Xid xid = xids.get(i);
session.rollback(xid);
@@ -298,25 +307,25 @@
session = sf.createSession(false, false, false);
session.start();
-
+
consumer = session.createConsumer(PagingTest.ADDRESS);
-
+
for (int i = 0; i < numberOfMessages; i++)
{
msg = consumer.receive(1000);
assertNotNull(msg);
msg.acknowledge();
-
+
assertEquals(i, msg.getIntProperty("id").intValue());
-
+
if (i % 500 == 0)
{
session.commit();
}
}
-
+
session.commit();
-
+
session.close();
sf.close();
@@ -324,14 +333,13 @@
locator.close();
assertEquals(0, queue.getMessageCount());
-
+
long timeout = System.currentTimeMillis() + 5000;
while (timeout > System.currentTimeMillis() && queue.getPageSubscription().getPagingStore().isPaging())
{
Thread.sleep(100);
}
- assertFalse (queue.getPageSubscription().getPagingStore().isPaging());
- // assertEquals(numberOfMessages, queue.getMessageCount());
+ assertFalse(queue.getPageSubscription().getPagingStore().isPaging());
}
finally
{
@@ -346,6 +354,350 @@
}
+ public void testMissingTXEverythingAcked() throws Exception
+ {
+ clearData();
+
+ Configuration config = createDefaultConfig();
+
+ config.setJournalSyncNonTransactional(false);
+
+ HornetQServer server = createServer(true,
+ config,
+ PagingTest.PAGE_SIZE,
+ PagingTest.PAGE_MAX,
+ new HashMap<String, AddressSettings>());
+
+ server.start();
+
+ final int messageSize = 1024;
+
+ final int numberOfMessages = 5000;
+
+ final int numberOfTX = 10;
+
+ final int messagesPerTX = numberOfMessages / numberOfTX;
+
+ try
+ {
+ ServerLocator locator = createInVMNonHALocator();
+
+ locator.setBlockOnNonDurableSend(true);
+ locator.setBlockOnDurableSend(true);
+ locator.setBlockOnAcknowledge(true);
+
+ ClientSessionFactory sf = locator.createSessionFactory();
+
+ ClientSession session = sf.createSession(false, false, false);
+
+ session.createQueue(ADDRESS.toString(), "q1", true);
+
+ session.createQueue(ADDRESS.toString(), "q2", true);
+
+ ClientProducer producer = session.createProducer(PagingTest.ADDRESS);
+
+ ClientMessage message = null;
+
+ byte[] body = new byte[messageSize];
+
+ ByteBuffer bb = ByteBuffer.wrap(body);
+
+ for (int j = 1; j <= messageSize; j++)
+ {
+ bb.put(getSamplebyte(j));
+ }
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ message = session.createMessage(true);
+
+ HornetQBuffer bodyLocal = message.getBodyBuffer();
+
+ bodyLocal.writeBytes(body);
+
+ message.putIntProperty(new SimpleString("id"), i);
+
+ producer.send(message);
+ if (i % messagesPerTX == 0)
+ {
+ session.commit();
+ }
+ }
+ session.commit();
+ session.close();
+ }
+ finally
+ {
+ try
+ {
+ server.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+
+ ArrayList<RecordInfo> records = new ArrayList<RecordInfo>();
+
+ List<PreparedTransactionInfo> list = new ArrayList<PreparedTransactionInfo>();
+
+ JournalImpl jrn = new JournalImpl(config.getJournalFileSize(),
+ 2,
+ 0,
+ 0,
+ new NIOSequentialFileFactory(getJournalDir()),
+ "hornetq-data",
+ "hq",
+ 1);
+ jrn.start();
+ jrn.load(records, list, null);
+
+ // Delete everything from the journal
+ for (RecordInfo info : records)
+ {
+ if (!info.isUpdate)
+ {
+ jrn.appendDeleteRecord(info.id, false);
+ }
+ }
+
+ jrn.stop();
+
+ server = createServer(true,
+ config,
+ PagingTest.PAGE_SIZE,
+ PagingTest.PAGE_MAX,
+ new HashMap<String, AddressSettings>());
+
+ server.start();
+
+ Page pg = server.getPagingManager().getPageStore(ADDRESS).getCurrentPage();
+
+ pg.open();
+
+ List<PagedMessage> msgs = pg.read(server.getStorageManager());
+
+ pg.close();
+
+ long queues[] = new long[] { server.locateQueue(new SimpleString("q1")).getID() };
+
+ for (long q : queues)
+ {
+ for (int i = 0; i < msgs.size(); i++)
+ {
+ server.getStorageManager().storeCursorAcknowledge(q, new PagePositionImpl(pg.getPageId(), i));
+ }
+ }
+
+ server.stop();
+
+ ServerLocator locator = createInVMNonHALocator();
+
+ locator.setBlockOnNonDurableSend(true);
+ locator.setBlockOnDurableSend(true);
+ locator.setBlockOnAcknowledge(true);
+
+ server = createServer(true,
+ config,
+ PagingTest.PAGE_SIZE,
+ PagingTest.PAGE_MAX,
+ new HashMap<String, AddressSettings>());
+
+ server.start();
+
+ ClientSessionFactory csf = locator.createSessionFactory();
+
+ ClientSession sess = csf.createSession();
+
+ sess.start();
+
+ ClientConsumer cons = sess.createConsumer("q1");
+
+ assertNull(cons.receive(500));
+
+ Thread.sleep(5000);
+
+ ClientConsumer cons2 = sess.createConsumer("q2");
+ assertNull(cons2.receive(500));
+
+ long timeout = System.currentTimeMillis() + 5000;
+
+ while (System.currentTimeMillis() < timeout && server.getPagingManager().getPageStore(ADDRESS).isPaging())
+ {
+ Thread.sleep(100);
+ }
+
+ assertFalse(server.getPagingManager().getPageStore(ADDRESS).isPaging());
+
+ sess.close();
+
+ locator.close();
+
+ server.stop();
+ }
+
+ public void testMissingTXEverythingAcked2() throws Exception
+ {
+ clearData();
+
+ Configuration config = createDefaultConfig();
+
+ config.setJournalSyncNonTransactional(false);
+
+ HornetQServer server = createServer(true,
+ config,
+ PagingTest.PAGE_SIZE,
+ PagingTest.PAGE_MAX,
+ new HashMap<String, AddressSettings>());
+
+ server.start();
+
+ final int messageSize = 1024;
+
+ final int numberOfMessages = 6;
+
+ final int numberOfTX = 2;
+
+ final int messagesPerTX = numberOfMessages / numberOfTX;
+
+ try
+ {
+ ServerLocator locator = createInVMNonHALocator();
+
+ locator.setBlockOnNonDurableSend(true);
+ locator.setBlockOnDurableSend(true);
+ locator.setBlockOnAcknowledge(true);
+
+ ClientSessionFactory sf = locator.createSessionFactory();
+
+ ClientSession session = sf.createSession(false, false, false);
+
+ session.createQueue(ADDRESS.toString(), "q1", true);
+
+ session.createQueue(ADDRESS.toString(), "q2", true);
+
+ server.getPagingManager().getPageStore(ADDRESS).startPaging();
+
+ ClientProducer producer = session.createProducer(PagingTest.ADDRESS);
+
+ ClientMessage message = null;
+
+ byte[] body = new byte[messageSize];
+
+ ByteBuffer bb = ByteBuffer.wrap(body);
+
+ for (int j = 1; j <= messageSize; j++)
+ {
+ bb.put(getSamplebyte(j));
+ }
+
+ for (int i = 0; i < numberOfMessages; i++)
+ {
+ message = session.createMessage(true);
+
+ HornetQBuffer bodyLocal = message.getBodyBuffer();
+
+ bodyLocal.writeBytes(body);
+
+ message.putStringProperty("id", "str-" + i);
+
+ producer.send(message);
+ if ((i + 1) % messagesPerTX == 0)
+ {
+ session.commit();
+ }
+ }
+ session.commit();
+
+ session.start();
+
+ for (int i = 1; i <= 2; i++)
+ {
+ ClientConsumer cons = session.createConsumer("q" + i);
+
+ for (int j = 0; j < 3; j++)
+ {
+ ClientMessage msg = cons.receive(5000);
+
+ assertNotNull(msg);
+
+ assertEquals("str-" + j, msg.getStringProperty("id"));
+
+ msg.acknowledge();
+ }
+
+ session.commit();
+
+ }
+
+ session.close();
+ }
+ finally
+ {
+ locator.close();
+ try
+ {
+ server.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+
+ server = createServer(true,
+ config,
+ PagingTest.PAGE_SIZE,
+ PagingTest.PAGE_MAX,
+ new HashMap<String, AddressSettings>());
+
+ server.start();
+
+ ServerLocator locator = createInVMNonHALocator();
+
+ locator.setBlockOnNonDurableSend(true);
+ locator.setBlockOnDurableSend(true);
+ locator.setBlockOnAcknowledge(true);
+
+ ClientSessionFactory csf = locator.createSessionFactory();
+
+ ClientSession session = csf.createSession();
+
+ session.start();
+
+ for (int i = 1; i <= 2; i++)
+ {
+ ClientConsumer cons = session.createConsumer("q" + i);
+
+ for (int j = 3; j < 6; j++)
+ {
+ ClientMessage msg = cons.receive(5000);
+
+ assertNotNull(msg);
+
+ assertEquals("str-" + j, msg.getStringProperty("id"));
+
+ msg.acknowledge();
+ }
+
+ session.commit();
+ assertNull(cons.receive(500));
+
+ }
+
+ session.close();
+
+ long timeout = System.currentTimeMillis() + 5000;
+
+ while (System.currentTimeMillis() < timeout && server.getPagingManager().getPageStore(ADDRESS).isPaging())
+ {
+ Thread.sleep(100);
+ }
+
+ locator.close();
+
+ server.stop();
+ }
+
public void testTwoQueuesOneNoRouting() throws Exception
{
boolean persistentMessages = true;
@@ -2454,6 +2806,8 @@
catch (Throwable ignored)
{
}
+
+ OperationContextImpl.clearContext();
}
}
@@ -2787,8 +3141,7 @@
}
}
}
-
-
+
public void testPageAndDepageRapidly() throws Exception
{
boolean persistentMessages = true;
@@ -2800,11 +3153,7 @@
config.setJournalSyncNonTransactional(false);
config.setJournalFileSize(10 * 1024 * 1024);
- HornetQServer server = createServer(true,
- config,
- 512 * 1024,
- 1024 * 1024,
- new HashMap<String, AddressSettings>());
+ HornetQServer server = createServer(true, config, 512 * 1024, 1024 * 1024, new HashMap<String, AddressSettings>());
server.start();
@@ -2827,9 +3176,9 @@
session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS, null, true);
ClientProducer producer = session.createProducer(PagingTest.ADDRESS);
-
+
final AtomicInteger errors = new AtomicInteger(0);
-
+
Thread consumeThread = new Thread()
{
public void run()
@@ -2839,16 +3188,16 @@
{
sessionConsumer = sf.createSession(false, false);
sessionConsumer.start();
-
+
ClientConsumer cons = sessionConsumer.createConsumer(ADDRESS);
-
+
for (int i = 0; i < numberOfMessages; i++)
{
ClientMessage msg = cons.receive(PagingTest.RECEIVE_TIMEOUT);
System.out.println("Message " + i + " consumed");
assertNotNull(msg);
msg.acknowledge();
-
+
if (i % 20 == 0)
{
System.out.println("Commit consumer");
@@ -2874,10 +3223,10 @@
errors.incrementAndGet();
}
}
-
+
}
};
-
+
consumeThread.start();
ClientMessage message = null;
@@ -2887,7 +3236,7 @@
for (int i = 0; i < numberOfMessages; i++)
{
message = session.createMessage(persistentMessages);
-
+
System.out.println("Message " + i + " sent");
HornetQBuffer bodyLocal = message.getBodyBuffer();
@@ -2897,23 +3246,24 @@
message.putIntProperty(new SimpleString("id"), i);
producer.send(message);
-
+
Thread.sleep(50);
}
-
consumeThread.join();
-
+
long timeout = System.currentTimeMillis() + 5000;
-
- while (System.currentTimeMillis() < timeout && (server.getPagingManager().getPageStore(ADDRESS).isPaging() || server.getPagingManager().getPageStore(ADDRESS).getNumberOfPages() != 1))
+
+ while (System.currentTimeMillis() < timeout && (server.getPagingManager().getPageStore(ADDRESS).isPaging() || server.getPagingManager()
+ .getPageStore(ADDRESS)
+ .getNumberOfPages() != 1))
{
Thread.sleep(1);
}
// It's async, so need to wait a bit for it happening
assertFalse(server.getPagingManager().getPageStore(ADDRESS).isPaging());
-
+
assertEquals(1, server.getPagingManager().getPageStore(ADDRESS).getNumberOfPages());
sf.close();
@@ -2933,7 +3283,6 @@
}
-
public void testTwoQueuesDifferentFilters() throws Exception
{
boolean persistentMessages = true;
@@ -2959,7 +3308,7 @@
try
{
ServerLocator locator = createInVMNonHALocator();
-
+
locator.setClientFailureCheckPeriod(120000);
locator.setConnectionTTL(5000000);
locator.setCallTimeout(120000);
@@ -2971,14 +3320,16 @@
ClientSessionFactory sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
-
+
// note: if you want to change this, numberOfMessages has to be a multiple of NQUEUES
int NQUEUES = 2;
-
- for (int i = 0 ; i < NQUEUES; i++)
+ for (int i = 0; i < NQUEUES; i++)
{
- session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS.concat("=" + i), new SimpleString("propTest=" + i), true);
+ session.createQueue(PagingTest.ADDRESS,
+ PagingTest.ADDRESS.concat("=" + i),
+ new SimpleString("propTest=" + i),
+ true);
}
ClientProducer producer = session.createProducer(PagingTest.ADDRESS);
@@ -3012,20 +3363,20 @@
for (int nqueue = 0; nqueue < NQUEUES; nqueue++)
{
ClientConsumer consumer = session.createConsumer(PagingTest.ADDRESS.concat("=" + nqueue));
-
- for (int i = 0; i < (numberOfMessages /NQUEUES); i++)
+
+ for (int i = 0; i < (numberOfMessages / NQUEUES); i++)
{
message = consumer.receive(500000);
assertNotNull(message);
message.acknowledge();
-
+
assertEquals(nqueue, message.getIntProperty("propTest").intValue());
}
-
+
assertNull(consumer.receiveImmediate());
-
+
consumer.close();
-
+
session.commit();
}
@@ -3038,7 +3389,6 @@
Thread.sleep(100);
}
-
// It's async, so need to wait a bit for it happening
assertFalse(server.getPagingManager().getPageStore(ADDRESS).isPaging());
@@ -3056,11 +3406,8 @@
{
}
}
-
}
-
-
public void testTwoQueues() throws Exception
{
boolean persistentMessages = true;
@@ -3086,7 +3433,7 @@
try
{
ServerLocator locator = createInVMNonHALocator();
-
+
locator.setClientFailureCheckPeriod(120000);
locator.setConnectionTTL(5000000);
locator.setCallTimeout(120000);
@@ -3098,7 +3445,6 @@
ClientSessionFactory sf = locator.createSessionFactory();
ClientSession session = sf.createSession(false, false, false);
-
session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS.concat("=1"), null, true);
session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS.concat("=2"), null, true);
@@ -3133,22 +3479,22 @@
for (int msg = 1; msg <= 2; msg++)
{
ClientConsumer consumer = session.createConsumer(PagingTest.ADDRESS.concat("=" + msg));
-
+
for (int i = 0; i < numberOfMessages; i++)
{
message = consumer.receive(500000);
assertNotNull(message);
message.acknowledge();
-
- //assertEquals(msg, message.getIntProperty("propTest").intValue());
-
+
+ // assertEquals(msg, message.getIntProperty("propTest").intValue());
+
System.out.println("i = " + i + " msg = " + message.getIntProperty("propTest"));
}
-
+
session.commit();
-
+
assertNull(consumer.receiveImmediate());
-
+
consumer.close();
}
@@ -3162,10 +3508,9 @@
}
store.getCursorProvier().cleanup();
-
+
Thread.sleep(1000);
-
-
+
// It's async, so need to wait a bit for it happening
assertFalse(server.getPagingManager().getPageStore(ADDRESS).isPaging());
@@ -3183,11 +3528,374 @@
{
}
}
+ }
+ public void testDLAOnLargeMessageAndPaging() throws Exception
+ {
+ clearData();
+
+ Configuration config = createDefaultConfig();
+
+ config.setJournalSyncNonTransactional(false);
+
+ Map<String, AddressSettings> settings = new HashMap<String, AddressSettings>();
+ AddressSettings dla = new AddressSettings();
+ dla.setMaxDeliveryAttempts(5);
+ dla.setDeadLetterAddress(new SimpleString("DLA"));
+ settings.put(ADDRESS.toString(), dla);
+
+ final HornetQServer server = createServer(true, config, PagingTest.PAGE_SIZE, PagingTest.PAGE_MAX, settings);
+
+ server.start();
+
+ final int messageSize = 1024;
+
+ try
+ {
+ ServerLocator locator = createInVMNonHALocator();
+
+ locator.setBlockOnNonDurableSend(true);
+ locator.setBlockOnDurableSend(true);
+ locator.setBlockOnAcknowledge(true);
+
+ ClientSessionFactory sf = locator.createSessionFactory();
+
+ ClientSession session = sf.createSession(false, false, false);
+
+ session.createQueue(ADDRESS, ADDRESS, true);
+
+ session.createQueue("DLA", "DLA");
+
+ PagingStore pgStoreAddress = server.getPagingManager().getPageStore(ADDRESS);
+ pgStoreAddress.startPaging();
+ PagingStore pgStoreDLA = server.getPagingManager().getPageStore(new SimpleString("DLA"));
+
+ ClientProducer producer = session.createProducer(PagingTest.ADDRESS);
+
+ ClientMessage message = null;
+
+ for (int i = 0; i < 100; i++)
+ {
+ log.info("send message #" + i);
+ message = session.createMessage(true);
+
+ message.putStringProperty("id", "str" + i);
+
+ message.setBodyInputStream(createFakeLargeStream(messageSize));
+
+ producer.send(message);
+
+ if ((i + 1) % 2 == 0)
+ {
+ session.commit();
+ }
+ }
+
+ session.commit();
+
+ session.start();
+
+ ClientConsumer cons = session.createConsumer(ADDRESS);
+
+ ClientMessage msg = null;
+
+ for (int msgNr = 0 ; msgNr < 2; msgNr++)
+ {
+ for (int i = 0 ; i < 5; i++)
+ {
+ msg = cons.receive(5000);
+
+ assertNotNull(msg);
+
+ msg.acknowledge();
+
+ assertEquals("str" + msgNr, msg.getStringProperty("id"));
+
+ for (int j = 0; j < messageSize; j++)
+ {
+ assertEquals(getSamplebyte(j), msg.getBodyBuffer().readByte());
+ }
+
+ session.rollback();
+ }
+
+ pgStoreDLA.startPaging();
+ }
+
+ for (int i = 2; i < 100; i++)
+ {
+ log.info("Received message " + i);
+ message = cons.receive(5000);
+ assertNotNull(message);
+ message.acknowledge();
+
+ message.saveToOutputStream(new OutputStream()
+ {
+ @Override
+ public void write(int b) throws IOException
+ {
+
+ }
+ });
+
+ }
+
+ assertNull(cons.receiveImmediate());
+
+ cons.close();
+
+ sf.close();
+
+ locator.close();
+
+ server.stop();
+
+ server.start();
+
+ locator = createInVMNonHALocator();
+
+ sf = locator.createSessionFactory();
+
+ session = sf.createSession(false, false);
+
+ session.start();
+
+ cons = session.createConsumer(ADDRESS);
+
+ for (int i = 2; i < 100; i++)
+ {
+ log.info("Received message " + i);
+ message = cons.receive(5000);
+ assertNotNull(message);
+ message.acknowledge();
+
+ message.saveToOutputStream(new OutputStream()
+ {
+ @Override
+ public void write(int b) throws IOException
+ {
+
+ }
+ });
+ }
+
+ cons.close();
+
+ cons = session.createConsumer("DLA");
+
+ for (int msgNr = 0 ; msgNr < 2; msgNr++)
+ {
+ msg = cons.receive(5000);
+
+ assertNotNull(msg);
+
+ assertEquals("str" + msgNr, msg.getStringProperty("id"));
+
+ for (int i = 0; i < messageSize; i++)
+ {
+ assertEquals(getSamplebyte(i), msg.getBodyBuffer().readByte());
+ }
+
+ msg.acknowledge();
+ }
+
+ cons.close();
+
+ cons = session.createConsumer(ADDRESS);
+
+ session.commit();
+
+ assertNull(cons.receiveImmediate());
+
+ long timeout = System.currentTimeMillis() + 5000;
+
+ pgStoreAddress = server.getPagingManager().getPageStore(ADDRESS);
+
+ pgStoreAddress.getCursorProvier().getSubscription(server.locateQueue(ADDRESS).getID()).cleanupEntries();
+
+ pgStoreAddress.getCursorProvier().cleanup();
+
+ while (timeout > System.currentTimeMillis() && pgStoreAddress.isPaging())
+ {
+ Thread.sleep(50);
+ }
+
+ assertFalse(pgStoreAddress.isPaging());
+
+ session.commit();
+
+ session.close();
+ }
+ finally
+ {
+ locator.close();
+ try
+ {
+ server.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
}
+ public void testExpireLargeMessageOnPaging() throws Exception
+ {
+ clearData();
+ Configuration config = createDefaultConfig();
+ config.setMessageExpiryScanPeriod(500);
+ config.setJournalSyncNonTransactional(false);
+
+ Map<String, AddressSettings> settings = new HashMap<String, AddressSettings>();
+ AddressSettings dla = new AddressSettings();
+ dla.setMaxDeliveryAttempts(5);
+ dla.setDeadLetterAddress(new SimpleString("DLA"));
+ dla.setExpiryAddress(new SimpleString("DLA"));
+ settings.put(ADDRESS.toString(), dla);
+
+ final HornetQServer server = createServer(true, config, PagingTest.PAGE_SIZE, PagingTest.PAGE_MAX, settings);
+
+ server.start();
+
+ final int messageSize = 20;
+
+ try
+ {
+ ServerLocator locator = createInVMNonHALocator();
+
+ locator.setBlockOnNonDurableSend(true);
+ locator.setBlockOnDurableSend(true);
+ locator.setBlockOnAcknowledge(true);
+
+ ClientSessionFactory sf = locator.createSessionFactory();
+
+ ClientSession session = sf.createSession(false, false, false);
+
+ session.createQueue(ADDRESS, ADDRESS, true);
+
+ session.createQueue("DLA", "DLA");
+
+ PagingStore pgStoreAddress = server.getPagingManager().getPageStore(ADDRESS);
+ pgStoreAddress.startPaging();
+ PagingStore pgStoreDLA = server.getPagingManager().getPageStore(new SimpleString("DLA"));
+
+ ClientProducer producer = session.createProducer(PagingTest.ADDRESS);
+
+ ClientMessage message = null;
+
+ for (int i = 0; i < 500; i++)
+ {
+ if (i % 100 == 0) log.info("send message #" + i);
+ message = session.createMessage(true);
+
+ message.putStringProperty("id", "str" + i);
+
+ message.setExpiration(System.currentTimeMillis() + 2000);
+
+ if (i % 2 == 0)
+ {
+ message.setBodyInputStream(createFakeLargeStream(messageSize));
+ }
+ else
+ {
+ byte bytes[] = new byte[messageSize];
+ for (int s = 0 ; s < bytes.length; s++)
+ {
+ bytes[s] = getSamplebyte(s);
+ }
+ message.getBodyBuffer().writeBytes(bytes);
+ }
+
+ producer.send(message);
+
+ if ((i + 1) % 2 == 0)
+ {
+ session.commit();
+ if (i < 400)
+ {
+ pgStoreAddress.forceAnotherPage();
+ }
+ }
+ }
+
+ session.commit();
+
+ sf.close();
+
+ locator.close();
+
+ server.stop();
+
+ Thread.sleep(3000);
+
+ server.start();
+
+ locator = createInVMNonHALocator();
+
+ sf = locator.createSessionFactory();
+
+ session = sf.createSession(false, false);
+
+ session.start();
+
+ ClientConsumer consAddr = session.createConsumer(ADDRESS);
+
+ assertNull(consAddr.receive(1000));
+
+
+ ClientConsumer cons = session.createConsumer("DLA");
+
+ for (int i = 0; i < 500; i++)
+ {
+ log.info("Received message " + i);
+ message = cons.receive(5000);
+ assertNotNull(message);
+ message.acknowledge();
+
+ message.saveToOutputStream(new OutputStream()
+ {
+ @Override
+ public void write(int b) throws IOException
+ {
+
+ }
+ });
+ }
+
+ assertNull(cons.receiveImmediate());
+
+ session.commit();
+
+ cons.close();
+
+ long timeout = System.currentTimeMillis() + 5000;
+
+ pgStoreAddress = server.getPagingManager().getPageStore(ADDRESS);
+
+ while (timeout > System.currentTimeMillis() && pgStoreAddress.isPaging())
+ {
+ Thread.sleep(50);
+ }
+
+ assertFalse(pgStoreAddress.isPaging());
+
+ session.close();
+ }
+ finally
+ {
+ locator.close();
+ try
+ {
+ server.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+ }
+
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TemporaryQueueTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2011-05-20 15:47:57 UTC (rev 10711)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2011-05-21 16:29:14 UTC (rev 10712)
@@ -16,6 +16,7 @@
import java.util.Arrays;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.Assert;
@@ -29,6 +30,7 @@
import org.hornetq.api.core.client.ClientSession;
import org.hornetq.api.core.client.ClientSessionFactory;
import org.hornetq.api.core.client.HornetQClient;
+import org.hornetq.api.core.client.MessageHandler;
import org.hornetq.api.core.client.ServerLocator;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
@@ -363,7 +365,126 @@
}
+
+ public void testTemoraryQueuesWithFilter() throws Exception
+ {
+
+ int countTmpQueue=0;
+
+ final AtomicInteger errors = new AtomicInteger(0);
+
+ class MyHandler implements MessageHandler
+ {
+ final String color;
+
+ final CountDownLatch latch;
+
+ final ClientSession sess;
+
+ public MyHandler(ClientSession sess, String color, int expectedMessages)
+ {
+ this.sess = sess;
+ latch = new CountDownLatch(expectedMessages);
+ this.color = color;
+ }
+
+ public boolean waitCompletion() throws Exception
+ {
+ return latch.await(10, TimeUnit.SECONDS);
+ }
+
+ public void onMessage(ClientMessage message)
+ {
+ try
+ {
+ message.acknowledge();
+ sess.commit();
+ latch.countDown();
+
+ if (!message.getStringProperty("color").equals(color))
+ {
+ log.warn("Unexpected color " + message.getStringProperty("color") + " when we were expecting " + color);
+ errors.incrementAndGet();
+ }
+ }
+ catch (Exception e)
+ {
+ log.warn(e.getMessage(), e);
+ errors.incrementAndGet();
+ }
+ }
+
+ }
+
+ String address = "AD_test";
+ int iterations = 100;
+ int msgs = 100;
+
+ // Will be using a single Session as this is how an issue was raised
+ for (int i = 0 ; i < iterations; i++)
+ {
+ ClientSessionFactory clientsConnecton = locator.createSessionFactory();
+ ClientSession localSession = clientsConnecton.createSession();
+
+ ClientProducer prod = localSession.createProducer(address);
+
+ localSession.start();
+
+ log.info("Iteration " + i);
+ String queueRed = address + "_red_" + (countTmpQueue++);
+ String queueBlue = address + "_blue_" + (countTmpQueue++);
+
+ //ClientSession sessConsumerRed = clientsConnecton.createSession();
+ ClientSession sessConsumerRed = localSession;
+ sessConsumerRed.createTemporaryQueue(address, queueRed, "color='red'");
+ MyHandler redHandler = new MyHandler(sessConsumerRed, "red", msgs);
+ ClientConsumer redClientConsumer = sessConsumerRed.createConsumer(queueRed);
+ redClientConsumer.setMessageHandler(redHandler);
+ //sessConsumerRed.start();
+
+ //ClientSession sessConsumerBlue = clientsConnecton.createSession();
+ ClientSession sessConsumerBlue = localSession;
+ sessConsumerBlue.createTemporaryQueue(address, queueBlue, "color='blue'");
+ MyHandler blueHandler = new MyHandler(sessConsumerBlue, "blue", msgs);
+ ClientConsumer blueClientConsumer = sessConsumerBlue.createConsumer(queueBlue);
+ blueClientConsumer.setMessageHandler(blueHandler);
+ //sessConsumerBlue.start();
+
+ try
+ {
+ ClientMessage msgBlue = session.createMessage(false);
+ msgBlue.putStringProperty("color", "blue");
+
+ ClientMessage msgRed = session.createMessage(false);
+ msgRed.putStringProperty("color", "red");
+
+ for (int nmsg = 0; nmsg < msgs; nmsg++)
+ {
+ prod.send(msgBlue);
+
+ prod.send(msgRed);
+
+ session.commit();
+ }
+
+ blueHandler.waitCompletion();
+ redHandler.waitCompletion();
+
+ assertEquals(0, errors.get());
+
+ }
+ finally
+ {
+// sessConsumerRed.close();
+// sessConsumerBlue.close();
+ localSession.close();
+ clientsConnecton.close();
+ }
+ }
+
+ }
+
public void testDeleteTemporaryQueueWhenClientCrash() throws Exception
{
session.close();
Modified: trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
===================================================================
--- trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2011-05-20 15:47:57 UTC (rev 10711)
+++ trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2011-05-21 16:29:14 UTC (rev 10712)
@@ -674,10 +674,13 @@
{
}
- @Override
- public void copyTo(SequentialFile newFileName) throws Exception
+ /* (non-Javadoc)
+ * @see org.hornetq.core.journal.SequentialFile#copyTo(org.hornetq.core.journal.SequentialFile)
+ */
+ public void copyTo(SequentialFile newFileName)
{
- throw new UnsupportedOperationException();
+ // TODO Auto-generated method stub
+
}
}
Modified: trunk/tests/unit-tests/src/main/java/org/hornetq/tests/util/RandomUtil.java
===================================================================
--- trunk/tests/unit-tests/src/main/java/org/hornetq/tests/util/RandomUtil.java 2011-05-20 15:47:57 UTC (rev 10711)
+++ trunk/tests/unit-tests/src/main/java/org/hornetq/tests/util/RandomUtil.java 2011-05-21 16:29:14 UTC (rev 10712)
@@ -1,14 +1,14 @@
/*
* Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
*/
package org.hornetq.tests.util;
Modified: trunk/tests/unit-tests/src/main/java/org/hornetq/tests/util/UnitTestCase.java
===================================================================
--- trunk/tests/unit-tests/src/main/java/org/hornetq/tests/util/UnitTestCase.java 2011-05-20 15:47:57 UTC (rev 10711)
+++ trunk/tests/unit-tests/src/main/java/org/hornetq/tests/util/UnitTestCase.java 2011-05-21 16:29:14 UTC (rev 10712)
@@ -1,14 +1,14 @@
/*
* Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
*/
package org.hornetq.tests.util;
@@ -541,8 +541,7 @@
}
catch (Exception e)
{
- System.out.println("port " + port + " is already bound");
- System.exit(0);
+ throw new IllegalStateException("port " + port + " is already bound");
}
finally
{
@@ -791,11 +790,11 @@
/** It validates a Bean (POJO) using simple setters and getters with random values.
* You can pass a list of properties to be ignored, as some properties will have a pre-defined domain (not being possible to use random-values on them) */
- protected void validateGettersAndSetters(final Object pojo, final String... IgnoredProperties) throws Exception
+ protected void validateGettersAndSetters(final Object pojo, final String... ignoredProperties) throws Exception
{
HashSet<String> ignoreSet = new HashSet<String>();
- for (String ignore : IgnoredProperties)
+ for (String ignore : ignoredProperties)
{
ignoreSet.add(ignore);
}
@@ -860,6 +859,8 @@
protected void setUp() throws Exception
{
super.setUp();
+
+ OperationContextImpl.clearContext();
deleteDirectory(new File(getTestDir()));
Modified: trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java
===================================================================
--- trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2011-05-20 15:47:57 UTC (rev 10711)
+++ trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2011-05-21 16:29:14 UTC (rev 10712)
@@ -143,12 +143,11 @@
100,
createMockManager(),
createStorageManagerMock(),
- createPostOfficeMock(),
factory,
null,
PagingStoreImplTest.destinationTestName,
addressSettings,
- getExecutorFactory(),
+ getExecutorFactory().getExecutor(),
true);
storeImpl.start();
@@ -181,12 +180,11 @@
100,
createMockManager(),
createStorageManagerMock(),
- createPostOfficeMock(),
factory,
storeFactory,
PagingStoreImplTest.destinationTestName,
addressSettings,
- getExecutorFactory(),
+ getExecutorFactory().getExecutor(),
true);
storeImpl.start();
@@ -219,12 +217,11 @@
100,
createMockManager(),
createStorageManagerMock(),
- createPostOfficeMock(),
factory,
null,
PagingStoreImplTest.destinationTestName,
addressSettings,
- getExecutorFactory(),
+ getExecutorFactory().getExecutor(),
true);
storeImpl.start();
@@ -248,12 +245,11 @@
100,
createMockManager(),
createStorageManagerMock(),
- createPostOfficeMock(),
factory,
storeFactory,
PagingStoreImplTest.destinationTestName,
addressSettings,
- getExecutorFactory(),
+ getExecutorFactory().getExecutor(),
true);
storeImpl.start();
@@ -325,12 +321,11 @@
100,
createMockManager(),
createStorageManagerMock(),
- createPostOfficeMock(),
factory,
storeFactory,
PagingStoreImplTest.destinationTestName,
addressSettings,
- getExecutorFactory(),
+ getExecutorFactory().getExecutor(),
true);
storeImpl.start();
@@ -474,12 +469,11 @@
100,
createMockManager(),
createStorageManagerMock(),
- createPostOfficeMock(),
factory,
storeFactory,
new SimpleString("test"),
settings,
- getExecutorFactory(),
+ getExecutorFactory().getExecutor(),
true);
storeImpl.start();
@@ -639,12 +633,11 @@
100,
createMockManager(),
createStorageManagerMock(),
- createPostOfficeMock(),
factory,
storeFactory,
new SimpleString("test"),
settings,
- getExecutorFactory(),
+ getExecutorFactory().getExecutor(),
true);
storeImpl2.start();
@@ -726,12 +719,11 @@
100,
createMockManager(),
createStorageManagerMock(),
- createPostOfficeMock(),
factory,
storeFactory,
new SimpleString("test"),
settings,
- getExecutorFactory(),
+ getExecutorFactory().getExecutor(),
true);
storeImpl.start();
@@ -770,12 +762,11 @@
100,
createMockManager(),
createStorageManagerMock(),
- createPostOfficeMock(),
factory,
storeFactory,
new SimpleString("test"),
settings,
- getExecutorFactory(),
+ getExecutorFactory().getExecutor(),
false);
storeImpl.start();
14 years, 7 months
JBoss hornetq SVN: r10711 - branches/HORNETQ-698_SplitJournal/etc.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-20 11:47:57 -0400 (Fri, 20 May 2011)
New Revision: 10711
Modified:
branches/HORNETQ-698_SplitJournal/etc/org.eclipse.jdt.ui.prefs
Log:
Update eclipse configuration
Modified: branches/HORNETQ-698_SplitJournal/etc/org.eclipse.jdt.ui.prefs
===================================================================
--- branches/HORNETQ-698_SplitJournal/etc/org.eclipse.jdt.ui.prefs 2011-05-20 15:47:44 UTC (rev 10710)
+++ branches/HORNETQ-698_SplitJournal/etc/org.eclipse.jdt.ui.prefs 2011-05-20 15:47:57 UTC (rev 10711)
@@ -1,4 +1,4 @@
-#Mon Jan 18 18:34:30 CET 2010
+#Fri May 20 16:47:44 CEST 2011
cleanup.add_default_serial_version_id=false
cleanup.add_generated_serial_version_id=true
cleanup.add_missing_annotations=true
@@ -52,7 +52,7 @@
cleanup_profile=_HornetQ profile
cleanup_settings_version=2
eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_profile=_JBM
formatter_settings_version=11
org.eclipse.jdt.ui.exception.name=e
@@ -69,18 +69,23 @@
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=true
sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=false
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.convert_to_enhanced_for_loop=true
-sp_cleanup.format_source_code=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=true
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=true
sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=true
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
@@ -98,9 +103,9 @@
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=true
sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=true
+sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=true
+sp_cleanup.remove_unused_private_members=false
sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
14 years, 7 months
JBoss hornetq SVN: r10710 - branches/HORNETQ-698_SplitJournal.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-20 11:47:44 -0400 (Fri, 20 May 2011)
New Revision: 10710
Modified:
branches/HORNETQ-698_SplitJournal/.gitignore
Log:
Update gitignore
Modified: branches/HORNETQ-698_SplitJournal/.gitignore
===================================================================
--- branches/HORNETQ-698_SplitJournal/.gitignore 2011-05-20 15:47:32 UTC (rev 10709)
+++ branches/HORNETQ-698_SplitJournal/.gitignore 2011-05-20 15:47:44 UTC (rev 10710)
@@ -705,3 +705,4 @@
/tests/unit-tests/.project
/docs/rest-manual/.project
/docs/quickstart-guide/.project
+/hornetq-journal/.project
14 years, 7 months
JBoss hornetq SVN: r10709 - in branches/HORNETQ-698_SplitJournal: hornetq-journal/src/main/java/org/hornetq/core/journal/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-20 11:47:32 -0400 (Fri, 20 May 2011)
New Revision: 10709
Modified:
branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/config/impl/ConfigurationImpl.java
branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalConstants.java
Log:
Fix compilation issue
Modified: branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/config/impl/ConfigurationImpl.java
===================================================================
--- branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/config/impl/ConfigurationImpl.java 2011-05-20 15:46:40 UTC (rev 10708)
+++ branches/HORNETQ-698_SplitJournal/hornetq-core/src/main/java/org/hornetq/core/config/impl/ConfigurationImpl.java 2011-05-20 15:47:32 UTC (rev 10709)
@@ -31,6 +31,7 @@
import org.hornetq.core.config.ConnectorServiceConfiguration;
import org.hornetq.core.config.CoreQueueConfiguration;
import org.hornetq.core.config.DivertConfiguration;
+import org.hornetq.core.journal.impl.JournalConstants;
import org.hornetq.core.logging.impl.JULLogDelegateFactory;
import org.hornetq.core.security.Role;
import org.hornetq.core.server.JournalType;
@@ -150,7 +151,7 @@
public static final int DEFAULT_ID_CACHE_SIZE = 2000;
public static final boolean DEFAULT_PERSIST_ID_CACHE = true;
-
+
public static final boolean DEFAULT_CLUSTER_DUPLICATE_DETECTION = true;
public static final boolean DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS = false;
@@ -178,7 +179,7 @@
public static final String DEFAULT_LOG_DELEGATE_FACTORY_CLASS_NAME = JULLogDelegateFactory.class.getCanonicalName();
// Attributes -----------------------------------------------------------------------------
-
+
protected String name = "ConfigurationImpl::" + System.identityHashCode(this);
protected boolean clustered = ConfigurationImpl.DEFAULT_CLUSTERED;
@@ -224,7 +225,7 @@
protected String logDelegateFactoryClassName = ConfigurationImpl.DEFAULT_LOG_DELEGATE_FACTORY_CLASS_NAME;
protected List<String> interceptorClassNames = new ArrayList<String>();
-
+
protected Map<String, TransportConfiguration> connectorConfigs = new HashMap<String, TransportConfiguration>();
protected Set<TransportConfiguration> acceptorConfigs = new HashSet<TransportConfiguration>();
@@ -277,15 +278,15 @@
protected int journalMaxIO_AIO = ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_AIO;
- protected int journalBufferTimeout_AIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO;
+ protected int journalBufferTimeout_AIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO;
- protected int journalBufferSize_AIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_AIO;
+ protected int journalBufferSize_AIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO;
protected int journalMaxIO_NIO = ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_NIO;
- protected int journalBufferTimeout_NIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO;
+ protected int journalBufferTimeout_NIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO;
- protected int journalBufferSize_NIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_NIO;
+ protected int journalBufferSize_NIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_NIO;
protected boolean logJournalWriteRate = ConfigurationImpl.DEFAULT_JOURNAL_LOG_WRITE_RATE;
@@ -349,7 +350,7 @@
return allowAutoFailBack;
}
- public void setAllowAutoFailBack(boolean allowAutoFailBack)
+ public void setAllowAutoFailBack(final boolean allowAutoFailBack)
{
this.allowAutoFailBack = allowAutoFailBack;
}
@@ -506,7 +507,7 @@
{
this.liveConnectorName = liveConnectorName;
}
-
+
public GroupingHandlerConfiguration getGroupingHandlerConfiguration()
{
return groupingHandlerConfiguration;
@@ -887,7 +888,7 @@
return failoverOnServerShutdown;
}
- public void setFailoverOnServerShutdown(boolean failoverOnServerShutdown)
+ public void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown)
{
this.failoverOnServerShutdown = failoverOnServerShutdown;
}
@@ -1352,7 +1353,7 @@
public List<ConnectorServiceConfiguration> getConnectorServiceConfigurations()
{
- return this.connectorServiceConfigurations;
+ return connectorServiceConfigurations;
}
public long getFailbackDelay()
@@ -1360,14 +1361,14 @@
return failbackDelay;
}
- public void setFailbackDelay(long failbackDelay)
+ public void setFailbackDelay(final long failbackDelay)
{
this.failbackDelay = failbackDelay;
}
public void setConnectorServiceConfigurations(final List<ConnectorServiceConfiguration> configs)
{
- this.connectorServiceConfigurations = configs;
+ connectorServiceConfigurations = configs;
}
/* (non-Javadoc)
@@ -1381,7 +1382,7 @@
/* (non-Javadoc)
* @see org.hornetq.core.config.Configuration#setName(java.lang.String)
*/
- public void setName(String name)
+ public void setName(final String name)
{
this.name = name;
}
Modified: branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalConstants.java
===================================================================
--- branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalConstants.java 2011-05-20 15:46:40 UTC (rev 10708)
+++ branches/HORNETQ-698_SplitJournal/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/JournalConstants.java 2011-05-20 15:47:32 UTC (rev 10709)
@@ -1,8 +1,9 @@
package org.hornetq.core.journal.impl;
-final class JournalConstants {
+public final class JournalConstants
+{
- public static final int DEFAULT_JOURNAL_BUFFER_SIZE_AIO = 490 * 1024;
+ public static final int DEFAULT_JOURNAL_BUFFER_SIZE_AIO = 490 * 1024;
public static final int DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO = (int)(1000000000d / 2000);
public static final int DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO = (int)(1000000000d / 300);
public static final int DEFAULT_JOURNAL_BUFFER_SIZE_NIO = 490 * 1024;
14 years, 7 months
JBoss hornetq SVN: r10707 - trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-20 07:31:20 -0400 (Fri, 20 May 2011)
New Revision: 10707
Modified:
trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
Log:
Re-add copyTo(..) method
Modified: trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
===================================================================
--- trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2011-05-20 11:21:43 UTC (rev 10706)
+++ trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2011-05-20 11:31:20 UTC (rev 10707)
@@ -674,6 +674,12 @@
{
}
+ @Override
+ public void copyTo(SequentialFile newFileName) throws Exception
+ {
+ throw new UnsupportedOperationException();
+ }
+
}
/* (non-Javadoc)
14 years, 7 months
JBoss hornetq SVN: r10706 - trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-20 07:21:43 -0400 (Fri, 20 May 2011)
New Revision: 10706
Modified:
trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
Log:
Remove method Eclipse was complaining of. Hopefully this will fix the build.
Modified: trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
===================================================================
--- trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2011-05-20 09:08:55 UTC (rev 10705)
+++ trunk/tests/unit-tests/src/main/java/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2011-05-20 11:21:43 UTC (rev 10706)
@@ -674,12 +674,6 @@
{
}
- @Override
- public void copyTo(SequentialFile newFileName) throws Exception
- {
- throw new UnsupportedOperationException();
- }
-
}
/* (non-Javadoc)
14 years, 7 months
JBoss hornetq SVN: r10705 - branches/Branch_2_2_EAP_export_tool/src/main/org/hornetq/core/persistence/tools.
by do-not-reply＠jboss.org
Author: jicken
Date: 2011-05-20 05:08:55 -0400 (Fri, 20 May 2011)
New Revision: 10705
Modified:
branches/Branch_2_2_EAP_export_tool/src/main/org/hornetq/core/persistence/tools/ExportData.java
Log:
bugfix parameter check for exporting
Modified: branches/Branch_2_2_EAP_export_tool/src/main/org/hornetq/core/persistence/tools/ExportData.java
===================================================================
--- branches/Branch_2_2_EAP_export_tool/src/main/org/hornetq/core/persistence/tools/ExportData.java 2011-05-20 05:38:55 UTC (rev 10704)
+++ branches/Branch_2_2_EAP_export_tool/src/main/org/hornetq/core/persistence/tools/ExportData.java 2011-05-20 09:08:55 UTC (rev 10705)
@@ -25,8 +25,9 @@
public static void main(String args[])
{
- if (args.length != 4) {
- System.out.println("Usage Export: java org.hornetq.core.persistence.tools.ExportData <bindings-journal-dir> <messages-journal-dir>");
+ if (args.length != 2) {
+ // todo: maybe just use a hq-config.xml file as a parameter
+ System.out.println("Usage Export: java org.hornetq.core.persistence.tools.ExportData <bindings-dir> <journal-dir>");
System.exit(-1);
}
try
14 years, 7 months