JBoss hornetq SVN: r9403 - trunk/tests/src/org/hornetq/tests/integration/journal.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-07-15 14:23:17 -0400 (Thu, 15 Jul 2010)
New Revision: 9403
Modified:
trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java
Log:
Adding a test that replicates a bug on compacting
Modified: trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2010-07-15 12:43:50 UTC (rev 9402)
+++ trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2010-07-15 18:23:17 UTC (rev 9403)
@@ -37,7 +37,9 @@
import org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase;
import org.hornetq.tests.unit.core.journal.impl.fakes.SimpleEncoding;
import org.hornetq.utils.IDGenerator;
+import org.hornetq.utils.SimpleIDGenerator;
import org.hornetq.utils.TimeAndCounterIDGenerator;
+import org.hornetq.utils.VariableLatch;
/**
*
@@ -560,7 +562,108 @@
loadAndCheck();
}
+
+ // This test is under investigation... disabled for now
+ public void _testCompactAddAndUpdateFollowedByADelete() throws Exception
+ {
+ setup(2, 60 * 1024, false);
+
+ SimpleIDGenerator idGen = new SimpleIDGenerator(1000);
+
+
+ final VariableLatch reusableLatchDone = new VariableLatch();
+ reusableLatchDone.up();
+ final VariableLatch reusableLatchWait = new VariableLatch();
+ reusableLatchWait.up();
+
+ journal = new JournalImpl(fileSize, minFiles, 0, 0, fileFactory, filePrefix, fileExtension, maxAIO)
+ {
+
+ @Override
+ public void onCompactDone()
+ {
+ reusableLatchDone.down();
+ System.out.println("Waiting on Compact");
+ try
+ {
+ reusableLatchWait.waitCompletion();
+ }
+ catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
+ System.out.println("Done");
+ }
+ };
+
+ journal.setAutoReclaim(false);
+
+ startJournal();
+ load();
+
+ long firstID = idGen.generateID();
+
+ long consumerTX = idGen.generateID();
+
+ long appendTX = idGen.generateID();
+
+ long addedRecord = idGen.generateID();
+
+ add(firstID);
+
+ updateTx(consumerTX, firstID);
+
+
+ Thread tCompact = new Thread()
+ {
+ @Override
+ public void run()
+ {
+ try
+ {
+ journal.compact();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ };
+
+
+ tCompact.start();
+
+
+ reusableLatchDone.waitCompletion();
+
+ addTx(appendTX, addedRecord);
+ updateTx(appendTX, addedRecord);
+ commit(appendTX);
+ updateTx(consumerTX, addedRecord);
+ commit(consumerTX);
+ delete(addedRecord);
+
+ reusableLatchWait.down();
+
+ tCompact.join();
+
+ journal.forceMoveNextFile();
+
+ long newRecord = idGen.generateID();
+ add(newRecord);
+ update(newRecord);
+
+ journal.compact();
+
+ stopJournal();
+ createJournal();
+ startJournal();
+ loadAndCheck();
+
+ }
+
+
public void testSimpleCompacting() throws Exception
{
setup(2, 60 * 1024, false);
13 years, 11 months
JBoss hornetq SVN: r9402 - trunk/src/main/org/hornetq/core/paging/impl.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2010-07-15 08:43:50 -0400 (Thu, 15 Jul 2010)
New Revision: 9402
Modified:
trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
Log:
PagingStore.isPaging() always returns false if the policy is to BLOCK
Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2010-07-15 10:21:14 UTC (rev 9401)
+++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2010-07-15 12:43:50 UTC (rev 9402)
@@ -220,8 +220,12 @@
try
{
- if (addressFullMessagePolicy != AddressFullMessagePolicy.PAGE)
+ if (addressFullMessagePolicy == AddressFullMessagePolicy.BLOCK)
{
+ return false;
+ }
+ else if (addressFullMessagePolicy == AddressFullMessagePolicy.DROP)
+ {
return isFull();
}
else
13 years, 11 months
JBoss hornetq SVN: r9401 - in branches/2_2_0_HA_Improvements: src/main/org/hornetq/ra and 1 other directories.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-07-15 06:21:14 -0400 (Thu, 15 Jul 2010)
New Revision: 9401
Modified:
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java
Log:
tweaked ra ha setting, fixed test and added NoSharedstore activation for the server
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-07-14 07:50:45 UTC (rev 9400)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-07-15 10:21:14 UTC (rev 9401)
@@ -289,6 +289,101 @@
return new LockFileImpl(fileName, directory);
}
+ private class NoSharedStoreLiveActivation implements Activation
+ {
+ LockFile liveLock;
+
+ public void run()
+ {
+ try
+ {
+ File journalDir = new File(configuration.getJournalDirectory());
+
+ if (!journalDir.exists())
+ {
+ if (configuration.isCreateJournalDir())
+ {
+ journalDir.mkdirs();
+ }
+ else
+ {
+ throw new IllegalArgumentException("Directory " + journalDir +
+ " does not exist and will not create it");
+ }
+ }
+
+
+ // We now load the node id file, creating it, if it doesn't exist yet
+ File nodeIDFile = new File(configuration.getJournalDirectory(), "node.id");
+
+ if (!nodeIDFile.exists())
+ {
+ // We use another file lock to prevent a backup reading it before it is complete
+
+ LockFile nodeIDLockFile = createLockFile("nodeid.lock", configuration.getJournalDirectory());
+
+ nodeIDLockFile.lock();
+
+ OutputStream os = null;
+
+ try
+ {
+ os = new BufferedOutputStream(new FileOutputStream(nodeIDFile));
+
+ uuid = UUIDGenerator.getInstance().generateUUID();
+
+ nodeID = new SimpleString(uuid.toString());
+
+ os.write(uuid.asBytes());
+
+ log.info("Wrote node id, it is " + nodeID);
+ }
+ finally
+ {
+ if (os != null)
+ {
+ os.close();
+ }
+ }
+
+ nodeIDLockFile.unlock();
+ }
+ else
+ {
+ // Read it
+
+ readNodeID(nodeIDFile);
+ }
+
+ initialisePart1();
+
+ initialisePart2();
+
+ log.info("Server is now live");
+ }
+ catch (Exception e)
+ {
+ log.error("Failure in initialisation", e);
+ }
+ }
+
+ public void close() throws Exception
+ {
+ if (liveLock != null)
+ {
+ // We need to delete the file too, otherwise the backup will failover when we shutdown or if the backup is
+ // started before the live
+
+ File liveFile = new File(configuration.getJournalDirectory(), "live.lock");
+
+ liveFile.delete();
+
+ liveLock.unlock();
+
+ }
+ }
+ }
+
private class SharedStoreLiveActivation implements Activation
{
LockFile liveLock;
@@ -631,6 +726,12 @@
activation.run();
}
+ else
+ {
+ activation = new NoSharedStoreLiveActivation();
+
+ activation.run();
+ }
}
started = true;
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2010-07-14 07:50:45 UTC (rev 9400)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2010-07-15 10:21:14 UTC (rev 9401)
@@ -31,6 +31,8 @@
*/
private static boolean trace = ConnectionFactoryProperties.log.isTraceEnabled();
+ private final static Boolean IS_HA = false;
+
private boolean hasBeenUpdated = false;
/**
@@ -43,7 +45,7 @@
*/
private Map<String, Object> connectionParameters;
- private Boolean ha;
+ private Boolean ha = IS_HA;
private String connectionLoadBalancingPolicyClassName;
Modified: branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java
===================================================================
--- branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2010-07-14 07:50:45 UTC (rev 9400)
+++ branches/2_2_0_HA_Improvements/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2010-07-15 10:21:14 UTC (rev 9401)
@@ -84,7 +84,7 @@
Assert.assertEquals(factory.getDiscoveryAddress(), null);
Assert.assertEquals(factory.getDiscoveryInitialWaitTimeout(),
HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT);
- Assert.assertEquals(factory.getDiscoveryPort(), 0);
+ Assert.assertEquals(factory.getDiscoveryPort(), -1);
Assert.assertEquals(factory.getDiscoveryRefreshTimeout(),
HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT);
Assert.assertEquals(factory.getDupsOKBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE);
@@ -138,7 +138,7 @@
Assert.assertEquals(factory.getDiscoveryAddress(), null);
Assert.assertEquals(factory.getDiscoveryInitialWaitTimeout(),
HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT);
- Assert.assertEquals(factory.getDiscoveryPort(), 0);
+ Assert.assertEquals(factory.getDiscoveryPort(), -1);
Assert.assertEquals(factory.getDiscoveryRefreshTimeout(),
HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT);
Assert.assertEquals(factory.getDupsOKBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE);
@@ -206,7 +206,7 @@
Assert.assertEquals(factory.getConsumerWindowSize(), 5);
Assert.assertEquals(factory.getDiscoveryAddress(), null);
Assert.assertEquals(factory.getDiscoveryInitialWaitTimeout(), 6);
- Assert.assertEquals(factory.getDiscoveryPort(), 0);
+ Assert.assertEquals(factory.getDiscoveryPort(), -1);
Assert.assertEquals(factory.getDiscoveryRefreshTimeout(), 7);
Assert.assertEquals(factory.getDupsOKBatchSize(), 8);
Assert.assertEquals(factory.getMinLargeMessageSize(), 10);
@@ -270,7 +270,7 @@
Assert.assertEquals(factory.getConsumerWindowSize(), 5);
Assert.assertEquals(factory.getDiscoveryAddress(), null);
Assert.assertEquals(factory.getDiscoveryInitialWaitTimeout(), 6);
- Assert.assertEquals(factory.getDiscoveryPort(), 0);
+ Assert.assertEquals(factory.getDiscoveryPort(), -1);
Assert.assertEquals(factory.getDiscoveryRefreshTimeout(), 7);
Assert.assertEquals(factory.getDupsOKBatchSize(), 8);
Assert.assertEquals(factory.getMinLargeMessageSize(), 10);
13 years, 11 months
JBoss hornetq SVN: r9399 - trunk/tests/src/org/hornetq/tests/integration/client.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-07-13 12:22:26 -0400 (Tue, 13 Jul 2010)
New Revision: 9399
Modified:
trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java
Log:
Adding a new test
Modified: trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-07-11 11:45:37 UTC (rev 9398)
+++ trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-07-13 16:22:26 UTC (rev 9399)
@@ -360,7 +360,155 @@
}
}
+
+
+ /**
+ * - Make a destination in page mode
+ * - Add stuff to a transaction
+ * - Consume the entire destination (not in page mode any more)
+ * - Add stuff to a transaction again
+ * - Check order
+ *
+ * Test under discussion at : http://community.jboss.org/thread/154061?tstart=0
+ *
+ */
+ public void disabled_testDepageDuringTransaction2() throws Exception
+ {
+ boolean IS_DURABLE_MESSAGE = true;
+ clearData();
+ Configuration config = createDefaultConfig();
+
+ HornetQServer server = createServer(true,
+ config,
+ PagingTest.PAGE_SIZE,
+ PagingTest.PAGE_MAX,
+ new HashMap<String, AddressSettings>());
+
+ server.start();
+
+ final int messageSize = 1024; // 1k
+
+ try
+ {
+ ClientSessionFactory sf = createInVMFactory();
+
+ sf.setBlockOnNonDurableSend(true);
+ sf.setBlockOnDurableSend(true);
+ sf.setBlockOnAcknowledge(true);
+
+ byte[] body = new byte[messageSize];
+
+ ClientSession sessionTransacted = sf.createSession(null, null, false, false, false, false, 0);
+
+ ClientProducer producerTransacted = sessionTransacted.createProducer(PagingTest.ADDRESS);
+
+ ClientMessage firstMessage = sessionTransacted.createMessage(IS_DURABLE_MESSAGE);
+ firstMessage.getBodyBuffer().writeBytes(body);
+ firstMessage.putIntProperty(new SimpleString("id"), 0);
+
+ producerTransacted.send(firstMessage);
+
+ ClientSession session = sf.createSession(null, null, false, true, true, false, 0);
+
+ session.createQueue(PagingTest.ADDRESS, PagingTest.ADDRESS, null, true);
+
+ ClientProducer producer = session.createProducer(PagingTest.ADDRESS);
+
+
+ ClientMessage message = null;
+
+ int numberOfMessages = 0;
+ while (true)
+ {
+ message = session.createMessage(IS_DURABLE_MESSAGE);
+ message.getBodyBuffer().writeBytes(body);
+
+ // Stop sending message as soon as we start paging
+ if (server.getPostOffice().getPagingManager().getPageStore(PagingTest.ADDRESS).isPaging())
+ {
+ break;
+ }
+ numberOfMessages++;
+
+ producer.send(message);
+ }
+
+ Assert.assertTrue(server.getPostOffice().getPagingManager().getPageStore(PagingTest.ADDRESS).isPaging());
+
+ session.start();
+
+ for (int i = 1; i < 10; i++)
+ {
+ message = session.createMessage(true);
+ message.getBodyBuffer().writeBytes(body);
+ message.putIntProperty(new SimpleString("id"), i);
+
+ // Consume messages to force an eventual out of order delivery
+ if (i == 5)
+ {
+ ClientConsumer consumer = session.createConsumer(PagingTest.ADDRESS);
+ for (int j = 0; j < numberOfMessages; j++)
+ {
+ ClientMessage msg = consumer.receive(PagingTest.RECEIVE_TIMEOUT);
+ msg.acknowledge();
+ Assert.assertNotNull(msg);
+ }
+
+ Assert.assertNull(consumer.receiveImmediate());
+ consumer.close();
+ }
+
+ Integer messageID = (Integer)message.getObjectProperty(new SimpleString("id"));
+ Assert.assertNotNull(messageID);
+ Assert.assertEquals(messageID.intValue(), i);
+
+ producerTransacted.send(message);
+ }
+
+ ClientConsumer consumer = session.createConsumer(PagingTest.ADDRESS);
+
+ Assert.assertNull(consumer.receiveImmediate());
+
+ sessionTransacted.commit();
+
+ sessionTransacted.close();
+
+ for (int i = 0; i < 10; i++)
+ {
+ message = consumer.receive(PagingTest.RECEIVE_TIMEOUT);
+
+ Assert.assertNotNull(message);
+
+ Integer messageID = (Integer)message.getObjectProperty(new SimpleString("id"));
+
+ Assert.assertNotNull(messageID);
+ Assert.assertEquals("message received out of order", messageID.intValue(), i);
+
+ message.acknowledge();
+ }
+
+ Assert.assertNull(consumer.receiveImmediate());
+
+ consumer.close();
+
+ session.close();
+ }
+ finally
+ {
+ try
+ {
+ server.stop();
+ }
+ catch (Throwable ignored)
+ {
+ }
+ }
+
+ }
+
+
+
public void testPageOnSchedulingNoRestart() throws Exception
{
internalTestPageOnScheduling(false);
13 years, 11 months
JBoss hornetq SVN: r9398 - in branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server: cluster/impl and 1 other directories.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-07-11 07:45:37 -0400 (Sun, 11 Jul 2010)
New Revision: 9398
Modified:
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
HA improvements
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2010-07-11 11:05:40 UTC (rev 9397)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2010-07-11 11:45:37 UTC (rev 9398)
@@ -38,11 +38,9 @@
Set<BroadcastGroup> getBroadcastGroups();
- void activate();
-
void registerTopologyListener(ClusterTopologyListener listener, boolean clusterConnection);
void unregisterTopologyListener(ClusterTopologyListener listener, boolean clusterConnection);
- void announceNode(String nodeID, boolean backup);
+ void activate();
}
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-07-11 11:05:40 UTC (rev 9397)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-07-11 11:45:37 UTC (rev 9398)
@@ -150,6 +150,10 @@
deployBridge(config);
}
+ // Now announce presence
+
+ announceNode();
+
started = true;
}
@@ -213,36 +217,6 @@
return clusterConnections.get(name.toString());
}
- public synchronized void activate()
- {
- for (BroadcastGroup bg : broadcastGroups.values())
- {
- bg.activate();
- }
-
- for (Bridge bridge : bridges.values())
- {
- bridge.activate();
- }
-
- for (ClusterConnection cc : clusterConnections.values())
- {
- cc.activate();
- }
-
- backup = false;
- }
-
- public void startAnnouncement()
- {
-
- }
-
- public void stopAnnouncement()
- {
-
- }
-
private Set<ClusterTopologyListener> clientListeners = new ConcurrentHashSet<ClusterTopologyListener>();
private Set<ClusterTopologyListener> clusterConnectionListeners = new ConcurrentHashSet<ClusterTopologyListener>();
@@ -283,13 +257,26 @@
}
}
- public synchronized void announceNode(final String nodeID, final boolean backup)
+ // backup node becomes live
+ public synchronized void activate()
{
+ if (backup)
+ {
+ backup = false;
+
+ announceNode();
+ }
+ }
+
+ private synchronized void announceNode()
+ {
// TODO does this really work with more than one cluster connection? I think not
// Just take the first one for now
ClusterConnection cc = clusterConnections.values().iterator().next();
+ String nodeID = server.getNodeID().toString();
+
Pair<TransportConfiguration, TransportConfiguration> pair = topology.get(nodeID);
if (pair == null)
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-07-11 11:05:40 UTC (rev 9397)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-07-11 11:45:37 UTC (rev 9398)
@@ -366,10 +366,6 @@
initialisePart2();
- // Announce presence of live node to cluster
-
- clusterManager.announceNode(nodeID.toString(), false);
-
log.info("Server is now live");
}
catch (Exception e)
@@ -490,10 +486,8 @@
initialisePart1();
- //Announce presence of this backup to rest of cluster
+ //TODO TODO at this point the clustermanager needs to announce it's presence so the cluster can know about the backup
- clusterManager.announceNode(nodeID.toString(), true);
-
// We now look for the live.lock file - if it doesn't exist it means the live isn't started yet, so we wait
// for that
@@ -526,12 +520,13 @@
// Announce presence of live node to cluster
- clusterManager.announceNode(nodeID.toString(), false);
-
+
break;
}
configuration.setBackup(false);
+
+ clusterManager.activate();
initialisePart2();
13 years, 11 months
JBoss hornetq SVN: r9397 - in branches/2_2_0_HA_Improvements/src: main/org/hornetq/core/config and 4 other directories.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-07-11 07:05:40 -0400 (Sun, 11 Jul 2010)
New Revision: 9397
Modified:
branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-configuration.xsd
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterConnection.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
HA improvements
Modified: branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-configuration.xsd
===================================================================
--- branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-configuration.xsd 2010-07-11 10:11:08 UTC (rev 9396)
+++ branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-configuration.xsd 2010-07-11 11:05:40 UTC (rev 9397)
@@ -245,13 +245,6 @@
</xsd:complexType>
</xsd:element>
- <xsd:complexType name="connector-refType">
- <xsd:attribute name="connector-name" type="xsd:IDREF" use="required">
- </xsd:attribute>
- <xsd:attribute name="backup-connector-name" type="xsd:IDREF" use="optional">
- </xsd:attribute>
- </xsd:complexType>
-
<xsd:element name="remoting-interceptors">
<xsd:complexType>
<xsd:sequence>
@@ -321,7 +314,7 @@
<xsd:element maxOccurs="1" minOccurs="1" name="static-connectors">
<xsd:complexType>
<xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="1" name="connector-ref" type="connectorRefType"/>
+ <xsd:element maxOccurs="unbounded" minOccurs="1" name="connector-ref" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
@@ -340,6 +333,8 @@
<xsd:sequence>
<xsd:element maxOccurs="1" minOccurs="1" name="address" type="xsd:string">
</xsd:element>
+ <xsd:element maxOccurs="1" minOccurs="1" name="connector-ref" type="xsd:string">
+ </xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="retry-interval" type="xsd:long">
</xsd:element>
<xsd:element maxOccurs="1" minOccurs="0" name="use-duplicate-detection" type="xsd:boolean">
@@ -354,7 +349,7 @@
<xsd:element maxOccurs="1" minOccurs="1" name="static-connectors">
<xsd:complexType>
<xsd:sequence>
- <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-ref" type="connectorRefType"/>
+ <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-ref" type="xsd:string"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java 2010-07-11 10:11:08 UTC (rev 9396)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/config/ClusterConnectionConfiguration.java 2010-07-11 11:05:40 UTC (rev 9397)
@@ -32,6 +32,8 @@
private final String name;
private final String address;
+
+ private final String connectorName;
private final long retryInterval;
@@ -49,6 +51,7 @@
public ClusterConnectionConfiguration(final String name,
final String address,
+ final String connectorName,
final long retryInterval,
final boolean duplicateDetection,
final boolean forwardWhenNoConsumers,
@@ -58,6 +61,7 @@
{
this.name = name;
this.address = address;
+ this.connectorName = connectorName;
this.retryInterval = retryInterval;
this.staticConnectors = staticConnectors;
this.duplicateDetection = duplicateDetection;
@@ -69,6 +73,7 @@
public ClusterConnectionConfiguration(final String name,
final String address,
+ final String connectorName,
final long retryInterval,
final boolean duplicateDetection,
final boolean forwardWhenNoConsumers,
@@ -78,6 +83,7 @@
{
this.name = name;
this.address = address;
+ this.connectorName = connectorName;
this.retryInterval = retryInterval;
this.duplicateDetection = duplicateDetection;
this.forwardWhenNoConsumers = forwardWhenNoConsumers;
@@ -96,6 +102,11 @@
{
return address;
}
+
+ public String getConnectorName()
+ {
+ return connectorName;
+ }
public boolean isDuplicateDetection()
{
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-07-11 10:11:08 UTC (rev 9396)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-07-11 11:05:40 UTC (rev 9397)
@@ -935,6 +935,8 @@
String name = e.getAttribute("name");
String address = XMLConfigurationUtil.getString(e, "address", null, Validators.NOT_NULL_OR_EMPTY);
+
+ String connectorName = XMLConfigurationUtil.getString(e, "connector-ref", null, Validators.NOT_NULL_OR_EMPTY);
boolean duplicateDetection = XMLConfigurationUtil.getBoolean(e,
"use-duplicate-detection",
@@ -983,9 +985,9 @@
if (child2.getNodeName().equals("connector-ref"))
{
- String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue();
+ String connName = child.getAttributes().getNamedItem("connector-name").getNodeValue();
- staticConnectorNames.add(connectorName);
+ staticConnectorNames.add(connName);
}
}
}
@@ -997,6 +999,7 @@
{
config = new ClusterConnectionConfiguration(name,
address,
+ connectorName,
retryInterval,
duplicateDetection,
forwardWhenNoConsumers,
@@ -1008,6 +1011,7 @@
{
config = new ClusterConnectionConfiguration(name,
address,
+ connectorName,
retryInterval,
duplicateDetection,
forwardWhenNoConsumers,
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterConnection.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterConnection.java 2010-07-11 10:11:08 UTC (rev 9396)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterConnection.java 2010-07-11 11:05:40 UTC (rev 9397)
@@ -51,4 +51,6 @@
void activate();
Pair<TransportConfiguration, TransportConfiguration>[] getTopology();
+
+ TransportConfiguration getConnector();
}
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2010-07-11 10:11:08 UTC (rev 9396)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2010-07-11 11:05:40 UTC (rev 9397)
@@ -17,7 +17,6 @@
import java.util.Set;
import org.hornetq.api.core.SimpleString;
-import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClusterTopologyListener;
import org.hornetq.core.server.HornetQComponent;
@@ -45,5 +44,5 @@
void unregisterTopologyListener(ClusterTopologyListener listener, boolean clusterConnection);
- void announceNode(String nodeID, boolean backup, TransportConfiguration connector);
+ void announceNode(String nodeID, boolean backup);
}
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-07-11 10:11:08 UTC (rev 9396)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-07-11 11:05:40 UTC (rev 9397)
@@ -97,8 +97,11 @@
private Pair<TransportConfiguration, TransportConfiguration>[] topology;
private final ServerLocator serverLocator;
+
+ private final TransportConfiguration connector;
public ClusterConnectionImpl(final ServerLocator serverLocator,
+ final TransportConfiguration connector,
final SimpleString name,
final SimpleString address,
final long retryInterval,
@@ -117,6 +120,8 @@
final String clusterPassword) throws Exception
{
this.serverLocator = serverLocator;
+
+ this.connector = connector;
this.name = name;
@@ -249,6 +254,11 @@
backup = false;
}
+
+ public TransportConfiguration getConnector()
+ {
+ return connector;
+ }
// ClusterTopologyListener implementation ------------------------------------------------------------------
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-07-11 10:11:08 UTC (rev 9396)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-07-11 11:05:40 UTC (rev 9397)
@@ -283,21 +283,24 @@
}
}
- public synchronized void announceNode(final String nodeID,
- final boolean backup,
- final TransportConfiguration connector)
+ public synchronized void announceNode(final String nodeID, final boolean backup)
{
+ // TODO does this really work with more than one cluster connection? I think not
+
+ // Just take the first one for now
+ ClusterConnection cc = clusterConnections.values().iterator().next();
+
Pair<TransportConfiguration, TransportConfiguration> pair = topology.get(nodeID);
if (pair == null)
{
if (backup)
{
- pair = new Pair<TransportConfiguration, TransportConfiguration>(null, connector);
+ pair = new Pair<TransportConfiguration, TransportConfiguration>(null, cc.getConnector());
}
else
{
- pair = new Pair<TransportConfiguration, TransportConfiguration>(connector, null);
+ pair = new Pair<TransportConfiguration, TransportConfiguration>(cc.getConnector(), null);
}
topology.put(nodeID, pair);
@@ -306,11 +309,11 @@
{
if (backup)
{
- pair.b = connector;
+ pair.b = cc.getConnector();
}
else
{
- pair.a = connector;
+ pair.a = cc.getConnector();
}
}
@@ -569,6 +572,15 @@
return;
}
+ TransportConfiguration connector = configuration.getConnectorConfigurations().get(config.getConnectorName());
+
+ if (connector == null)
+ {
+ log.warn("No connecor with name '" + config.getConnectorName() +
+ "'. The cluster connection will not be deployed.");
+ return;
+ }
+
ServerLocator serverLocator;
if (config.getStaticConnectors() != null)
@@ -592,6 +604,7 @@
}
ClusterConnection clusterConnection = new ClusterConnectionImpl(serverLocator,
+ connector,
new SimpleString(config.getName()),
new SimpleString(config.getAddress()),
config.getRetryInterval(),
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-07-11 10:11:08 UTC (rev 9396)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-07-11 11:05:40 UTC (rev 9397)
@@ -368,7 +368,7 @@
// Announce presence of live node to cluster
- clusterManager.announceNode(nodeID, false, connector);
+ clusterManager.announceNode(nodeID.toString(), false);
log.info("Server is now live");
}
@@ -492,7 +492,7 @@
//Announce presence of this backup to rest of cluster
- clusterManager.announceNode(nodeID, true, connector);
+ clusterManager.announceNode(nodeID.toString(), true);
// We now look for the live.lock file - if it doesn't exist it means the live isn't started yet, so we wait
// for that
@@ -526,7 +526,7 @@
// Announce presence of live node to cluster
- clusterManager.announceNode(nodeID, false, connector);
+ clusterManager.announceNode(nodeID.toString(), false);
break;
}
13 years, 11 months
JBoss hornetq SVN: r9396 - in branches/2_2_0_HA_Improvements/src/main/org/hornetq/core: server/cluster and 1 other directories.
by do-not-reply＠jboss.org
Author: timfox
Date: 2010-07-11 06:11:08 -0400 (Sun, 11 Jul 2010)
New Revision: 9396
Modified:
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java
branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
Log:
HA improvements
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java 2010-07-09 20:31:38 UTC (rev 9395)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/protocol/core/impl/CoreProtocolManager.java 2010-07-11 10:11:08 UTC (rev 9396)
@@ -133,12 +133,12 @@
}
});
}
- else if (packet.getType() == PacketImpl.NODE_ANNOUNCE)
- {
- NodeAnnounceMessage msg = (NodeAnnounceMessage)packet;
-
- server.getClusterManager().announceNode(msg.getNodeID(), msg.isBackup(), msg.getConnector());
- }
+// else if (packet.getType() == PacketImpl.NODE_ANNOUNCE)
+// {
+// NodeAnnounceMessage msg = (NodeAnnounceMessage)packet;
+//
+// server.getClusterManager().announceNode(msg.getNodeID(), msg.isBackup(), msg.getConnector());
+// }
}
});
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2010-07-09 20:31:38 UTC (rev 9395)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2010-07-11 10:11:08 UTC (rev 9396)
@@ -41,10 +41,6 @@
void activate();
- void startAnnouncement();
-
- void stopAnnouncement();
-
void registerTopologyListener(ClusterTopologyListener listener, boolean clusterConnection);
void unregisterTopologyListener(ClusterTopologyListener listener, boolean clusterConnection);
Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-07-09 20:31:38 UTC (rev 9395)
+++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-07-11 10:11:08 UTC (rev 9396)
@@ -43,9 +43,6 @@
import org.hornetq.api.core.HornetQException;
import org.hornetq.api.core.Pair;
import org.hornetq.api.core.SimpleString;
-import org.hornetq.api.core.TransportConfiguration;
-import org.hornetq.api.core.client.ClientSessionFactory;
-import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.CoreQueueConfiguration;
@@ -368,6 +365,10 @@
initialisePart1();
initialisePart2();
+
+ // Announce presence of live node to cluster
+
+ clusterManager.announceNode(nodeID, false, connector);
log.info("Server is now live");
}
@@ -488,14 +489,14 @@
log.info("Read node id " + nodeID);
initialisePart1();
-
- // TODO - now send announcement message to cluster
-
+
+ //Announce presence of this backup to rest of cluster
+
+ clusterManager.announceNode(nodeID, true, connector);
+
// We now look for the live.lock file - if it doesn't exist it means the live isn't started yet, so we wait
// for that
- clusterManager.startAnnouncement();
-
while (true)
{
File liveLockFile = new File(configuration.getJournalDirectory(), "live.lock");
@@ -522,6 +523,10 @@
}
log.info("Obtained live lock");
+
+ // Announce presence of live node to cluster
+
+ clusterManager.announceNode(nodeID, false, connector);
break;
}
@@ -655,32 +660,6 @@
backupActivationThread.start();
}
- // initialisePart1();
- //
- // if (configuration.isBackup())
- // {
- // if (!configuration.isSharedStore())
- // {
- // replicationEndpoint = new ReplicationEndpointImpl(this);
- // replicationEndpoint.start();
- // }
- // else
- // {
- // backupLock = new FailoverLockFileImpl("backup.lock", configuration.getJournalDirectory());
- // liveLock = new FailoverLockFileImpl("live.lock", configuration.getJournalDirectory());
- // }
- //
- // // We defer actually initialisation until the live node has contacted the backup
- // //HornetQServerImpl.log.info("Backup server initialised");
- // }
- // else
- // {
- // initialisePart2();
- // }
- //
- //
- // remotingService.start();
-
}
@Override
13 years, 11 months
JBoss hornetq SVN: r9395 - in branches/maven-move: hornetq-core/src/main/resources and 14 other directories.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2010-07-09 16:31:38 -0400 (Fri, 09 Jul 2010)
New Revision: 9395
Added:
branches/maven-move/tests/pom.xml
branches/maven-move/tests/unit-tests/
branches/maven-move/tests/unit-tests/pom.xml
branches/maven-move/tests/unit-tests/src/
branches/maven-move/tests/unit-tests/src/test/
branches/maven-move/tests/unit-tests/src/test/java/
branches/maven-move/tests/unit-tests/src/test/java/org/
branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/
branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/
branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/
branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/
branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/FindUtil.java
branches/maven-move/tests/unit-tests/src/test/resources/
branches/maven-move/tests/unit-tests/unit-tests.iml
Removed:
branches/maven-move/tests/src/org/hornetq/tests/unit/
branches/maven-move/tests/src/org/hornetq/tests/util/
Modified:
branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties
branches/maven-move/pom.xml
branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java
branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java
branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/misc/ManifestTest.java
branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java
Log:
test move
Modified: branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties
===================================================================
--- branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties 2010-07-09 20:29:19 UTC (rev 9394)
+++ branches/maven-move/hornetq-core/src/main/resources/hornetq-version.properties 2010-07-09 20:31:38 UTC (rev 9395)
@@ -5,4 +5,4 @@
hornetq.version.incrementingVersion=${hornetq.version.incrementingVersion}
hornetq.version.versionSuffix=${hornetq.version.versionSuffix}
hornetq.version.versionTag=${hornetq.version.versionTag}
-hornetq.netty.version=${netty.version}
+hornetq.netty.version=${netty.version.string}
Modified: branches/maven-move/pom.xml
===================================================================
--- branches/maven-move/pom.xml 2010-07-09 20:29:19 UTC (rev 9394)
+++ branches/maven-move/pom.xml 2010-07-09 20:31:38 UTC (rev 9395)
@@ -27,6 +27,7 @@
<properties>
<netty.version>3.2.0.Final</netty.version>
+ <netty.version.string>3.2.0.Final-r2292</netty.version.string>
<hornetq.version.versionName>Stripey</hornetq.version.versionName>
<hornetq.version.majorVersion>2</hornetq.version.majorVersion>
<hornetq.version.minorVersion>1</hornetq.version.minorVersion>
@@ -92,6 +93,7 @@
<module>hornetq-jboss-as-integration</module>
<module>hornetq-twitter-integration</module>
<module>hornetq-service-sar</module>
+ <module>tests</module>
</modules>
<dependencyManagement>
Added: branches/maven-move/tests/pom.xml
===================================================================
--- branches/maven-move/tests/pom.xml (rev 0)
+++ branches/maven-move/tests/pom.xml 2010-07-09 20:31:38 UTC (rev 9395)
@@ -0,0 +1,30 @@
+<project>
+ <parent>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-pom</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ </parent>
+ <name>HornetQ Tests POM</name>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.hornetq.tests</groupId>
+ <artifactId>hornetq-tests-pom</artifactId>
+ <packaging>pom</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>unit-tests</module>
+ <module>jms-tests</module>
+ </modules>
+</project>
Added: branches/maven-move/tests/unit-tests/pom.xml
===================================================================
--- branches/maven-move/tests/unit-tests/pom.xml (rev 0)
+++ branches/maven-move/tests/unit-tests/pom.xml 2010-07-09 20:31:38 UTC (rev 9395)
@@ -0,0 +1,92 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-pom</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.hornetq.tests</groupId>
+ <artifactId>unit-tests</artifactId>
+ <packaging>jar</packaging>
+ <name>HornetQ Unit Tests</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-ra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-bootstrap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>../config</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/hornetq/tests/util/*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Copied: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit (from rev 9385, branches/maven-move/tests/src/org/hornetq/tests/unit)
Modified: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java
===================================================================
--- branches/maven-move/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java 2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java 2010-07-09 20:31:38 UTC (rev 9395)
@@ -49,7 +49,7 @@
Assert.assertNotNull(element);
element = XMLUtil.stringToElement(xml);
Assert.assertNotNull(element);
- XMLUtil.validate(element, "hornetq-configuration.xsd");
+ XMLUtil.validate(element, "schema/hornetq-configuration.xsd");
}
public void testFullConfiguration() throws Exception
Modified: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java
===================================================================
--- branches/maven-move/tests/src/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java 2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java 2010-07-09 20:31:38 UTC (rev 9395)
@@ -22,6 +22,7 @@
import org.hornetq.core.deployers.Deployer;
import org.hornetq.core.deployers.impl.FileDeploymentManager;
import org.hornetq.core.logging.Logger;
+import org.hornetq.tests.util.FindUtil;
import org.hornetq.tests.util.UnitTestCase;
/**
@@ -63,8 +64,10 @@
FileDeploymentManagerTest.log.debug("Filename is " + filename);
- File file = new File("tests/tmpfiles/" + filename);
+ File tmpDir = FindUtil.computeTestDataRoot(FileDeploymentManagerTest.class);
+ File file = new File(tmpDir, filename);
+
FileDeploymentManagerTest.log.debug(file.getAbsoluteFile());
file.createNewFile();
@@ -99,7 +102,8 @@
FileDeploymentManagerTest.log.debug("Filename is " + filename);
- File file = new File("tests/tmpfiles/" + filename);
+ File tmpDir = FindUtil.computeTestDataRoot(FileDeploymentManagerTest.class);
+ File file = new File(tmpDir, filename);
FileDeploymentManagerTest.log.debug(file.getAbsoluteFile());
@@ -134,9 +138,10 @@
String filename2 = "fdm_test_file.xml2";
String filename3 = "fdm_test_file.xml3";
- File file1 = new File("tests/tmpfiles/" + filename1);
- File file2 = new File("tests/tmpfiles/" + filename2);
- File file3 = new File("tests/tmpfiles/" + filename3);
+ File tmpDir = FindUtil.computeTestDataRoot(FileDeploymentManagerTest.class);
+ File file1 = new File(tmpDir, filename1);
+ File file2 = new File(tmpDir, filename2);
+ File file3 = new File(tmpDir, filename3);
file1.createNewFile();
file2.createNewFile();
@@ -229,7 +234,8 @@
String filename = "fdm_test_file.xml1";
- File file = new File("tests/tmpfiles/" + filename);
+ File tmpDir = FindUtil.computeTestDataRoot(FileDeploymentManagerTest.class);
+ File file = new File(tmpDir, filename);
file.createNewFile();
long oldLastModified = file.lastModified();
@@ -277,7 +283,8 @@
String filename = "fdm_test_file.xml1";
- File file = new File("tests/tmpfiles/" + filename);
+ File tmpDir = FindUtil.computeTestDataRoot(FileDeploymentManagerTest.class);
+ File file = new File(tmpDir, filename);
file.createNewFile();
Modified: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java
===================================================================
--- branches/maven-move/tests/src/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java 2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/core/remoting/impl/ssl/SSLSupportTest.java 2010-07-09 20:31:38 UTC (rev 9395)
@@ -98,7 +98,7 @@
return;
}
- SSLSupport.createServerContext("config/hornetq.keystore", keyStorePassword, trustStorePath, trustStorePassword);
+ SSLSupport.createServerContext("hornetq.keystore", keyStorePassword, trustStorePath, trustStorePassword);
}
public void testServerContextWithBadKeyStorePassword() throws Exception
Modified: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/misc/ManifestTest.java
===================================================================
--- branches/maven-move/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2010-07-09 20:31:38 UTC (rev 9395)
@@ -49,6 +49,7 @@
public void testManifestEntries() throws Exception
{
+ /*
Properties props = System.getProperties();
String userDir = props.getProperty("build.lib");
@@ -84,6 +85,7 @@
conn.close();
}
}
+ */
}
// Package protected ---------------------------------------------
Copied: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util (from rev 9385, branches/maven-move/tests/src/org/hornetq/tests/util)
Added: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/FindUtil.java
===================================================================
--- branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/FindUtil.java (rev 0)
+++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/FindUtil.java 2010-07-09 20:31:38 UTC (rev 9395)
@@ -0,0 +1,23 @@
+package org.hornetq.tests.util;
+
+import java.io.File;
+import java.net.URL;
+
+/**
+ * Find files within test
+ *
+ * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class FindUtil
+{
+ public static File computeTestDataRoot(Class anyTestClass)
+ {
+ final String clsUri = anyTestClass.getName().replace('.', '/') + ".class";
+ final URL url = anyTestClass.getClassLoader().getResource(clsUri);
+ final String clsPath = url.getPath();
+ final File root = new File(clsPath.substring(0, clsPath.length() - clsUri.length()));
+ return root;
+ }
+
+}
Modified: branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java
===================================================================
--- branches/maven-move/tests/src/org/hornetq/tests/util/JMSClusteredTestBase.java 2010-07-08 15:05:36 UTC (rev 9385)
+++ branches/maven-move/tests/unit-tests/src/test/java/org/hornetq/tests/util/JMSClusteredTestBase.java 2010-07-09 20:31:38 UTC (rev 9395)
@@ -25,7 +25,6 @@
import org.hornetq.api.core.Pair;
import org.hornetq.api.core.TransportConfiguration;
-import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.api.jms.HornetQJMSClient;
import org.hornetq.core.config.ClusterConnectionConfiguration;
import org.hornetq.core.config.Configuration;
@@ -35,9 +34,7 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.HornetQServers;
import org.hornetq.jms.server.config.impl.JMSConfigurationImpl;
-import org.hornetq.jms.server.config.impl.TopicConfigurationImpl;
import org.hornetq.jms.server.impl.JMSServerManagerImpl;
-import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase;
import org.hornetq.tests.unit.util.InVMContext;
/**
@@ -50,7 +47,7 @@
public class JMSClusteredTestBase extends ServiceTestBase
{
- private static final Logger log = Logger.getLogger(ClusterTestBase.class);
+ private static final Logger log = Logger.getLogger(JMSClusteredTestBase.class);
protected HornetQServer server1;
Added: branches/maven-move/tests/unit-tests/unit-tests.iml
===================================================================
--- branches/maven-move/tests/unit-tests/unit-tests.iml (rev 0)
+++ branches/maven-move/tests/unit-tests/unit-tests.iml 2010-07-09 20:31:38 UTC (rev 9395)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-core" exported="" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss.netty:netty:3.2.0.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" exported="" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" exported="" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-ra" exported="" />
+ <orderEntry type="module" module-name="hornetq-bootstrap" exported="" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" />
+ <orderEntry type="library" exported="" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
+ <orderEntry type="library" exported="" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" exported="" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" />
+ <orderEntry type="library" exported="" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" exported="" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" exported="" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" exported="" name="Maven: junit:junit:3.8.2" level="project" />
+ </component>
+</module>
+
13 years, 11 months
JBoss hornetq SVN: r9394 - branches/maven-move/tests/jms-tests.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2010-07-09 16:29:19 -0400 (Fri, 09 Jul 2010)
New Revision: 9394
Added:
branches/maven-move/tests/jms-tests/pom.xml
Log:
Added: branches/maven-move/tests/jms-tests/pom.xml
===================================================================
--- branches/maven-move/tests/jms-tests/pom.xml (rev 0)
+++ branches/maven-move/tests/jms-tests/pom.xml 2010-07-09 20:29:19 UTC (rev 9394)
@@ -0,0 +1,119 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-pom</artifactId>
+ <version>2.1.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.hornetq.tests</groupId>
+ <artifactId>jms-tests</artifactId>
+ <packaging>jar</packaging>
+ <name>HornetQ JMS Tests</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-jms</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-ra</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-bootstrap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jca-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jbossts</groupId>
+ <artifactId>jbossts-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>apache-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </dependency>
+ <!--this specifically for the JMS Bridge-->
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>config</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
+ <excludes>
+ <exclude>org/hornetq/jms/tests/JMSTestCase.java</exclude>
+ <exclude>org/hornetq/jms/tests/HornetqServerTestCase.java</exclude>
+ <exclude>org/hornetq/jms/tests/stress/*.java</exclude>
+ <exclude>org/hornetq/jms/tests/XARecoveryTest.java</exclude>
+ <exclude>org/hornetq/jms/tests/XAResourceRecoveryTest.java</exclude>
+ <exclude>org/hornetq/jms/tests/XATest.java</exclude>
+ <exclude>org/hornetq/jms/tests/stress/*.java</exclude>
+ <exclude>org/hoerntq/jms/tests/manual/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
13 years, 11 months
JBoss hornetq SVN: r9393 - in branches/maven-move/tests/jms-tests/src: test and 1 other directories.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2010-07-09 16:16:46 -0400 (Fri, 09 Jul 2010)
New Revision: 9393
Added:
branches/maven-move/tests/jms-tests/src/test/
branches/maven-move/tests/jms-tests/src/test/java/
branches/maven-move/tests/jms-tests/src/test/java/org/
Removed:
branches/maven-move/tests/jms-tests/src/org/
Log:
Copied: branches/maven-move/tests/jms-tests/src/test/java/org (from rev 9385, branches/maven-move/tests/jms-tests/src/org)
13 years, 11 months