JBoss hornetq SVN: r10633 - in branches/Branch_2_2_EAP/src/main/org/hornetq: utils and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 12:46:49 -0400 (Wed, 11 May 2011)
New Revision: 10633
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/utils/TypedProperties.java
Log:
Fix .equals(o) which didn't check for null argument, and another findbugs warning.
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-05-11 16:22:51 UTC (rev 10632)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/impl/QueueImpl.java 2011-05-11 16:46:49 UTC (rev 10633)
@@ -1362,6 +1362,7 @@
{
return true;
}
+ if (!(other instanceof QueueImpl)) return false;
QueueImpl qother = (QueueImpl)other;
@@ -1932,7 +1933,7 @@
if (count == 0)
{
- // Note - we MUST store the delete after the preceeding ack has been committed to storage, we cannot combine
+ // Note - we MUST store the delete after the preceding ack has been committed to storage, we cannot combine
// the last ack and delete into a single delete.
// This is because otherwise we could have a situation where the same message is being acked concurrently
// from two different queues on different sessions.
@@ -1940,8 +1941,8 @@
// ack isn't committed, then the server crashes and on
// recovery the message is deleted even though the other ack never committed
- // also note then when this happens as part of a trasaction its the tx commt of the ack that is important
- // not this
+ // also note then when this happens as part of a transaction it is the tx commit of the ack that is
+ // important not this
// Also note that this delete shouldn't sync to disk, or else we would build up the executor's queue
// as we can't delete each messaging with sync=true while adding messages transactionally.
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/utils/TypedProperties.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/utils/TypedProperties.java 2011-05-11 16:22:51 UTC (rev 10632)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/utils/TypedProperties.java 2011-05-11 16:46:49 UTC (rev 10633)
@@ -354,10 +354,6 @@
public Float getFloatProperty(final SimpleString key) throws PropertyConversionException
{
Object value = doGetProperty(key);
- if (value == null)
- {
- return Float.valueOf(null);
- }
if (value instanceof Float)
{
@@ -369,7 +365,7 @@
}
else
{
- throw new PropertyConversionException("Invalid conversion");
+ throw new PropertyConversionException("Invalid conversion " + key);
}
}
14 years, 12 months
JBoss hornetq SVN: r10632 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 12:22:51 -0400 (Wed, 11 May 2011)
New Revision: 10632
Modified:
trunk/pom.xml
Log:
Run unittests in alphabetical order
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-11 16:22:33 UTC (rev 10631)
+++ trunk/pom.xml 2011-05-11 16:22:51 UTC (rev 10632)
@@ -467,6 +467,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4</version>
<configuration>
+ <runOrder>alphabetical</runOrder>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
</plugin>
14 years, 12 months
JBoss hornetq SVN: r10631 - trunk/tests/unit-tests.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 12:22:33 -0400 (Wed, 11 May 2011)
New Revision: 10631
Modified:
trunk/tests/unit-tests/pom.xml
Log:
Unnecessary maven elements
Modified: trunk/tests/unit-tests/pom.xml
===================================================================
--- trunk/tests/unit-tests/pom.xml 2011-05-11 15:21:17 UTC (rev 10630)
+++ trunk/tests/unit-tests/pom.xml 2011-05-11 16:22:33 UTC (rev 10631)
@@ -82,14 +82,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
</plugins>
</build>
14 years, 12 months
JBoss hornetq SVN: r10630 - trunk/tests/joram-tests.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 11:21:17 -0400 (Wed, 11 May 2011)
New Revision: 10630
Modified:
trunk/tests/joram-tests/pom.xml
Log:
Unnecessary Maven declarations
Modified: trunk/tests/joram-tests/pom.xml
===================================================================
--- trunk/tests/joram-tests/pom.xml 2011-05-11 15:13:29 UTC (rev 10629)
+++ trunk/tests/joram-tests/pom.xml 2011-05-11 15:21:17 UTC (rev 10630)
@@ -121,14 +121,6 @@
</includes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
</plugins>
</build>
14 years, 12 months
JBoss hornetq SVN: r10629 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 11:13:29 -0400 (Wed, 11 May 2011)
New Revision: 10629
Modified:
trunk/pom.xml
Log:
Re-enable some test projects to run on Hudson
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-11 15:12:11 UTC (rev 10628)
+++ trunk/pom.xml 2011-05-11 15:13:29 UTC (rev 10629)
@@ -386,11 +386,11 @@
<skipJmsTests>false</skipJmsTests>
<skipJoramTests>false</skipJoramTests>
<skipIntegrationTests>false</skipIntegrationTests>
- <skipTimingTests>true</skipTimingTests>
+ <skipTimingTests>false</skipTimingTests>
+ <skipConcurrentTests>false</skipConcurrentTests>
<skipStressTests>true</skipStressTests>
<skipSoakTests>true</skipSoakTests>
<skipPerformanceTests>true</skipPerformanceTests>
- <skipConcurrentTests>true</skipConcurrentTests>
</properties>
</profile>
</profiles>
14 years, 12 months
JBoss hornetq SVN: r10628 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 11:12:11 -0400 (Wed, 11 May 2011)
New Revision: 10628
Modified:
trunk/README
Log:
Document issue with M2Eclipse
Modified: trunk/README
===================================================================
--- trunk/README 2011-05-11 15:11:46 UTC (rev 10627)
+++ trunk/README 2011-05-11 15:12:11 UTC (rev 10628)
@@ -1,6 +1,6 @@
-*-outline-*-
-If you need information about the HornetQ project please go to
+If you need information about the HornetQ project please go to
http://community.jboss.org/wiki/HornetQ
http://www.jboss.org/hornetq/
@@ -12,7 +12,7 @@
* Maven:
-You need Maven 3.X.
+You need Maven 3.X.
Do note that there are some compatibility issues with Maven 3.X still
unsolved [1]. This is specially true for the 'site' plugin [2].
@@ -26,7 +26,7 @@
% mvn -Phudson-tests tests
-** Generating reports from unit tests
+** Generating reports from unit tests
% mvn install
% mvn site # (this currently does not work)
@@ -39,3 +39,7 @@
** Install the m2Eclipse plugin, and use it to import the root
project. Each sub-project will be imported automatically.
+
+The M2Eclipse plugin has some limitations, after importing the projects
+you should use "Maven / Update project configuration" to fix up the
+projects. If necessary consult the M2Eclipse plugin FAQ.
14 years, 12 months
JBoss hornetq SVN: r10627 - trunk/tests/integration-tests.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 11:11:46 -0400 (Wed, 11 May 2011)
New Revision: 10627
Modified:
trunk/tests/integration-tests/pom.xml
Log:
The JIRA case quoted is closed HORNETQ-65
Modified: trunk/tests/integration-tests/pom.xml
===================================================================
--- trunk/tests/integration-tests/pom.xml 2011-05-11 15:11:12 UTC (rev 10626)
+++ trunk/tests/integration-tests/pom.xml 2011-05-11 15:11:46 UTC (rev 10627)
@@ -97,8 +97,6 @@
<excludes>
<exclude>**/ReplicatedJMSFailoverTest.java</exclude>
<exclude>org/hornetq/tests/util/*.java</exclude>
- <!-- 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/**/*/java</exclude>
14 years, 12 months
JBoss hornetq SVN: r10626 - in trunk/docs: rest-manual and 1 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 11:11:12 -0400 (Wed, 11 May 2011)
New Revision: 10626
Modified:
trunk/docs/quickstart-guide/pom.xml
trunk/docs/rest-manual/pom.xml
trunk/docs/user-manual/pom.xml
Log:
Fix name and artifactId of documentation projects
Modified: trunk/docs/quickstart-guide/pom.xml
===================================================================
--- trunk/docs/quickstart-guide/pom.xml 2011-05-11 15:10:29 UTC (rev 10625)
+++ trunk/docs/quickstart-guide/pom.xml 2011-05-11 15:11:12 UTC (rev 10626)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<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/xsd/maven-4.0.0.xsd">
-
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -12,16 +12,16 @@
</parent>
<groupId>org.hornetq.docs</groupId>
- <artifactId>${docname}-${translation}</artifactId>
+ <artifactId>quickstart-guide</artifactId>
<version>1.0</version>
<packaging>jdocbook</packaging>
- <name>${bookname}-(${translation})</name>
+ <name>quickstart-guide</name>
<properties>
<translation>en</translation>
<docname>HornetQ_QuickStart_Guide</docname>
<bookname>HornetQ QuickStart Guide</bookname>
- </properties>
+ </properties>
<repositories>
<repository>
@@ -65,7 +65,7 @@
</snapshots>
</pluginRepository-->
</pluginRepositories>
-
+
<profiles>
<!-- mvn compile -->
@@ -292,7 +292,7 @@
</options>
</configuration>
</plugin>
-
+
</plugins>
</build>-->
Modified: trunk/docs/rest-manual/pom.xml
===================================================================
--- trunk/docs/rest-manual/pom.xml 2011-05-11 15:10:29 UTC (rev 10625)
+++ trunk/docs/rest-manual/pom.xml 2011-05-11 15:11:12 UTC (rev 10626)
@@ -15,7 +15,7 @@
<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/xsd/maven-4.0.0.xsd">
-
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -25,16 +25,16 @@
</parent>
<groupId>org.hornetq.docs</groupId>
- <artifactId>${docname}-${translation}</artifactId>
+ <artifactId>rest-manual</artifactId>
<version>1.0</version>
<packaging>jdocbook</packaging>
- <name>${bookname}-(${translation})</name>
+ <name>rest-manual</name>
<properties>
<translation>en</translation>
<docname>HornetQ_Rest_Manual</docname>
<bookname>HornetQ Rest Manual</bookname>
- </properties>
+ </properties>
<repositories>
<repository>
@@ -78,7 +78,7 @@
</snapshots>
</pluginRepository-->
</pluginRepositories>
-
+
<profiles>
<!-- mvn compile -->
@@ -305,7 +305,7 @@
</options>
</configuration>
</plugin>
-
+
</plugins>
</build>-->
Modified: trunk/docs/user-manual/pom.xml
===================================================================
--- trunk/docs/user-manual/pom.xml 2011-05-11 15:10:29 UTC (rev 10625)
+++ trunk/docs/user-manual/pom.xml 2011-05-11 15:11:12 UTC (rev 10626)
@@ -15,7 +15,7 @@
<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/xsd/maven-4.0.0.xsd">
-
+
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -25,16 +25,16 @@
</parent>
<groupId>org.hornetq.docs</groupId>
- <artifactId>${docname}-${translation}</artifactId>
+ <artifactId>user-manual</artifactId>
<version>1.0</version>
<packaging>jdocbook</packaging>
- <name>${bookname}-(${translation})</name>
+ <name>user-manual</name>
<properties>
<translation>en</translation>
<docname>HornetQ_User_Manual</docname>
<bookname>HornetQ User Manual</bookname>
- </properties>
+ </properties>
<repositories>
<repository>
@@ -78,7 +78,7 @@
</snapshots>
</pluginRepository-->
</pluginRepositories>
-
+
<profiles>
<!-- mvn compile -->
@@ -306,7 +306,7 @@
</options>
</configuration>
</plugin>
-
+
</plugins>
</build>-->
14 years, 12 months
JBoss hornetq SVN: r10625 - in trunk/hornetq-rest: hornetq-rest and 1 other directory.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 11:10:29 -0400 (Wed, 11 May 2011)
New Revision: 10625
Modified:
trunk/hornetq-rest/hornetq-rest/pom.xml
trunk/hornetq-rest/pom.xml
Log:
Remove unnecessary and misconfigured plugin declarations
Modified: trunk/hornetq-rest/hornetq-rest/pom.xml
===================================================================
--- trunk/hornetq-rest/hornetq-rest/pom.xml 2011-05-11 15:09:46 UTC (rev 10624)
+++ trunk/hornetq-rest/hornetq-rest/pom.xml 2011-05-11 15:10:29 UTC (rev 10625)
@@ -86,25 +86,12 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <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: trunk/hornetq-rest/pom.xml
===================================================================
--- trunk/hornetq-rest/pom.xml 2011-05-11 15:09:46 UTC (rev 10624)
+++ trunk/hornetq-rest/pom.xml 2011-05-11 15:10:29 UTC (rev 10625)
@@ -142,7 +142,7 @@
<linkXref>true</linkXref>
<sourceEncoding>utf-8</sourceEncoding>
<minimumTokens>100</minimumTokens>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>1.6</targetJdk>
</configuration>
</plugin>
<plugin>
@@ -163,18 +163,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<createChecksum>true</createChecksum>
14 years, 12 months
JBoss hornetq SVN: r10624 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-11 11:09:46 -0400 (Wed, 11 May 2011)
New Revision: 10624
Modified:
trunk/.gitignore
Log:
Improve gitignore
Modified: trunk/.gitignore
===================================================================
--- trunk/.gitignore 2011-05-11 13:21:17 UTC (rev 10623)
+++ trunk/.gitignore 2011-05-11 15:09:46 UTC (rev 10624)
@@ -1,6 +1,11 @@
target
tests/jms-tests/data
+org.eclipse.jdt.core.prefs
+org.eclipse.jdt.ui.prefs
+!etc/org.eclipse.jdt.ui.prefs
+!etc/org.eclipse.jdt.core.prefs
org.maven.ide.eclipse.prefs
+.classpath
# /
/build
@@ -24,7 +29,6 @@
# /distribution/jnp-client/
/distribution/jnp-client/target
/distribution/jnp-client/bin
-/distribution/jnp-client/.classpath
/distribution/jnp-client/.project
# /docs/
@@ -41,7 +45,6 @@
/docs/user-manual/build
/docs/user-manual/target
/docs/user-manual/bin
-/docs/user-manual/.classpath
/docs/user-manual/.project
# /examples/
@@ -631,37 +634,30 @@
# /hornetq-bootstrap/
/hornetq-bootstrap/target
-/hornetq-bootstrap/.classpath
/hornetq-bootstrap/.project
# /hornetq-core/
/hornetq-core/target
-/hornetq-core/.classpath
/hornetq-core/.project
# /hornetq-core-client/
/hornetq-core-client/target
-/hornetq-core-client/.classpath
/hornetq-core-client/.project
# /hornetq-jboss-as-integration/
/hornetq-jboss-as-integration/target
-/hornetq-jboss-as-integration/.classpath
/hornetq-jboss-as-integration/.project
# /hornetq-jms/
/hornetq-jms/target
-/hornetq-jms/.classpath
/hornetq-jms/.project
# /hornetq-jms-client/
/hornetq-jms-client/target
-/hornetq-jms-client/.classpath
/hornetq-jms-client/.project
# /hornetq-logging/
/hornetq-logging/target
-/hornetq-logging/.classpath
/hornetq-logging/.project
# /hornetq-ra/
@@ -669,12 +665,10 @@
# /hornetq-ra/hornetq-ra-jar/
/hornetq-ra/hornetq-ra-jar/target
-/hornetq-ra/hornetq-ra-jar/.classpath
/hornetq-ra/hornetq-ra-jar/.project
# /hornetq-ra/hornetq-ra-rar/
/hornetq-ra/hornetq-ra-rar/target
-/hornetq-ra/hornetq-ra-rar/.classpath
/hornetq-ra/hornetq-ra-rar/.project
# /hornetq-rest/
@@ -685,20 +679,16 @@
# /hornetq-rest/hornetq-rest/
/hornetq-rest/hornetq-rest/target
-/hornetq-rest/hornetq-rest/.classpath
/hornetq-rest/hornetq-rest/.project
# /hornetq-service-sar/
/hornetq-service-sar/target
-/hornetq-service-sar/.classpath
/hornetq-service-sar/.project
# /hornetq-spring-integration/
/hornetq-spring-integration/target
-/hornetq-spring-integration/.classpath
/hornetq-spring-integration/.project
# /hornetq-twitter-integration/
/hornetq-twitter-integration/target
-/hornetq-twitter-integration/.classpath
/hornetq-twitter-integration/.project
14 years, 12 months