JBoss hornetq SVN: r9980 - trunk/tests/src/org/hornetq/tests/integration/management.
by do-not-reply@jboss.org
Author: ataylor
Date: 2010-12-02 03:41:46 -0500 (Thu, 02 Dec 2010)
New Revision: 9980
Modified:
trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java
Log:
tidy up resources correctly
Modified: trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-12-02 08:38:25 UTC (rev 9979)
+++ trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-12-02 08:41:46 UTC (rev 9980)
@@ -53,6 +53,7 @@
private ClientConsumer notifConsumer;
private SimpleString notifQueue;
+ private ServerLocator locator;
// Static --------------------------------------------------------
@@ -215,7 +216,7 @@
service = HornetQServers.newHornetQServer(conf, false);
service.start();
- ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(InVMConnectorFactory.class.getName()));
+ locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(InVMConnectorFactory.class.getName()));
ClientSessionFactory sf = locator.createSessionFactory();
session = sf.createSession(false, true, true);
session.start();
@@ -235,6 +236,11 @@
session.deleteQueue(notifQueue);
session.close();
+ if(locator != null)
+ {
+ locator.close();
+ }
+
service.stop();
super.tearDown();
15 years, 5 months
JBoss hornetq SVN: r9979 - trunk/tests/src/org/hornetq/tests/integration/management.
by do-not-reply@jboss.org
Author: ataylor
Date: 2010-12-02 03:38:25 -0500 (Thu, 02 Dec 2010)
New Revision: 9979
Modified:
trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java
Log:
tidy up resources correctly
Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2010-12-02 08:36:11 UTC (rev 9978)
+++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2010-12-02 08:38:25 UTC (rev 9979)
@@ -44,6 +44,8 @@
protected ClientSession session;
+ private ServerLocator locator;
+
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -271,7 +273,7 @@
{
super.setUp();
- ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
+ locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
ClientSessionFactory sf = locator.createSessionFactory();
session = sf.createSession(false, true, true);
session.start();
@@ -285,6 +287,11 @@
session.close();
}
+ if(locator != null)
+ {
+ locator.close();
+ }
+
session = null;
super.tearDown();
15 years, 5 months
JBoss hornetq SVN: r9978 - trunk/tests/src/org/hornetq/tests/integration/management.
by do-not-reply@jboss.org
Author: ataylor
Date: 2010-12-02 03:36:11 -0500 (Thu, 02 Dec 2010)
New Revision: 9978
Modified:
trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
Log:
tidy up resources correctly
Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-12-02 08:35:11 UTC (rev 9977)
+++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-12-02 08:36:11 UTC (rev 9978)
@@ -53,6 +53,7 @@
protected HornetQServer server;
protected ClientSession session;
+ private ServerLocator locator;
// Static --------------------------------------------------------
@@ -1281,7 +1282,7 @@
server = HornetQServers.newHornetQServer(conf, mbeanServer, false);
server.start();
- ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
+ locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY));
locator.setBlockOnNonDurableSend(true);
locator.setBlockOnNonDurableSend(true);
ClientSessionFactory sf = locator.createSessionFactory();
@@ -1294,10 +1295,14 @@
{
session.close();
+ locator.close();
+
server.stop();
session = null;
+ locator = null;
+
server = null;
super.tearDown();
15 years, 5 months
JBoss hornetq SVN: r9977 - trunk/tests/src/org/hornetq/tests/integration/remoting.
by do-not-reply@jboss.org
Author: ataylor
Date: 2010-12-02 03:35:11 -0500 (Thu, 02 Dec 2010)
New Revision: 9977
Modified:
trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java
Log:
tidy up resources correctly
Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java 2010-12-02 08:33:28 UTC (rev 9976)
+++ trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java 2010-12-02 08:35:11 UTC (rev 9977)
@@ -201,10 +201,10 @@
params = new HashMap<String, Object>();
params.put(getHostPropertyKey(), connectorHost);
TransportConfiguration connectorConfig = new TransportConfiguration(getConnectorFactoryClassName(), params);
-
+ ServerLocator locator = null;
try
{
- ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(connectorConfig);
+ locator = HornetQClient.createServerLocatorWithoutHA(connectorConfig);
if (mustConnect)
@@ -227,6 +227,10 @@
}
finally
{
+ if(locator != null)
+ {
+ locator.close();
+ }
if (messagingService != null)
{
messagingService.stop();
15 years, 5 months
JBoss hornetq SVN: r9976 - trunk/tests/src/org/hornetq/tests/integration/remoting.
by do-not-reply@jboss.org
Author: ataylor
Date: 2010-12-02 03:33:28 -0500 (Thu, 02 Dec 2010)
New Revision: 9976
Modified:
trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java
Log:
tidy up resoucres correctly
Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-12-02 08:32:21 UTC (rev 9975)
+++ trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-12-02 08:33:28 UTC (rev 9976)
@@ -115,6 +115,8 @@
}
sf.close();
+
+ sf.getServerLocator().close();
}
// Private -------------------------------------------------------
15 years, 5 months
JBoss hornetq SVN: r9975 - trunk/tests/src/org/hornetq/tests/integration/remoting.
by do-not-reply@jboss.org
Author: ataylor
Date: 2010-12-02 03:32:21 -0500 (Thu, 02 Dec 2010)
New Revision: 9975
Modified:
trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java
Log:
tidy up resoucres correctly
Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-12-02 08:30:22 UTC (rev 9974)
+++ trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-12-02 08:32:21 UTC (rev 9975)
@@ -155,6 +155,8 @@
session.close();
csf.close();
+
+ locator.close();
}
/*
@@ -211,6 +213,8 @@
session.close();
csf.close();
+
+ locator.close();
}
/*
@@ -288,6 +292,8 @@
session.close();
csf.close();
+
+ locator.close();
}
/*
@@ -393,6 +399,8 @@
session.close();
csf.close();
+
+ locator.close();
}
// Package protected ---------------------------------------------
15 years, 5 months
JBoss hornetq SVN: r9974 - trunk/tests/src/org/hornetq/tests/integration/server.
by do-not-reply@jboss.org
Author: ataylor
Date: 2010-12-02 03:30:22 -0500 (Thu, 02 Dec 2010)
New Revision: 9974
Modified:
trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java
Log:
tidy up resoucres correctly
Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-12-02 08:25:25 UTC (rev 9973)
+++ trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-12-02 08:30:22 UTC (rev 9974)
@@ -46,6 +46,7 @@
private Configuration configuration;
private AddressSettings qs;
+ private ServerLocator locator;
public void testMultipleMessagesAfterRecovery() throws Exception
{
@@ -180,6 +181,10 @@
//
}
}
+ if(locator != null)
+ {
+ locator.close();
+ }
if (server != null && server.isStarted())
{
try
@@ -213,7 +218,7 @@
qs.setLastValueQueue(true);
server.getAddressSettingsRepository().addMatch(address.toString(), qs);
// then we create a client as normal
- ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
+ locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
locator.setBlockOnAcknowledge(true);
locator.setAckBatchSize(0);
@@ -236,7 +241,8 @@
qs.setLastValueQueue(true);
server.getAddressSettingsRepository().addMatch(address.toString(), qs);
// then we create a client as normal
- ServerLocator locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
+ locator.close();
+ locator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY));
locator.setBlockOnAcknowledge(true);
locator.setAckBatchSize(0);
15 years, 5 months
JBoss hornetq SVN: r9973 - trunk/tests/src/org/hornetq/tests/integration/server.
by do-not-reply@jboss.org
Author: ataylor
Date: 2010-12-02 03:25:25 -0500 (Thu, 02 Dec 2010)
New Revision: 9973
Modified:
trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java
Log:
tidy up resoucres correctly
Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-12-02 04:05:10 UTC (rev 9972)
+++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-12-02 08:25:25 UTC (rev 9973)
@@ -115,6 +115,8 @@
sf.close();
+ locator.close();
+
server.stop();
}
@@ -197,6 +199,8 @@
sf.close();
+ locator.close();
+
server.stop();
}
@@ -303,6 +307,8 @@
sf.close();
+ locator.close();
+
server.stop();
}
@@ -393,6 +399,8 @@
sf.close();
+ locator.close();
+
server.stop();
}
@@ -474,6 +482,8 @@
sf.close();
+ locator.close();
+
server.stop();
}
15 years, 5 months
JBoss hornetq SVN: r9972 - tags.
by do-not-reply@jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-12-01 23:05:10 -0500 (Wed, 01 Dec 2010)
New Revision: 9972
Added:
tags/HornetQ_2_2_0_QA1/
Log:
tagging snapshot for QA, this is not an official release
Copied: tags/HornetQ_2_2_0_QA1 (from rev 9971, trunk)
15 years, 5 months
JBoss hornetq SVN: r9971 - trunk.
by do-not-reply@jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-12-01 22:54:54 -0500 (Wed, 01 Dec 2010)
New Revision: 9971
Modified:
trunk/build-maven.xml
Log:
typo
Modified: trunk/build-maven.xml
===================================================================
--- trunk/build-maven.xml 2010-12-02 03:53:59 UTC (rev 9970)
+++ trunk/build-maven.xml 2010-12-02 03:54:54 UTC (rev 9971)
@@ -152,7 +152,7 @@
<exec executable="mvn" dir="./build">
<arg value="install:install-file"/>
<!-- uncomment the following line to deploy to the JBoss 5 repository -->
- <arg value="-Dmaven.repo.local=/work/eap/maven-repository"/>
+ <!-- arg value="-Dmaven.repo.local=/work/eap/maven-repository"/ -->
<arg value="-DgroupId=org.hornetq"/>
<arg value="-DartifactId=${artifact.id}"/>
<arg value="-Dversion=${hornetq.version}"/>
@@ -164,7 +164,7 @@
<arg value="install:install-file"/>
<arg value="-DgroupId=org.hornetq"/>
<!-- uncomment the following line to deploy to the JBoss 5 repository -->
- <arg value="-Dmaven.repo.local=/work/eap/maven-repository"/>
+ <!-- arg value="-Dmaven.repo.local=/work/eap/maven-repository"/ -->
<arg value="-DartifactId=${artifact.id}"/>
<arg value="-Dversion=${hornetq.version}"/>
<arg value="-Dpackaging=jar"/>
15 years, 5 months