JBoss hornetq SVN: r10613 - in branches/Branch_2_2_EAP/src/main/org/hornetq: core/config/impl and 2 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-09 12:14:07 -0400 (Mon, 09 May 2011)
New Revision: 10613
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/impl/Validators.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/filter/impl/Identifier.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/journal/RecordInfo.java
Log:
Cosmetic changes made on trunk
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-05-09 15:31:48 UTC (rev 10612)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java 2011-05-09 16:14:07 UTC (rev 10613)
@@ -1,14 +1,14 @@
/*
* Copyright 2009 Red Hat, Inc.
- * Red Hat licenses this file to you under the Apache License, version
- * 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * permissions and limitations under the License.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
*/
package org.hornetq.api.core.management;
@@ -16,10 +16,6 @@
import javax.management.ObjectName;
import org.hornetq.api.core.SimpleString;
-import org.hornetq.api.jms.management.ConnectionFactoryControl;
-import org.hornetq.api.jms.management.JMSQueueControl;
-import org.hornetq.api.jms.management.JMSServerControl;
-import org.hornetq.api.jms.management.TopicControl;
import org.hornetq.core.config.impl.ConfigurationImpl;
/**
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/impl/Validators.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/impl/Validators.java 2011-05-09 15:31:48 UTC (rev 10612)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/config/impl/Validators.java 2011-05-09 16:14:07 UTC (rev 10613)
@@ -17,27 +17,18 @@
import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
/**
- * A Validators
+ * A Validators.
*
* @author jmesnil
- *
- *
*/
-public class Validators
+public final class Validators
{
-
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
public static interface Validator
{
void validate(String name, Object value);
}
- public static Validator NO_CHECK = new Validator()
+ public static final Validator NO_CHECK = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -45,7 +36,7 @@
}
};
- public static Validator NOT_NULL_OR_EMPTY = new Validator()
+ public static final Validator NOT_NULL_OR_EMPTY = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -57,7 +48,7 @@
}
};
- public static Validator GT_ZERO = new Validator()
+ public static final Validator GT_ZERO = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -73,7 +64,7 @@
}
};
- public static Validator PERCENTAGE = new Validator()
+ public static final Validator PERCENTAGE = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -87,7 +78,7 @@
}
};
- public static Validator GE_ZERO = new Validator()
+ public static final Validator GE_ZERO = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -105,7 +96,7 @@
}
};
- public static Validator MINUS_ONE_OR_GT_ZERO = new Validator()
+ public static final Validator MINUS_ONE_OR_GT_ZERO = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -123,7 +114,7 @@
}
};
- public static Validator MINUS_ONE_OR_GE_ZERO = new Validator()
+ public static final Validator MINUS_ONE_OR_GE_ZERO = new Validator()
{
public void validate(final String name, final Object value)
{
@@ -186,17 +177,4 @@
}
}
};
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/filter/impl/Identifier.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/filter/impl/Identifier.java 2011-05-09 15:31:48 UTC (rev 10612)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/filter/impl/Identifier.java 2011-05-09 16:14:07 UTC (rev 10613)
@@ -38,9 +38,10 @@
{
private final SimpleString name;
+ private final int hash;
+
private Object value;
- private final int hash;
public Identifier(final SimpleString name)
{
@@ -60,7 +61,7 @@
@Override
public boolean equals(final Object obj)
{
- if (obj.getClass() != Identifier.class)
+ if (!(obj instanceof Identifier))
{
return false;
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/journal/RecordInfo.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/journal/RecordInfo.java 2011-05-09 15:31:48 UTC (rev 10612)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/journal/RecordInfo.java 2011-05-09 16:14:07 UTC (rev 10613)
@@ -63,6 +63,10 @@
@Override
public boolean equals(final Object other)
{
+ if (!(other instanceof RecordInfo))
+ {
+ return false;
+ }
RecordInfo r = (RecordInfo)other;
return r.id == id;
15 years
JBoss hornetq SVN: r10612 - in trunk/tests: jms-tests and 5 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-09 11:31:48 -0400 (Mon, 09 May 2011)
New Revision: 10612
Modified:
trunk/tests/concurrent-tests/pom.xml
trunk/tests/jms-tests/pom.xml
trunk/tests/joram-tests/pom.xml
trunk/tests/performance-tests/pom.xml
trunk/tests/soak-tests/pom.xml
trunk/tests/stress-tests/pom.xml
trunk/tests/timing-tests/pom.xml
Log:
mvn: Remove duplicate declarations of surefire-plugin (fixes warnings)
Modified: trunk/tests/concurrent-tests/pom.xml
===================================================================
--- trunk/tests/concurrent-tests/pom.xml 2011-05-09 15:30:58 UTC (rev 10611)
+++ trunk/tests/concurrent-tests/pom.xml 2011-05-09 15:31:48 UTC (rev 10612)
@@ -121,6 +121,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <skipTests>${skipConcurrentTests}</skipTests>
<includes>
<include>**/*Test.java</include>
</includes>
@@ -134,14 +135,6 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipConcurrentTests}</skipTests>
- </configuration>
- <version>2.4</version>
- </plugin>
</plugins>
</build>
Modified: trunk/tests/jms-tests/pom.xml
===================================================================
--- trunk/tests/jms-tests/pom.xml 2011-05-09 15:30:58 UTC (rev 10611)
+++ trunk/tests/jms-tests/pom.xml 2011-05-09 15:31:48 UTC (rev 10612)
@@ -96,6 +96,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <skipTests>${skipJmsTests}</skipTests>
<includes>
<include>**/*Test.java</include>
</includes>
@@ -119,14 +120,6 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipJmsTests}</skipTests>
- </configuration>
- <version>2.4</version>
- </plugin>
</plugins>
</build>
Modified: trunk/tests/joram-tests/pom.xml
===================================================================
--- trunk/tests/joram-tests/pom.xml 2011-05-09 15:30:58 UTC (rev 10611)
+++ trunk/tests/joram-tests/pom.xml 2011-05-09 15:31:48 UTC (rev 10612)
@@ -115,6 +115,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <skipTests>${skipJoramTests}</skipTests>
<includes>
<include>**/*Test.java</include>
</includes>
@@ -128,14 +129,6 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipJoramTests}</skipTests>
- </configuration>
- <version>2.4</version>
- </plugin>
</plugins>
</build>
Modified: trunk/tests/performance-tests/pom.xml
===================================================================
--- trunk/tests/performance-tests/pom.xml 2011-05-09 15:30:58 UTC (rev 10611)
+++ trunk/tests/performance-tests/pom.xml 2011-05-09 15:31:48 UTC (rev 10612)
@@ -121,6 +121,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <skipTests>${skipPerformanceTests}</skipTests>
<includes>
<include>**/*Test.java</include>
</includes>
@@ -134,14 +135,6 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipPerformanceTests}</skipTests>
- </configuration>
- <version>2.4</version>
- </plugin>
</plugins>
</build>
Modified: trunk/tests/soak-tests/pom.xml
===================================================================
--- trunk/tests/soak-tests/pom.xml 2011-05-09 15:30:58 UTC (rev 10611)
+++ trunk/tests/soak-tests/pom.xml 2011-05-09 15:31:48 UTC (rev 10612)
@@ -121,6 +121,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <skipTests>${skipSoakTests}</skipTests>
<includes>
<include>**/*Test.java</include>
</includes>
@@ -134,14 +135,6 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipSoakTests}</skipTests>
- </configuration>
- <version>2.4</version>
- </plugin>
</plugins>
</build>
Modified: trunk/tests/stress-tests/pom.xml
===================================================================
--- trunk/tests/stress-tests/pom.xml 2011-05-09 15:30:58 UTC (rev 10611)
+++ trunk/tests/stress-tests/pom.xml 2011-05-09 15:31:48 UTC (rev 10612)
@@ -121,6 +121,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <skipTests>${skipStressTests}</skipTests>
<includes>
<include>**/*Test.java</include>
</includes>
@@ -134,14 +135,6 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipStressTests}</skipTests>
- </configuration>
- <version>2.4</version>
- </plugin>
</plugins>
</build>
Modified: trunk/tests/timing-tests/pom.xml
===================================================================
--- trunk/tests/timing-tests/pom.xml 2011-05-09 15:30:58 UTC (rev 10611)
+++ trunk/tests/timing-tests/pom.xml 2011-05-09 15:31:48 UTC (rev 10612)
@@ -121,6 +121,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <skipTests>${skipTimingTests}</skipTests>
<includes>
<include>**/*Test.java</include>
</includes>
@@ -134,14 +135,6 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTimingTests}</skipTests>
- </configuration>
- <version>2.4</version>
- </plugin>
</plugins>
</build>
15 years
JBoss hornetq SVN: r10611 - trunk/tests/jms-tests.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-09 11:30:58 -0400 (Mon, 09 May 2011)
New Revision: 10611
Modified:
trunk/tests/jms-tests/pom.xml
Log:
Fix typo in path.
Modified: trunk/tests/jms-tests/pom.xml
===================================================================
--- trunk/tests/jms-tests/pom.xml 2011-05-09 15:30:26 UTC (rev 10610)
+++ trunk/tests/jms-tests/pom.xml 2011-05-09 15:30:58 UTC (rev 10611)
@@ -107,7 +107,7 @@
<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>
+ <exclude>org/hornetq/jms/tests/manual/**</exclude>
</excludes>
</configuration>
</plugin>
15 years
JBoss hornetq SVN: r10610 - trunk/tests/integration-tests.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-09 11:30:26 -0400 (Mon, 09 May 2011)
New Revision: 10610
Modified:
trunk/tests/integration-tests/pom.xml
Log:
mvn: Remove duplicate declaration of surefire-plugin (and another wrong quote)
Modified: trunk/tests/integration-tests/pom.xml
===================================================================
--- trunk/tests/integration-tests/pom.xml 2011-05-09 15:01:44 UTC (rev 10609)
+++ trunk/tests/integration-tests/pom.xml 2011-05-09 15:30:26 UTC (rev 10610)
@@ -93,6 +93,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <skipTests>${skipIntegrationTests}</skipTests>
<excludes>
<exclude>**/ReplicatedJMSFailoverTest.java</exclude>
<exclude>org/hornetq/tests/util/*.java</exclude>
@@ -100,7 +101,7 @@
<exclude>**/cluster/failover/*StaticClusterWithBackupFailoverTest.java</exclude>
<!--exclude any replication tests for now-->
<exclude>**/cluster/failover/*ClusterWithBackupFailoverTestBase.java</exclude>
- <exclude>**/cluster/**/*/java"</exclude>
+ <exclude>**/cluster/**/*/java</exclude>
<exclude>**/cluster/failover/*DiscoveryClusterWithBackupFailoverTest.java</exclude>
<exclude>**/cluster/failover/*GroupingFailoverReplicationTest.java</exclude>
<exclude>**/cluster/failover/*Replicated*.java</exclude>
@@ -138,14 +139,6 @@
<target>1.6</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipIntegrationTests}</skipTests>
- </configuration>
- <version>2.4</version>
- </plugin>
</plugins>
</build>
15 years
JBoss hornetq SVN: r10609 - trunk/tests/integration-tests.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-09 11:01:44 -0400 (Mon, 09 May 2011)
New Revision: 10609
Modified:
trunk/tests/integration-tests/pom.xml
Log:
mvn: remove another two quotes
Modified: trunk/tests/integration-tests/pom.xml
===================================================================
--- trunk/tests/integration-tests/pom.xml 2011-05-09 15:01:10 UTC (rev 10608)
+++ trunk/tests/integration-tests/pom.xml 2011-05-09 15:01:44 UTC (rev 10609)
@@ -103,8 +103,8 @@
<exclude>**/cluster/**/*/java"</exclude>
<exclude>**/cluster/failover/*DiscoveryClusterWithBackupFailoverTest.java</exclude>
<exclude>**/cluster/failover/*GroupingFailoverReplicationTest.java</exclude>
- <exclude>**/cluster/failover/*Replicated*.java"</exclude>
- <exclude>**/cluster/replication/**.java"</exclude>
+ <exclude>**/cluster/failover/*Replicated*.java</exclude>
+ <exclude>**/cluster/replication/**.java</exclude>
<exclude>**/cluster/failover/*ReplicatedDistributionTest.java</exclude>
<exclude>**/cluster/failover/*SharedStoreDistributionTest.java</exclude>
<exclude>**/cluster/failover/*ReplicatedNettyAsynchronousFailoverTest.java</exclude>
15 years
JBoss hornetq SVN: r10608 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-09 11:01:10 -0400 (Mon, 09 May 2011)
New Revision: 10608
Modified:
trunk/pom.xml
Log:
mvn: Declare maven-jar-plugin and set version (fixes warning)
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-09 15:00:42 UTC (rev 10607)
+++ trunk/pom.xml 2011-05-09 15:01:10 UTC (rev 10608)
@@ -418,6 +418,11 @@
<version>2.2</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
<groupId>net.sf.maven-sar</groupId>
<artifactId>maven-sar-plugin</artifactId>
<version>1.0</version>
15 years
JBoss hornetq SVN: r10607 - trunk/hornetq-rest.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-09 11:00:42 -0400 (Mon, 09 May 2011)
New Revision: 10607
Modified:
trunk/hornetq-rest/pom.xml
Log:
Remove duplicated plugin declarations
Modified: trunk/hornetq-rest/pom.xml
===================================================================
--- trunk/hornetq-rest/pom.xml 2011-05-09 14:32:23 UTC (rev 10606)
+++ trunk/hornetq-rest/pom.xml 2011-05-09 15:00:42 UTC (rev 10607)
@@ -116,18 +116,12 @@
<build>
<pluginManagement>
<plugins>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.4</version>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- </plugin>
- <plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -143,11 +137,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<configuration>
<linkXref>true</linkXref>
@@ -245,10 +234,6 @@
maven-project-info-reports-plugin
</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
</plugins>
</reporting>
</project>
15 years
JBoss hornetq SVN: r10606 - trunk/tests/integration-tests.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-09 10:32:23 -0400 (Mon, 09 May 2011)
New Revision: 10606
Modified:
trunk/tests/integration-tests/pom.xml
Log:
removing quotes
Modified: trunk/tests/integration-tests/pom.xml
===================================================================
--- trunk/tests/integration-tests/pom.xml 2011-05-09 12:12:27 UTC (rev 10605)
+++ trunk/tests/integration-tests/pom.xml 2011-05-09 14:32:23 UTC (rev 10606)
@@ -99,19 +99,19 @@
<!-- excluded because of https://jira.jboss.org/jira/browse/HORNETQ-65 -->
<exclude>**/cluster/failover/*StaticClusterWithBackupFailoverTest.java</exclude>
<!--exclude any replication tests for now-->
- <exclude>**/cluster/failover/*ClusterWithBackupFailoverTestBase.java"</exclude>
+ <exclude>**/cluster/failover/*ClusterWithBackupFailoverTestBase.java</exclude>
<exclude>**/cluster/**/*/java"</exclude>
- <exclude>**/cluster/failover/*DiscoveryClusterWithBackupFailoverTest.java"</exclude>
- <exclude>**/cluster/failover/*GroupingFailoverReplicationTest.java"</exclude>
+ <exclude>**/cluster/failover/*DiscoveryClusterWithBackupFailoverTest.java</exclude>
+ <exclude>**/cluster/failover/*GroupingFailoverReplicationTest.java</exclude>
<exclude>**/cluster/failover/*Replicated*.java"</exclude>
<exclude>**/cluster/replication/**.java"</exclude>
- <exclude>**/cluster/failover/*ReplicatedDistributionTest.java"</exclude>
- <exclude>**/cluster/failover/*SharedStoreDistributionTest.java"</exclude>
- <exclude>**/cluster/failover/*ReplicatedNettyAsynchronousFailoverTest.java"</exclude>
- <exclude>**/cluster/*ReplicatedJMSFailoverTest.java"</exclude>
- <exclude>**/integration/replication/*.java"</exclude>
- <exclude>**/cluster/failover/Remote*.java"</exclude>
- <exclude>**/failover/remote/**.java"</exclude>
+ <exclude>**/cluster/failover/*ReplicatedDistributionTest.java</exclude>
+ <exclude>**/cluster/failover/*SharedStoreDistributionTest.java</exclude>
+ <exclude>**/cluster/failover/*ReplicatedNettyAsynchronousFailoverTest.java</exclude>
+ <exclude>**/cluster/*ReplicatedJMSFailoverTest.java</exclude>
+ <exclude>**/integration/replication/*.java</exclude>
+ <exclude>**/cluster/failover/Remote*.java</exclude>
+ <exclude>**/failover/remote/**.java</exclude>
</excludes>
</configuration>
</plugin>
15 years
JBoss hornetq SVN: r10605 - in branches/Branch_2_2_2_REST/hornetq-rest: src/main/java/org/hornetq/rest/queue and 2 other directories.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2011-05-09 08:12:27 -0400 (Mon, 09 May 2011)
New Revision: 10605
Removed:
branches/Branch_2_2_2_REST/hornetq-rest/.classpath
branches/Branch_2_2_2_REST/hornetq-rest/.project
Modified:
branches/Branch_2_2_2_REST/hornetq-rest/
branches/Branch_2_2_2_REST/hornetq-rest/pom.xml
branches/Branch_2_2_2_REST/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueConsumer.java
branches/Branch_2_2_2_REST/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java
branches/Branch_2_2_2_REST/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushQueueConsumerTest.java
Log:
clebert's fixes
Property changes on: branches/Branch_2_2_2_REST/hornetq-rest
___________________________________________________________________
Modified: svn:ignore
- target
+ target
.classpath
.project
Deleted: branches/Branch_2_2_2_REST/hornetq-rest/.classpath
===================================================================
--- branches/Branch_2_2_2_REST/hornetq-rest/.classpath 2011-05-09 12:09:33 UTC (rev 10604)
+++ branches/Branch_2_2_2_REST/hornetq-rest/.classpath 2011-05-09 12:12:27 UTC (rev 10605)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hornetq/hornetq-core/2.2.0.CR1/hornetq-core-2.2.0.CR1.jar" sourcepath="M2_REPO/org/hornetq/hornetq-core/2.2.0.CR1/hornetq-core-2.2.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hornetq/hornetq-jms/2.2.0.CR1/hornetq-jms-2.2.0.CR1.jar" sourcepath="M2_REPO/org/hornetq/hornetq-jms/2.2.0.CR1/hornetq-jms-2.2.0.CR1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-core-asl/1.5.3/jackson-core-asl-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-jaxrs/1.5.3/jackson-jaxrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-mapper-asl/1.5.3/jackson-mapper-asl-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/codehaus/jackson/jackson-xc/1.5.3/jackson-xc-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/jaxrs-api/2.0.1.GA/jaxrs-api-2.0.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Beta1/jboss-jms-api_1.1_spec-1.0.0.Beta1.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.5.8/jcl-over-slf4j-1.5.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.1/junit-4.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/netty/netty/3.2.0.Final/netty-3.2.0.Final.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jackson-provider/2.0.1.GA/resteasy-jackson-provider-2.0.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxb-provider/2.0.1.GA/resteasy-jaxb-provider-2.0.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/resteasy-jaxrs/2.0.1.GA/resteasy-jaxrs-2.0.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.8/slf4j-api-1.5.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.5.8/slf4j-simple-1.5.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/resteasy/tjws/2.0.1.GA/tjws-2.0.1.GA.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="var" path="M2_REPO"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: branches/Branch_2_2_2_REST/hornetq-rest/.project
===================================================================
--- branches/Branch_2_2_2_REST/hornetq-rest/.project 2011-05-09 12:09:33 UTC (rev 10604)
+++ branches/Branch_2_2_2_REST/hornetq-rest/.project 2011-05-09 12:12:27 UTC (rev 10605)
@@ -1,13 +0,0 @@
-<projectDescription>
- <name>hornetq-rest</name>
- <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
Modified: branches/Branch_2_2_2_REST/hornetq-rest/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/hornetq-rest/pom.xml 2011-05-09 12:09:33 UTC (rev 10604)
+++ branches/Branch_2_2_2_REST/hornetq-rest/pom.xml 2011-05-09 12:12:27 UTC (rev 10605)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest-all</artifactId>
- <version>2.2.2.Final</version>
+ <version>2.2.2.1</version>
</parent>
<groupId>org.hornetq.rest</groupId>
@@ -12,6 +12,10 @@
<packaging>jar</packaging>
<name>HornetQ REST Interface Implementation</name>
+ <properties>
+ <skipRestTests>false</skipRestTests>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.hornetq</groupId>
@@ -94,6 +98,14 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipRestTests}</skipTests>
+ </configuration>
+ <version>2.4</version>
+ </plugin>
</plugins>
</build>
Modified: branches/Branch_2_2_2_REST/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueConsumer.java
===================================================================
--- branches/Branch_2_2_2_REST/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueConsumer.java 2011-05-09 12:09:33 UTC (rev 10604)
+++ branches/Branch_2_2_2_REST/hornetq-rest/src/main/java/org/hornetq/rest/queue/QueueConsumer.java 2011-05-09 12:12:27 UTC (rev 10605)
@@ -198,7 +198,7 @@
protected void createSession()
throws HornetQException
{
- session = factory.createSession(true, true);
+ session = factory.createSession(true, true, 0);
if (selector == null)
{
consumer = session.createConsumer(destination);
Modified: branches/Branch_2_2_2_REST/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java
===================================================================
--- branches/Branch_2_2_2_REST/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java 2011-05-09 12:09:33 UTC (rev 10604)
+++ branches/Branch_2_2_2_REST/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java 2011-05-09 12:12:27 UTC (rev 10605)
@@ -70,7 +70,7 @@
strategy.setRegistration(registration);
strategy.start();
- session = factory.createSession(false, false);
+ session = factory.createSession(false, false, 0);
if (registration.getSelector() != null)
{
consumer = session.createConsumer(destination, SelectorTranslator.convertToHornetQFilterString(registration.getSelector()));
@@ -127,19 +127,25 @@
@Override
public void onMessage(ClientMessage clientMessage)
{
- boolean acknowledge = strategy.push(clientMessage);
- if (registration.isDisableOnFailure())
+ try
{
- log.error("Failed to push message to "+ registration.getTarget() + " disabling push registration...");
- disableFromFailure();
+ clientMessage.acknowledge();
}
+ catch (HornetQException e)
+ {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+
+ boolean acknowledge = strategy.push(clientMessage);
+
if (acknowledge)
{
try
{
log.debug("Acknowledging: " + clientMessage.getMessageID());
- clientMessage.acknowledge();
+ session.commit();
+ return;
}
catch (HornetQException e)
{
@@ -148,8 +154,20 @@
}
else
{
- // let hornetq decide what to do
- throw new RuntimeException("Failed to push message to "+ registration.getTarget());
+ try
+ {
+ session.rollback();
+ }
+ catch (HornetQException e)
+ {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ if (registration.isDisableOnFailure())
+ {
+ log.error("Failed to push message to " + registration.getTarget() + " disabling push registration...");
+ disableFromFailure();
+ return;
+ }
}
}
}
Modified: branches/Branch_2_2_2_REST/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushQueueConsumerTest.java
===================================================================
--- branches/Branch_2_2_2_REST/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushQueueConsumerTest.java 2011-05-09 12:09:33 UTC (rev 10604)
+++ branches/Branch_2_2_2_REST/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushQueueConsumerTest.java 2011-05-09 12:12:27 UTC (rev 10605)
@@ -87,6 +87,7 @@
PushRegistration reg = new PushRegistration();
reg.setDurable(true);
+ reg.setDisableOnFailure(true);
XmlLink target = new XmlLink();
target.setHref(generateURL("/queues/forwardQueue"));
target.setRelationship("destination");
15 years
JBoss hornetq SVN: r10604 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-09 08:09:33 -0400 (Mon, 09 May 2011)
New Revision: 10604
Modified:
trunk/pom.xml
Log:
mvn: Add a findbugs configuration to <build/>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-09 11:48:43 UTC (rev 10603)
+++ trunk/pom.xml 2011-05-09 12:09:33 UTC (rev 10604)
@@ -541,8 +541,16 @@
<artifactId>maven-help-plugin</artifactId>
<version>2.1.1</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <xmlOutput>true</xmlOutput>
+ <effort>Max</effort>
+ </configuration>
+ </plugin>
</plugins>
-
</build>
<reporting>
15 years