JBoss hornetq SVN: r11614 - trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-10-28 09:00:26 -0400 (Fri, 28 Oct 2011)
New Revision: 11614
Modified:
trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/LinkedListTest.java
Log:
Silence test
Modified: trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/LinkedListTest.java
===================================================================
--- trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/LinkedListTest.java 2011-10-28 13:00:09 UTC (rev 11613)
+++ trunk/tests/unit-tests/src/test/java/org/hornetq/tests/unit/util/LinkedListTest.java 2011-10-28 13:00:26 UTC (rev 11614)
@@ -115,7 +115,7 @@
int removed = 0;
while (iter.hasNext())
{
- System.out.println("removed " + (removed++));
+ // System.out.println("removed " + (removed++));
iter.next();
iter.remove();
}
13 years, 1 month
JBoss hornetq SVN: r11613 - in trunk: tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-10-28 09:00:09 -0400 (Fri, 28 Oct 2011)
New Revision: 11613
Modified:
trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/FileWrapperJournal.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
Log:
Check if SequentialFile is already closed journal wrapper.
Modified: trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/FileWrapperJournal.java
===================================================================
--- trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/FileWrapperJournal.java 2011-10-27 16:33:24 UTC (rev 11612)
+++ trunk/hornetq-journal/src/main/java/org/hornetq/core/journal/impl/FileWrapperJournal.java 2011-10-28 13:00:09 UTC (rev 11613)
@@ -58,6 +58,7 @@
@Override
public void stop() throws Exception
{
+ if (currentFile.getFile().isOpen())
currentFile.getFile().close();
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-10-27 16:33:24 UTC (rev 11612)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-10-28 13:00:09 UTC (rev 11613)
@@ -45,6 +45,7 @@
import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.tests.integration.cluster.util.TestableServer;
+import org.hornetq.tests.util.CountDownSessionFailureListener;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.TransportConfigurationUtils;
@@ -1582,24 +1583,10 @@
locator.setFailoverOnInitialConnection(true);
createSessionFactory();
- final CountDownLatch latch = new CountDownLatch(1);
-
- class MyListener implements SessionFailureListener
- {
- public void connectionFailed(final HornetQException me, boolean failedOver)
- {
- latch.countDown();
- }
-
- public void beforeReconnect(HornetQException exception)
- {
- System.out.println("MyListener.beforeReconnect");
- }
- }
-
+ CountDownSessionFailureListener listener = new CountDownSessionFailureListener();
ClientSession session = sendAndConsume(sf, true);
- session.addFailureListener(new MyListener());
+ session.addFailureListener(listener);
backupServer.stop();
@@ -1610,7 +1597,7 @@
backupServer.start();
- assertTrue("session failure listener", latch.await(5, TimeUnit.SECONDS));
+ assertTrue("session failure listener", listener.getLatch().await(5, TimeUnit.SECONDS));
ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
@@ -1744,24 +1731,11 @@
locator.setFailoverOnInitialConnection(true);
locator.setReconnectAttempts(-1);
sf = createSessionFactoryAndWaitForTopology(locator, 2);
- final CountDownLatch latch = new CountDownLatch(1);
+ CountDownSessionFailureListener listener = new CountDownSessionFailureListener();
- class MyListener implements SessionFailureListener
- {
- public void connectionFailed(final HornetQException me, boolean failedOver)
- {
- latch.countDown();
- }
-
- public void beforeReconnect(HornetQException exception)
- {
- System.out.println("MyListener.beforeReconnect");
- }
- }
-
ClientSession session = sendAndConsume(sf, true);
- session.addFailureListener(new MyListener());
+ session.addFailureListener(listener);
backupServer.stop();
@@ -1772,7 +1746,7 @@
backupServer.start();
- assertTrue("session failure listener", latch.await(5, TimeUnit.SECONDS));
+ assertTrue("session failure listener", listener.getLatch().await(5, TimeUnit.SECONDS));
ClientProducer producer = session.createProducer(FailoverTestBase.ADDRESS);
13 years, 1 month
JBoss hornetq SVN: r11612 - in branches/Branch_2_2_EAP: hornetq-rest and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-10-27 12:33:24 -0400 (Thu, 27 Oct 2011)
New Revision: 11612
Modified:
branches/Branch_2_2_EAP/build-maven.xml
branches/Branch_2_2_EAP/hornetq-rest/pom.xml
Log:
version update
Modified: branches/Branch_2_2_EAP/build-maven.xml
===================================================================
--- branches/Branch_2_2_EAP/build-maven.xml 2011-10-27 16:31:15 UTC (rev 11611)
+++ branches/Branch_2_2_EAP/build-maven.xml 2011-10-27 16:33:24 UTC (rev 11612)
@@ -13,7 +13,7 @@
-->
<project default="upload" name="HornetQ">
- <property name="hornetq.version" value="2.2.8.EAP.CR2"/>
+ <property name="hornetq.version" value="2.2.8.EAP.CR3"/>
<property name="build.dir" value="build"/>
<property name="jars.dir" value="${build.dir}/jars"/>
Modified: branches/Branch_2_2_EAP/hornetq-rest/pom.xml
===================================================================
--- branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-10-27 16:31:15 UTC (rev 11611)
+++ branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-10-27 16:33:24 UTC (rev 11612)
@@ -10,7 +10,7 @@
<properties>
<resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.8.EAP.CR2</hornetq.version>
+ <hornetq.version>2.2.8.EAP.CR3</hornetq.version>
</properties>
<licenses>
13 years, 1 month
JBoss hornetq SVN: r11611 - in branches/Branch_2_2_EAP/src/main/org/hornetq/core: server/cluster/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-10-27 12:31:15 -0400 (Thu, 27 Oct 2011)
New Revision: 11611
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
Log:
Fixing compatibility issues on Serialization after version check tests
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-10-27 11:40:08 UTC (rev 11610)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-10-27 16:31:15 UTC (rev 11611)
@@ -387,7 +387,7 @@
{
e.fillInStackTrace();
- this.topology = topology;
+ this.topology = topology == null ? new Topology(this) : topology;
this.ha = useHA;
@@ -466,7 +466,7 @@
*/
public ServerLocatorImpl(final boolean useHA, final DiscoveryGroupConfiguration groupConfiguration)
{
- this(useHA ? new Topology(null) : null, useHA, groupConfiguration, null);
+ this(new Topology(null), useHA, groupConfiguration, null);
if (useHA)
{
// We only set the owner at where the Topology was created.
@@ -482,7 +482,7 @@
*/
public ServerLocatorImpl(final boolean useHA, final TransportConfiguration... transportConfigs)
{
- this(useHA ? new Topology(null) : null, useHA, null, transportConfigs);
+ this(new Topology(null), useHA, null, transportConfigs);
if (useHA)
{
// We only set the owner at where the Topology was created.
@@ -1292,7 +1292,7 @@
public void notifyNodeDown(final long eventTime, final String nodeID)
{
- if (topology == null)
+ if (!ha)
{
// there's no topology here
return;
@@ -1339,7 +1339,7 @@
final Pair<TransportConfiguration, TransportConfiguration> connectorPair,
final boolean last)
{
- if (topology == null)
+ if (!ha)
{
// there's no topology
return;
@@ -1425,7 +1425,7 @@
{
this.initialConnectors[count++] = entry.getConnector();
- if (topology != null && topology.getMember(entry.getNodeID()) == null)
+ if (ha && topology.getMember(entry.getNodeID()) == null)
{
TopologyMember member = new TopologyMember(entry.getConnector(), null);
// on this case we set it as zero as any update coming from server should be accepted
@@ -1494,7 +1494,7 @@
TransportConfiguration backup = null;
- if (topology != null)
+ if (ha)
{
backup = topology.getBackupForConnector(factory.getConnectorConfiguration());
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-10-27 11:40:08 UTC (rev 11610)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/Topology.java 2011-10-27 16:31:15 UTC (rev 11611)
@@ -58,9 +58,9 @@
* keys are node IDs
* values are a pair of live/backup transport configurations
*/
- private final Map<String, TopologyMember> mapTopology = new ConcurrentHashMap<String, TopologyMember>();
+ private final Map<String, TopologyMember> topology = new ConcurrentHashMap<String, TopologyMember>();
- private final Map<String, Long> mapDelete = new ConcurrentHashMap<String, Long>();
+ private transient final Map<String, Long> mapDelete = new ConcurrentHashMap<String, Long>();
public Topology(final Object owner)
{
@@ -111,8 +111,8 @@
log.debug(this + "::node " + nodeId + "=" + memberInput);
}
memberInput.setUniqueEventID(System.currentTimeMillis());
- mapTopology.remove(nodeId);
- mapTopology.put(nodeId, memberInput);
+ topology.remove(nodeId);
+ topology.put(nodeId, memberInput);
sendMemberUp(memberInput.getUniqueEventID(), nodeId, memberInput);
}
}
@@ -134,13 +134,13 @@
new Exception("trace"));
currentMember = memberInput;
- mapTopology.put(nodeId, currentMember);
+ topology.put(nodeId, currentMember);
}
TopologyMember newMember = new TopologyMember(currentMember.getA(), memberInput.getB());
newMember.setUniqueEventID(System.currentTimeMillis());
- mapTopology.remove(nodeId);
- mapTopology.put(nodeId, newMember);
+ topology.remove(nodeId);
+ topology.put(nodeId, newMember);
sendMemberUp(newMember.getUniqueEventID(), nodeId, newMember);
return newMember;
@@ -172,7 +172,7 @@
synchronized (this)
{
- TopologyMember currentMember = mapTopology.get(nodeId);
+ TopologyMember currentMember = topology.get(nodeId);
if (currentMember == null)
{
@@ -184,7 +184,7 @@
memberInput, new Exception("trace"));
}
memberInput.setUniqueEventID(uniqueEventID);
- mapTopology.put(nodeId, memberInput);
+ topology.put(nodeId, memberInput);
sendMemberUp(uniqueEventID, nodeId, memberInput);
return true;
}
@@ -217,8 +217,8 @@
newMember.setUniqueEventID(uniqueEventID);
- mapTopology.remove(nodeId);
- mapTopology.put(nodeId, newMember);
+ topology.remove(nodeId);
+ topology.put(nodeId, newMember);
sendMemberUp(uniqueEventID, nodeId, newMember);
return true;
@@ -296,7 +296,7 @@
synchronized (this)
{
- member = mapTopology.get(nodeId);
+ member = topology.get(nodeId);
if (member != null)
{
if (member.getUniqueEventID() > uniqueEventID)
@@ -307,7 +307,7 @@
else
{
mapDelete.put(nodeId, uniqueEventID);
- member = mapTopology.remove(nodeId);
+ member = topology.remove(nodeId);
}
}
}
@@ -320,7 +320,7 @@
", result=" +
member +
", size = " +
- mapTopology.size(), new Exception("trace"));
+ topology.size(), new Exception("trace"));
}
if (member != null)
@@ -414,7 +414,7 @@
synchronized (Topology.this)
{
- copy = new HashMap<String, TopologyMember>(mapTopology);
+ copy = new HashMap<String, TopologyMember>(topology);
}
for (Map.Entry<String, TopologyMember> entry : copy.entrySet())
@@ -439,12 +439,12 @@
public synchronized TopologyMember getMember(final String nodeID)
{
- return mapTopology.get(nodeID);
+ return topology.get(nodeID);
}
public synchronized boolean isEmpty()
{
- return mapTopology.isEmpty();
+ return topology.isEmpty();
}
public Collection<TopologyMember> getMembers()
@@ -452,7 +452,7 @@
ArrayList<TopologyMember> members;
synchronized (this)
{
- members = new ArrayList<TopologyMember>(mapTopology.values());
+ members = new ArrayList<TopologyMember>(topology.values());
}
return members;
}
@@ -460,7 +460,7 @@
public synchronized int nodes()
{
int count = 0;
- for (TopologyMember member : mapTopology.values())
+ for (TopologyMember member : topology.values())
{
if (member.getA() != null)
{
@@ -483,12 +483,12 @@
{
String desc = text + "topology on " + this + ":\n";
- for (Entry<String, TopologyMember> entry : new HashMap<String, TopologyMember>(mapTopology).entrySet())
+ for (Entry<String, TopologyMember> entry : new HashMap<String, TopologyMember>(topology).entrySet())
{
desc += "\t" + entry.getKey() + " => " + entry.getValue() + "\n";
}
desc += "\t" + "nodes=" + nodes() + "\t" + "members=" + members();
- if (mapTopology.isEmpty())
+ if (topology.isEmpty())
{
desc += "\tEmpty";
}
@@ -497,7 +497,7 @@
public int members()
{
- return mapTopology.size();
+ return topology.size();
}
/** The owner exists mainly for debug purposes.
@@ -510,7 +510,7 @@
public TransportConfiguration getBackupForConnector(final TransportConfiguration connectorConfiguration)
{
- for (TopologyMember member : mapTopology.values())
+ for (TopologyMember member : topology.values())
{
if (member.getA() != null && member.getA().equals(connectorConfiguration))
{
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-10-27 11:40:08 UTC (rev 11610)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2011-10-27 16:31:15 UTC (rev 11611)
@@ -858,7 +858,7 @@
final Queue queue,
final boolean start) throws Exception
{
- final ServerLocatorInternal targetLocator = new ServerLocatorImpl(topology, false, connector);
+ final ServerLocatorInternal targetLocator = new ServerLocatorImpl(topology, true, connector);
String nodeId;
13 years, 1 month
JBoss hornetq SVN: r11610 - in trunk: hornetq-core/src/main/java/org/hornetq/core/replication and 2 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-10-27 07:40:08 -0400 (Thu, 27 Oct 2011)
New Revision: 11610
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java
trunk/hornetq-core/src/main/java/org/hornetq/core/replication/ReplicationManager.java
trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicatedJournal.java
trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java
trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
Log:
HORNETQ-720 Fix incorrect transaction parameters.
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java 2011-10-27 11:39:36 UTC (rev 11609)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/core/impl/wireformat/ReplicationCommitMessage.java 2011-10-27 11:40:08 UTC (rev 11610)
@@ -37,6 +37,8 @@
private long txId;
+ private boolean sync;
+
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -46,12 +48,13 @@
super(PacketImpl.REPLICATION_COMMIT_ROLLBACK);
}
- public ReplicationCommitMessage(final byte journalID, final boolean rollback, final long txId)
+ public ReplicationCommitMessage(final byte journalID, final boolean rollback, final long txId, boolean sync)
{
this();
this.journalID = journalID;
this.rollback = rollback;
this.txId = txId;
+ this.sync = sync;
}
// Public --------------------------------------------------------
@@ -62,6 +65,7 @@
buffer.writeByte(journalID);
buffer.writeBoolean(rollback);
buffer.writeLong(txId);
+ buffer.writeBoolean(sync);
}
@Override
@@ -70,6 +74,7 @@
journalID = buffer.readByte();
rollback = buffer.readBoolean();
txId = buffer.readLong();
+ sync = buffer.readBoolean();
}
public boolean isRollback()
@@ -82,6 +87,11 @@
return txId;
}
+ public boolean getSync()
+ {
+ return sync;
+ }
+
/**
* @return the journalID
*/
@@ -89,13 +99,4 @@
{
return journalID;
}
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/replication/ReplicationManager.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/replication/ReplicationManager.java 2011-10-27 11:39:36 UTC (rev 11609)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/replication/ReplicationManager.java 2011-10-27 11:40:08 UTC (rev 11610)
@@ -48,11 +48,11 @@
void appendDeleteRecordTransactional(byte journalID, long txID, long id) throws Exception;
- void appendCommitRecord(byte journalID, long txID, boolean lineUp) throws Exception;
+ void appendCommitRecord(byte journalID, long txID, boolean sync, boolean lineUp) throws Exception;
void appendPrepareRecord(byte journalID, long txID, EncodingSupport transactionData) throws Exception;
- void appendRollbackRecord(byte journalID, long txID) throws Exception;
+ void appendRollbackRecord(byte journalID, long txID, boolean sync) throws Exception;
/** A list of tokens that are still waiting for replications to be completed */
Set<OperationContext> getActiveTokens();
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicatedJournal.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicatedJournal.java 2011-10-27 11:39:36 UTC (rev 11609)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicatedJournal.java 2011-10-27 11:40:08 UTC (rev 11610)
@@ -38,7 +38,6 @@
* @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
*
* @see JournalStorageManager
- *
*/
public class ReplicatedJournal implements Journal
{
@@ -177,7 +176,7 @@
{
ReplicatedJournal.trace("AppendCommit " + txID);
}
- replicationManager.appendCommitRecord(journalID, txID, true);
+ replicationManager.appendCommitRecord(journalID, txID, sync, true);
localJournal.appendCommitRecord(txID, sync);
}
@@ -190,7 +189,7 @@
{
ReplicatedJournal.trace("AppendCommit " + txID);
}
- replicationManager.appendCommitRecord(journalID, txID, true);
+ replicationManager.appendCommitRecord(journalID, txID, sync, true);
localJournal.appendCommitRecord(txID, sync, callback);
}
@@ -203,9 +202,8 @@
{
ReplicatedJournal.trace("AppendCommit " + txID);
}
- replicationManager.appendCommitRecord(journalID, txID, lineUpContext);
+ replicationManager.appendCommitRecord(journalID, txID, sync, lineUpContext);
localJournal.appendCommitRecord(txID, sync, callback, lineUpContext);
-
}
@@ -225,9 +223,6 @@
localJournal.appendDeleteRecord(id, sync);
}
- /* (non-Javadoc)
- * @see org.hornetq.core.journal.Journal#appendDeleteRecord(long, boolean, org.hornetq.core.journal.IOCompletion)
- */
public void appendDeleteRecord(final long id, final boolean sync, final IOCompletion completionCallback) throws Exception
{
if (ReplicatedJournal.trace)
@@ -351,7 +346,7 @@
{
ReplicatedJournal.trace("AppendRollback " + txID);
}
- replicationManager.appendRollbackRecord(journalID, txID);
+ replicationManager.appendRollbackRecord(journalID, txID, sync);
localJournal.appendRollbackRecord(txID, sync);
}
@@ -364,7 +359,7 @@
{
ReplicatedJournal.trace("AppendRollback " + txID);
}
- replicationManager.appendRollbackRecord(journalID, txID);
+ replicationManager.appendRollbackRecord(journalID, txID, sync);
localJournal.appendRollbackRecord(txID, sync, callback);
}
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2011-10-27 11:39:36 UTC (rev 11609)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2011-10-27 11:40:08 UTC (rev 11610)
@@ -683,11 +683,11 @@
if (packet.isRollback())
{
- journalToUse.appendRollbackRecord(packet.getTxId(), false);
+ journalToUse.appendRollbackRecord(packet.getTxId(), packet.getSync());
}
else
{
- journalToUse.appendCommitRecord(packet.getTxId(), false);
+ journalToUse.appendCommitRecord(packet.getTxId(), packet.getSync());
}
}
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2011-10-27 11:39:36 UTC (rev 11609)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2011-10-27 11:40:08 UTC (rev 11610)
@@ -167,11 +167,13 @@
/* (non-Javadoc)
* @see org.hornetq.core.replication.ReplicationManager#appendCommitRecord(byte, long, boolean)
*/
- public void appendCommitRecord(final byte journalID, final long txID, final boolean lineUp) throws Exception
+ public
+ void
+ appendCommitRecord(final byte journalID, final long txID, boolean sync, final boolean lineUp) throws Exception
{
if (enabled)
{
- sendReplicatePacket(new ReplicationCommitMessage(journalID, false, txID), lineUp);
+ sendReplicatePacket(new ReplicationCommitMessage(journalID, false, txID, sync), lineUp);
}
}
@@ -214,11 +216,11 @@
/* (non-Javadoc)
* @see org.hornetq.core.replication.ReplicationManager#appendRollbackRecord(byte, long, boolean)
*/
- public void appendRollbackRecord(final byte journalID, final long txID) throws Exception
+ public void appendRollbackRecord(final byte journalID, final long txID, boolean sync) throws Exception
{
if (enabled)
{
- sendReplicatePacket(new ReplicationCommitMessage(journalID, false, txID));
+ sendReplicatePacket(new ReplicationCommitMessage(journalID, true, txID, sync));
}
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-10-27 11:39:36 UTC (rev 11609)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-10-27 11:40:08 UTC (rev 11610)
@@ -299,7 +299,7 @@
{
ClientMessage message = consumer.receive(1000);
- assertNotNull(message);
+ assertNotNull("Expecting message #" + i, message);
message.acknowledge();
}
13 years, 2 months
JBoss hornetq SVN: r11609 - in trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration: cluster/bridge and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-10-27 07:39:36 -0400 (Thu, 27 Oct 2011)
New Revision: 11609
Modified:
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JournalCrashTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageCompressTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java
trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
Log:
Silence tests
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2011-10-26 14:16:36 UTC (rev 11608)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2011-10-27 11:39:36 UTC (rev 11609)
@@ -115,7 +115,6 @@
ArrayList<ClientSession> sessions = new ArrayList<ClientSession>();
for (int i = 0; i < numConsumers; i++)
{
- System.out.println("created: " + i);
ClientSession session1 = sf.createSession();
ClientConsumer consumer = session1.createConsumer("testWindow");
consumers.add(consumer);
@@ -131,7 +130,6 @@
ClientMessage sent = senderSession.createMessage(true);
sent.putStringProperty("hello", "world");
- System.out.println("sending message");
producer.send(sent);
senderSession.commit();
@@ -190,7 +188,6 @@
message = consumer.receiveImmediate();
// message = consumer.receive(1000); // the test will pass if used receive(1000) instead of receiveImmediate
assertNotNull(message);
- System.out.println(message.getStringProperty("hello"));
message.acknowledge();
prod.send(msg);
@@ -198,7 +195,6 @@
message = consumer.receive(10000);
assertNotNull(message);
- System.out.println(message.getStringProperty("hello"));
message.acknowledge();
session.close();
@@ -234,7 +230,6 @@
ArrayList<ClientSession> sessions = new ArrayList<ClientSession>();
for (int i = 0; i < numConsumers; i++)
{
- System.out.println("created: " + i);
ClientSession session1 = sf.createSession();
ClientConsumer consumer = session1.createConsumer("testWindow");
consumers.add(consumer);
@@ -297,7 +292,6 @@
ArrayList<ClientSession> sessions = new ArrayList<ClientSession>();
for (int i = 0; i < numConsumers; i++)
{
- System.out.println("created: " + i);
ClientSession session1 = sf.createSession();
ClientConsumer consumer = session1.createConsumer("testWindow");
consumers.add(consumer);
@@ -916,17 +910,17 @@
{
internalTestFlowControlOnRollback(false);
}
-
+
public void testFlowControlLargeMessage() throws Exception
{
internalTestFlowControlOnRollback(true);
}
-
+
private void internalTestFlowControlOnRollback(final boolean isLargeMessage) throws Exception
{
HornetQServer server = createServer(false, isNetty());
-
+
AddressSettings settings = new AddressSettings();
settings.setMaxDeliveryAttempts(-1);
server.getAddressSettingsRepository().addMatch("#", settings);
@@ -940,7 +934,7 @@
server.start();
locator.setConsumerWindowSize(300000);
-
+
if (isLargeMessage)
{
// something to ensure we are using large messages
@@ -959,10 +953,10 @@
SimpleString ADDRESS = new SimpleString("some-queue");
session.createQueue(ADDRESS, ADDRESS, true);
-
-
+
+
ClientProducer producer = session.createProducer(ADDRESS);
-
+
for (int i = 0 ; i < numberOfMessages; i++)
{
ClientMessage msg = session.createMessage(true);
@@ -970,16 +964,15 @@
msg.getBodyBuffer().writeBytes(new byte[1024]);
producer.send(msg);
}
-
+
session.commit();
-
+
ClientConsumerInternal consumer = (ClientConsumerInternal)session.createConsumer(ADDRESS);
-
+
session.start();
for (int repeat = 0; repeat < 100; repeat ++)
{
- System.out.println("Repeat " + repeat);
long timeout = System.currentTimeMillis() + 2000;
// At least 10 messages on the buffer
while (timeout > System.currentTimeMillis() && consumer.getBufferSize() <= 10)
@@ -987,20 +980,19 @@
Thread.sleep(10);
}
assertTrue(consumer.getBufferSize() >= 10);
-
+
ClientMessage msg = consumer.receive(500);
msg.getBodyBuffer().readByte();
assertNotNull(msg);
msg.acknowledge();
session.rollback();
}
-
-
+
+
for (int i = 0 ; i < numberOfMessages; i++)
{
ClientMessage msg = consumer.receive(5000);
assertNotNull(msg);
- System.out.println("msg " + msg);
msg.getBodyBuffer().readByte();
msg.acknowledge();
session.commit();
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JournalCrashTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JournalCrashTest.java 2011-10-26 14:16:36 UTC (rev 11608)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/JournalCrashTest.java 2011-10-27 11:39:36 UTC (rev 11609)
@@ -18,7 +18,12 @@
import junit.framework.Assert;
import org.hornetq.api.core.SimpleString;
-import org.hornetq.api.core.client.*;
+import org.hornetq.api.core.client.ClientConsumer;
+import org.hornetq.api.core.client.ClientMessage;
+import org.hornetq.api.core.client.ClientProducer;
+import org.hornetq.api.core.client.ClientSession;
+import org.hornetq.api.core.client.ClientSessionFactory;
+import org.hornetq.api.core.client.ServerLocator;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.journal.PreparedTransactionInfo;
@@ -146,8 +151,8 @@
restart.sendMessages(start, end);
- System.out.println("....end");
- System.out.flush();
+ // System.out.println("....end");
+ // System.out.flush();
Runtime.getRuntime().halt(100);
}
@@ -276,13 +281,13 @@
journal.start();
journal.load(records, transactions, null);
- System.out.println("===============================================");
- System.out.println("Journal records at the end:");
-
- for (RecordInfo record : records)
- {
- System.out.println(record.id + ", update = " + record.isUpdate);
- }
+// System.out.println("===============================================");
+// System.out.println("Journal records at the end:");
+//
+// for (RecordInfo record : records)
+// {
+// System.out.println(record.id + ", update = " + record.isUpdate);
+// }
journal.stop();
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageCompressTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageCompressTest.java 2011-10-26 14:16:36 UTC (rev 11608)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageCompressTest.java 2011-10-27 11:39:36 UTC (rev 11609)
@@ -28,25 +28,28 @@
import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.api.core.client.ServerLocator;
import org.hornetq.tests.util.RandomUtil;
+import org.hornetq.tests.util.UnitTestCase;
/**
* A LargeMessageCompressTest
*
* Just extend the LargeMessageTest
- *
+ *
* @author <a href="mailto:hgao@redhat.com">Howard Gao</a>
- *
*
+ *
*/
public class LargeMessageCompressTest extends LargeMessageTest
{
// Constructors --------------------------------------------------
+ @Override
protected boolean isNetty()
{
return false;
}
+ @Override
protected ServerLocator createFactory(final boolean isNetty) throws Exception
{
ServerLocator locator = super.createFactory(isNetty);
@@ -85,7 +88,7 @@
ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS);
ClientMessage msg1 = consumer.receive(1000);
Assert.assertNotNull(msg1);
-
+
for (int i = 0 ; i < messageSize; i++)
{
byte b = msg1.getBodyBuffer().readByte();
@@ -152,15 +155,15 @@
ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS);
ClientMessage msg1 = consumer.receive(1000);
Assert.assertNotNull(msg1);
-
- String testDir = this.getTestDir();
+
+ String testDir = UnitTestCase.getTestDir();
File testFile = new File(testDir, "async_large_message");
FileOutputStream output = new FileOutputStream(testFile);
-
+
msg1.setOutputStream(output);
- msg1.waitOutputStreamCompletion(0);
-
+ msg1.waitOutputStreamCompletion(0);
+
msg1.acknowledge();
session.commit();
@@ -176,7 +179,7 @@
byte b = (byte)input.read();
assertEquals("position = " + i, getSamplebyte(i), b);
}
-
+
testFile.delete();
validateNoFilesOnLargeDir();
}
@@ -231,13 +234,13 @@
ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS);
ClientMessage msg1 = consumer.receive(1000);
Assert.assertNotNull(msg1);
-
- String testDir = this.getTestDir();
+
+ String testDir = UnitTestCase.getTestDir();
File testFile = new File(testDir, "async_large_message");
FileOutputStream output = new FileOutputStream(testFile);
msg1.saveToOutputStream(output);
-
+
msg1.acknowledge();
session.commit();
@@ -253,7 +256,7 @@
byte b = (byte)input.read();
assertEquals("position = " + i, getSamplebyte(i), b);
}
-
+
testFile.delete();
validateNoFilesOnLargeDir();
}
@@ -298,7 +301,7 @@
session.createQueue(LargeMessageTest.ADDRESS, LargeMessageTest.ADDRESS, true);
ClientProducer producer = session.createProducer(LargeMessageTest.ADDRESS);
-
+
byte [] msgs = new byte[1024 * 1024];
for (int i = 0 ; i < msgs.length; i++)
{
@@ -310,23 +313,23 @@
producer.send(clientFile);
session.commit();
-
+
session.close();
-
+
sf.close();
-
+
locator.close();
-
+
server.stop();
-
+
server = createServer(true, isNetty());
-
+
server.start();
-
+
locator = createFactory(isNetty());
-
+
sf = locator.createSessionFactory();
-
+
session = sf.createSession();
session.start();
@@ -334,15 +337,15 @@
ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS);
ClientMessage msg1 = consumer.receive(1000);
Assert.assertNotNull(msg1);
-
+
assertEquals(messageSize, msg1.getBodySize());
-
- String testDir = this.getTestDir();
+
+ String testDir = UnitTestCase.getTestDir();
File testFile = new File(testDir, "async_large_message");
FileOutputStream output = new FileOutputStream(testFile);
msg1.saveToOutputStream(output);
-
+
msg1.acknowledge();
session.commit();
@@ -358,7 +361,7 @@
byte b = (byte)input.read();
assertEquals("position = " + i, msgs[i], b);
}
-
+
testFile.delete();
validateNoFilesOnLargeDir();
}
@@ -383,6 +386,7 @@
}
+ @Override
public void testSendServerMessage() throws Exception
{
// doesn't make sense as compressed
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java 2011-10-26 14:16:36 UTC (rev 11608)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/LargeMessageTest.java 2011-10-27 11:39:36 UTC (rev 11609)
@@ -26,7 +26,14 @@
import org.hornetq.api.core.Message;
import org.hornetq.api.core.SimpleString;
-import org.hornetq.api.core.client.*;
+import org.hornetq.api.core.client.ClientConsumer;
+import org.hornetq.api.core.client.ClientMessage;
+import org.hornetq.api.core.client.ClientProducer;
+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.ClientConsumerInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.logging.Logger;
@@ -43,7 +50,7 @@
* A LargeMessageTest
*
* @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- *
+ *
* Created 29-Sep-08 4:04:10 PM
*
*
@@ -73,7 +80,7 @@
{
return false;
}
-
+
public void testRollbackPartiallyConsumedBuffer() throws Exception
{
for (int i = 0 ; i < 1; i++)
@@ -82,28 +89,28 @@
internalTestRollbackPartiallyConsumedBuffer(false);
tearDown();
setUp();
-
+
}
-
+
}
-
+
public void testRollbackPartiallyConsumedBufferWithRedeliveryDelay() throws Exception
{
internalTestRollbackPartiallyConsumedBuffer(true);
}
-
-
+
+
private void internalTestRollbackPartiallyConsumedBuffer(final boolean redeliveryDelay) throws Exception
{
final int messageSize = 100 * 1024;
-
+
final ClientSession session;
try
{
server = createServer(true, isNetty());
-
+
AddressSettings settings = new AddressSettings();
if (redeliveryDelay)
{
@@ -114,7 +121,7 @@
}
}
settings.setMaxDeliveryAttempts(-1);
-
+
server.getAddressSettingsRepository().addMatch("#", settings);
server.start();
@@ -130,35 +137,35 @@
for (int i = 0 ; i < 20; i++)
{
Message clientFile = createLargeClientMessage(session, messageSize, true);
-
+
clientFile.putIntProperty("value", i);
-
+
producer.send(clientFile);
}
session.commit();
session.start();
-
+
final CountDownLatch latch = new CountDownLatch(1);
-
+
final AtomicInteger errors = new AtomicInteger(0);
ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS);
-
+
consumer.setMessageHandler(new MessageHandler()
{
int counter = 0;
public void onMessage(ClientMessage message)
{
message.getBodyBuffer().readByte();
- System.out.println("message:" + message);
+ // System.out.println("message:" + message);
try
{
if (counter ++ < 20)
{
Thread.sleep(100);
- System.out.println("Rollback");
+ // System.out.println("Rollback");
message.acknowledge();
session.rollback();
}
@@ -167,7 +174,7 @@
message.acknowledge();
session.commit();
}
-
+
if (counter == 40)
{
latch.countDown();
@@ -181,7 +188,7 @@
}
}
});
-
+
assertTrue(latch.await(40, TimeUnit.SECONDS));
consumer.close();
@@ -2583,7 +2590,7 @@
}
}
}
-
+
// JBPAPP-6237
public void testPageOnLargeMessageMultipleQueues() throws Exception
{
@@ -2779,7 +2786,7 @@
for (int i = 0; i < 100; i++)
{
ClientMessage message = session.createMessage(true);
-
+
message.putIntProperty("msgID", msgId++);
message.putBooleanProperty("TestLarge", false);
@@ -2813,34 +2820,34 @@
ClientConsumer consumer = session.createConsumer(LargeMessageTest.ADDRESS.concat("-" + ad));
session.start();
-
+
for (int received = 0 ; received < 5; received++)
{
for (int i = 0; i < 100; i++)
{
ClientMessage message2 = consumer.receive(LargeMessageTest.RECEIVE_WAIT_TIME);
-
+
Assert.assertNotNull(message2);
-
+
assertFalse(message2.getBooleanProperty("TestLarge"));
-
+
message2.acknowledge();
-
+
Assert.assertNotNull(message2);
}
-
+
for (int i = 0; i < 10; i++)
{
ClientMessage messageLarge = consumer.receive(RECEIVE_WAIT_TIME);
-
+
Assert.assertNotNull(messageLarge);
-
+
assertTrue(messageLarge.getBooleanProperty("TestLarge"));
-
+
ByteArrayOutputStream bout = new ByteArrayOutputStream();
-
+
messageLarge.acknowledge();
-
+
messageLarge.saveToOutputStream(bout);
byte[] body = bout.toByteArray();
assertEquals(numberOfBytesBigMessage, body.length);
@@ -2849,7 +2856,7 @@
assertEquals(getSamplebyte(bi), body[bi]);
}
}
-
+
session.rollback();
}
Modified: trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
===================================================================
--- trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2011-10-26 14:16:36 UTC (rev 11608)
+++ trunk/tests/integration-tests/src/test/java/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2011-10-27 11:39:36 UTC (rev 11609)
@@ -1087,6 +1087,7 @@
class ConsumerThread extends Thread
{
+ @Override
public void run()
{
try
@@ -1137,6 +1138,7 @@
{
this.nmsg = nmsg;
}
+ @Override
public void run()
{
ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(server0tc);
@@ -1204,7 +1206,6 @@
for (int repeat = 0 ; repeat < totalrepeats; repeat++)
{
- System.out.println("Repeat " + repeat);
ArrayList<Thread> threads = new ArrayList<Thread>();
threads.add(new ConsumerThread());
13 years, 2 months
JBoss hornetq SVN: r11608 - trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-10-26 10:16:36 -0400 (Wed, 26 Oct 2011)
New Revision: 11608
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
Log:
Fix snafu with isClosed().
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-10-26 14:16:23 UTC (rev 11607)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-10-26 14:16:36 UTC (rev 11608)
@@ -555,7 +555,7 @@
}
catch (Exception e)
{
- if (!isClosed())
+ if (isInitialized())
{
log.warn("did not connect the cluster connection to other nodes", e);
}
@@ -608,6 +608,11 @@
return state == STATE.CLOSED || state == STATE.CLOSING;
}
+ public boolean isInitialized()
+ {
+ return state == STATE.INITIALIZED;
+ }
+
public ClientSessionFactory createSessionFactory(final TransportConfiguration transportConfiguration) throws Exception
{
assertOpen();
@@ -700,6 +705,8 @@
try
{
+ assertOpen();
+
factory =
new ClientSessionFactoryImpl(this, tc, callTimeout, clientFailureCheckPeriod, connectionTTL,
retryInterval, retryIntervalMultiplier, maxRetryInterval,
@@ -748,7 +755,7 @@
if (ha || clusterConnection)
{
long timeout = System.currentTimeMillis() + 30000;
- while (!isClosed() && !receivedTopology && timeout > System.currentTimeMillis())
+ while (isInitialized() && !receivedTopology && timeout > System.currentTimeMillis())
{
// Now wait for the topology
@@ -1537,7 +1544,7 @@
{
int retryNumber = 0;
- while (csf == null && isClosed())
+ while (csf == null && isInitialized())
{
retryNumber++;
for (Connector conn : connectors)
@@ -1590,7 +1597,7 @@
break;
}
- if (!isClosed())
+ if (isInitialized())
{
Thread.sleep(retryInterval);
}
@@ -1603,7 +1610,7 @@
throw new HornetQException(HornetQException.NOT_CONNECTED, "Failed to connect to any static connectors", e);
}
- if (csf == null && !isClosed())
+ if (csf == null && isInitialized())
{
log.warn("Failed to connecto to any static connector, throwing exception now");
throw new HornetQException(HornetQException.NOT_CONNECTED, "Failed to connect to any static connectors");
13 years, 2 months
JBoss hornetq SVN: r11607 - trunk/hornetq-core/src/test/java/org/hornetq/tests/util.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-10-26 10:16:23 -0400 (Wed, 26 Oct 2011)
New Revision: 11607
Modified:
trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java
Log:
Remove call to std.out
Modified: trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java
===================================================================
--- trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2011-10-26 14:16:11 UTC (rev 11606)
+++ trunk/hornetq-core/src/test/java/org/hornetq/tests/util/UnitTestCase.java 2011-10-26 14:16:23 UTC (rev 11607)
@@ -636,8 +636,6 @@
recreateDirectory(getLargeMessagesDir(testDir));
recreateDirectory(getClientLargeMessagesDir(testDir));
recreateDirectory(getTemporaryDir(testDir));
-
- System.out.println("deleted " + testDir);
}
/**
13 years, 2 months
JBoss hornetq SVN: r11606 - trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-10-26 10:16:11 -0400 (Wed, 26 Oct 2011)
New Revision: 11606
Modified:
trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/DeliveryOrderTest.java
Log:
Don't write every msg to std.out
Modified: trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/DeliveryOrderTest.java
===================================================================
--- trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/DeliveryOrderTest.java 2011-10-26 14:15:59 UTC (rev 11605)
+++ trunk/tests/jms-tests/src/test/java/org/hornetq/jms/tests/DeliveryOrderTest.java 2011-10-26 14:16:11 UTC (rev 11606)
@@ -33,10 +33,6 @@
* A DeliveryOrderTest
*
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 1.1 $</tt>
- *
- * $Id$
- *
*/
public class DeliveryOrderTest extends JMSTestCase
{
@@ -127,9 +123,6 @@
return;
}
-
- System.out.println("Message " + msg);
-
try
{
TextMessage tm = (TextMessage)msg;
13 years, 2 months
JBoss hornetq SVN: r11605 - trunk/tests/integration-tests.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-10-26 10:15:59 -0400 (Wed, 26 Oct 2011)
New Revision: 11605
Modified:
trunk/tests/integration-tests/pom.xml
Log:
Do not ignore replicated tests
Modified: trunk/tests/integration-tests/pom.xml
===================================================================
--- trunk/tests/integration-tests/pom.xml 2011-10-26 12:14:51 UTC (rev 11604)
+++ trunk/tests/integration-tests/pom.xml 2011-10-26 14:15:59 UTC (rev 11605)
@@ -112,12 +112,6 @@
<excludes>
<exclude>**/ReplicatedJMSFailoverTest.java</exclude>
<exclude>org/hornetq/tests/util/*.java</exclude>
- <!-- exclude some replication tests for now -->
- <exclude>**/cluster/failover/Remote*.java</exclude>
- <exclude>**/failover/remote/**.java</exclude>
- <exclude>**/Replicated*.java</exclude>
- <excluse>**/replication/**.java</excluse>
- <exclude>**/*Replicated**.java</exclude>
</excludes>
<argLine>-Djava.library.path=${user.dir}/distribution/hornetq/src/main/resources/bin -Djava.util.logging.config.file=${user.dir}/distribution/hornetq/src/main/resources/stand-alone/non-clustered/logging.properties</argLine>
</configuration>
13 years, 2 months