JBoss hornetq SVN: r10336 - branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-03-15 07:06:24 -0400 (Tue, 15 Mar 2011)
New Revision: 10336
Modified:
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java
Log:
test fix
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java 2011-03-15 00:25:45 UTC (rev 10335)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailBackManualTest.java 2011-03-15 11:06:24 UTC (rev 10336)
@@ -115,7 +115,7 @@
backupServer.stop();
- assertTrue(latch2.await(5, TimeUnit.SECONDS));
+ assertTrue(latch2.await(15, TimeUnit.SECONDS));
message = session.createMessage(true);
13 years, 9 months
JBoss hornetq SVN: r10335 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-14 20:25:45 -0400 (Mon, 14 Mar 2011)
New Revision: 10335
Added:
tags/HornetQ_2_2_1_EAP_GA/
Log:
EAP tag
13 years, 9 months
JBoss hornetq SVN: r10334 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-14 20:24:08 -0400 (Mon, 14 Mar 2011)
New Revision: 10334
Removed:
tags/HornetQ_2_2_1_EAP_GA/
Log:
delete TAG
13 years, 9 months
JBoss hornetq SVN: r10333 - tags/HornetQ_2_2_1_EAP_GA.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-14 20:23:22 -0400 (Mon, 14 Mar 2011)
New Revision: 10333
Modified:
tags/HornetQ_2_2_1_EAP_GA/build-maven.xml
Log:
tweak
Modified: tags/HornetQ_2_2_1_EAP_GA/build-maven.xml
===================================================================
--- tags/HornetQ_2_2_1_EAP_GA/build-maven.xml 2011-03-15 00:18:51 UTC (rev 10332)
+++ tags/HornetQ_2_2_1_EAP_GA/build-maven.xml 2011-03-15 00:23:22 UTC (rev 10333)
@@ -13,7 +13,7 @@
-->
<project default="upload" name="HornetQ">
- <property name="hornetq.version" value="2.2.0.QA-10129"/>
+ <property name="hornetq.version" value="2.2.1.GA"/>
<property name="build.dir" value="build"/>
<property name="jars.dir" value="${build.dir}/jars"/>
13 years, 9 months
JBoss hornetq SVN: r10332 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-14 20:18:51 -0400 (Mon, 14 Mar 2011)
New Revision: 10332
Added:
tags/HornetQ_2_2_1_EAP_GA/
Log:
2.2.1 EAP GA TAG
13 years, 9 months
JBoss hornetq SVN: r10331 - 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-03-14 20:17:31 -0400 (Mon, 14 Mar 2011)
New Revision: 10331
Modified:
branches/Branch_2_2_EAP/build-maven.xml
branches/Branch_2_2_EAP/hornetq-rest/pom.xml
Log:
upload new release
Modified: branches/Branch_2_2_EAP/build-maven.xml
===================================================================
--- branches/Branch_2_2_EAP/build-maven.xml 2011-03-15 00:14:49 UTC (rev 10330)
+++ branches/Branch_2_2_EAP/build-maven.xml 2011-03-15 00:17:31 UTC (rev 10331)
@@ -13,7 +13,7 @@
-->
<project default="upload" name="HornetQ">
- <property name="hornetq.version" value="2.2.1.QA-10291"/>
+ <property name="hornetq.version" value="2.2.1.GA"/>
<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-03-15 00:14:49 UTC (rev 10330)
+++ branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-03-15 00:17:31 UTC (rev 10331)
@@ -10,7 +10,7 @@
<properties>
<resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.1.QA-10291</hornetq.version>
+ <hornetq.version>2.2.1.GA</hornetq.version>
</properties>
<licenses>
13 years, 9 months
JBoss hornetq SVN: r10330 - branches/Branch_2_2_EAP/src/config/common.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-14 20:14:49 -0400 (Mon, 14 Mar 2011)
New Revision: 10330
Modified:
branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties
Log:
2.2.1 release
Modified: branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties
===================================================================
--- branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-03-15 00:09:53 UTC (rev 10329)
+++ branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-03-15 00:14:49 UTC (rev 10330)
@@ -1,4 +1,4 @@
-hornetq.version.versionName=Bzzzzz@10291
+hornetq.version.versionName=Zmmmmmmmm
hornetq.version.majorVersion=2
hornetq.version.minorVersion=2
hornetq.version.microVersion=1
13 years, 9 months
JBoss hornetq SVN: r10329 - branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-14 20:09:53 -0400 (Mon, 14 Mar 2011)
New Revision: 10329
Modified:
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java
Log:
fixing test
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2011-03-14 23:48:55 UTC (rev 10328)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2011-03-15 00:09:53 UTC (rev 10329)
@@ -478,8 +478,8 @@
String expiryAddress = "someExpiry";
boolean lastValueQueue = true;
int deliveryAttempts = 1;
- long maxSizeBytes = 2;
- int pageSizeBytes = 3;
+ long maxSizeBytes = 20;
+ int pageSizeBytes = 10;
int pageMaxCacheSize = 7;
long redeliveryDelay = 4;
long redistributionDelay = 5;
@@ -499,6 +499,30 @@
sendToDLAOnNoRoute,
addressFullMessagePolicy);
+
+ boolean ex = false;
+ try
+ {
+ serverControl.addAddressSettings(addressMatch,
+ DLA,
+ expiryAddress,
+ lastValueQueue,
+ deliveryAttempts,
+ 100,
+ 1000,
+ pageMaxCacheSize,
+ redeliveryDelay,
+ redistributionDelay,
+ sendToDLAOnNoRoute,
+ addressFullMessagePolicy);
+ }
+ catch (Exception expected)
+ {
+ ex=true;
+ }
+
+ assertTrue("Exception expected", ex);
+
//restartServer();
serverControl = createManagementControl();
13 years, 9 months
JBoss hornetq SVN: r10328 - in branches/Branch_2_2_EAP/src/main/org/hornetq: jms/server/config/impl and 1 other directory.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-14 19:48:55 -0400 (Mon, 14 Mar 2011)
New Revision: 10328
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java
branches/Branch_2_2_EAP/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java
Log:
https://issues.jboss.org/browse/JBPAPP-6082 - fixing tests
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java 2011-03-14 22:07:55 UTC (rev 10327)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java 2011-03-14 23:48:55 UTC (rev 10328)
@@ -50,7 +50,14 @@
public static ObjectNameBuilder create(final String domain)
{
- return new ObjectNameBuilder(domain);
+ if (domain == null)
+ {
+ return new ObjectNameBuilder(ConfigurationImpl.DEFAULT_JMX_DOMAIN);
+ }
+ else
+ {
+ return new ObjectNameBuilder(domain);
+ }
}
// Constructors --------------------------------------------------
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2011-03-14 22:07:55 UTC (rev 10327)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2011-03-14 23:48:55 UTC (rev 10328)
@@ -55,7 +55,7 @@
public JMSConfigurationImpl()
{
- domain = null;
+ domain = ConfigurationImpl.DEFAULT_JMX_DOMAIN;
}
public JMSConfigurationImpl(final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations,
@@ -66,7 +66,7 @@
this.connectionFactoryConfigurations.addAll(connectionFactoryConfigurations);
this.queueConfigurations.addAll(queueConfigurations);
this.topicConfigurations.addAll(topicConfigurations);
- this.domain = domain;
+ this.domain = domain != null ? domain : ConfigurationImpl.DEFAULT_JMX_DOMAIN;
}
// JMSConfiguration implementation -------------------------------
13 years, 9 months
JBoss hornetq SVN: r10327 - in branches/Branch_2_2_EAP: src/main/org/hornetq/core/management/impl and 1 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-14 18:07:55 -0400 (Mon, 14 Mar 2011)
New Revision: 10327
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
Log:
fixing tests
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2011-03-14 22:06:16 UTC (rev 10326)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2011-03-14 22:07:55 UTC (rev 10327)
@@ -1235,17 +1235,11 @@
{
ClientSessionImpl.log.warn("failover occured during commit throwing XAException.XA_RETRY");
- if (e.getCode() == HornetQException.UNBLOCKED)
- {
- // Unblocked on failover
- xaRetry = true;
- throw new XAException(XAException.XA_RETRY);
- }
-
- ClientSessionImpl.log.warn(e.getMessage(), e);
-
- // This should never occur
- throw new XAException(XAException.XAER_RMERR);
+ // Unblocked on failover
+ xaRetry = true;
+ // Any error on commit -> RETRY
+ // We can't rollback a Prepared TX for definition
+ throw new XAException(XAException.XA_RETRY);
}
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2011-03-14 22:06:16 UTC (rev 10326)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2011-03-14 22:07:55 UTC (rev 10327)
@@ -1521,6 +1521,11 @@
{
checkStarted();
+ if (pageSizeBytes >= maxSizeBytes)
+ {
+ throw new IllegalStateException("pageSize has to be lower than maxSizeBytes. Invalid argument (" + pageSizeBytes + " < " + maxSizeBytes + ")");
+ }
+
AddressSettings addressSettings = new AddressSettings();
addressSettings.setDeadLetterAddress(DLA == null ? null : new SimpleString(DLA));
addressSettings.setExpiryAddress(expiryAddress == null ? null : new SimpleString(expiryAddress));
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-03-14 22:06:16 UTC (rev 10326)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2011-03-14 22:07:55 UTC (rev 10327)
@@ -1016,8 +1016,6 @@
session.end(xid, XAResource.TMSUCCESS);
- session.prepare(xid);
-
crash(session);
try
@@ -1028,7 +1026,7 @@
}
catch (XAException e)
{
- Assert.assertEquals(XAException.XA_RBOTHER, e.errorCode);
+ Assert.assertEquals(XAException.XAER_NOTA, e.errorCode);
}
ClientConsumer consumer = session.createConsumer(FailoverTestBase.ADDRESS);
@@ -1336,7 +1334,7 @@
session2.end(xid, XAResource.TMSUCCESS);
- session2.prepare(xid);
+ // session2.prepare(xid);
crash(session2);
@@ -1348,7 +1346,8 @@
}
catch (XAException e)
{
- Assert.assertEquals(XAException.XA_RBOTHER, e.errorCode);
+ // it should be rolled back
+ Assert.assertEquals(XAException.XAER_NOTA, e.errorCode);
}
session1.close();
13 years, 9 months