JBoss hornetq SVN: r10593 - trunk.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-05-05 10:37:04 -0400 (Thu, 05 May 2011)
New Revision: 10593
Removed:
trunk/src/
Log:
unwanted dirs
13 years
JBoss hornetq SVN: r10592 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-05 10:27:48 -0400 (Thu, 05 May 2011)
New Revision: 10592
Removed:
trunk/tools/
Log:
Delete empty folders at ./tools
13 years
JBoss hornetq SVN: r10589 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-05 09:36:27 -0400 (Thu, 05 May 2011)
New Revision: 10589
Modified:
trunk/README
trunk/pom.xml
Log:
Upgrade the site plugin to 3.0-beta-3. It should work with mvn3.
Modified: trunk/README
===================================================================
--- trunk/README 2011-05-05 13:36:06 UTC (rev 10588)
+++ trunk/README 2011-05-05 13:36:27 UTC (rev 10589)
@@ -7,15 +7,19 @@
[...]
-This file describes 'stuff one needs to know' to get started with this project.
+This file describes 'stuff one needs to know' to get started coding in
+this project.
* Maven:
-You need Maven 2.2.1.
+You need Maven 3.X.
-Using Maven 3.X will not work, due to compatibility problems
-<https://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html>.
+Do note that there are some compatibility issues with Maven 3.X still unsolved [1].
+This is specially true for the 'site' plugin [2].
+[1]: <https://cwiki.apache.org/MAVEN/maven-3x-compatibility-notes.html>
+[2]: <https://cwiki.apache.org/MAVEN/maven-3x-and-site-plugin.html>
+
* TESTS:
To run the unittests
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-05 13:36:06 UTC (rev 10588)
+++ trunk/pom.xml 2011-05-05 13:36:27 UTC (rev 10589)
@@ -394,6 +394,7 @@
</properties>
</profile>
</profiles>
+
<build>
<pluginManagement>
<plugins>
@@ -424,7 +425,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.2</version>
+ <version>3.0-beta-3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
13 years
JBoss hornetq SVN: r10587 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-05 09:34:53 -0400 (Thu, 05 May 2011)
New Revision: 10587
Modified:
trunk/pom.xml
Log:
Redirect some test output to file
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-04 15:49:20 UTC (rev 10586)
+++ trunk/pom.xml 2011-05-05 13:34:53 UTC (rev 10587)
@@ -460,6 +460,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4</version>
+ <configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
13 years
JBoss hornetq SVN: r10586 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-04 11:49:20 -0400 (Wed, 04 May 2011)
New Revision: 10586
Added:
trunk/checkstyle.xml
Modified:
trunk/pom.xml
Log:
Add checkstyle.xml configuration file from AS7
Added: trunk/checkstyle.xml
===================================================================
--- trunk/checkstyle.xml (rev 0)
+++ trunk/checkstyle.xml 2011-05-04 15:49:20 UTC (rev 10586)
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<module name="Checker">
+ <module name="FileTabCharacter">
+ <property name="eachLine" value="true"/>
+ </module>
+
+ <module name="RegexpSingleline">
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="\s+$"/>
+ <property name="message" value="Line has trailing spaces."/>
+ </module>
+
+ <module name="TreeWalker">
+
+ <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+ <!-- Checks for imports -->
+ <module name="AvoidStarImport"/>
+ <module name="RedundantImport"/>
+ <!-- Disabled until checkstyle can recognize imports which are used only by javadoc -->
+ <!--<module name="UnusedImports"/>-->
+
+ <!-- Modifier Checks -->
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+
+ <!-- Checks for blocks. You know, those {}'s -->
+ <module name="LeftCurly"/>
+
+ <!-- Checks for common coding problems -->
+ <!-- Disabled until http://sourceforge.net/tracker/?func=detail&aid=2843447&group_id=29721&at... is fixed-->
+ <!--<module name="DoubleCheckedLocking"/>-->
+ <module name="EmptyStatement"/>
+ <module name="EqualsHashCode"/>
+ <module name="IllegalInstantiation"/>
+ <module name="RedundantThrows">
+ <property name="allowUnchecked" value="true"/>
+ </module>
+
+ <!-- Miscellaneous other checks. -->
+ <module name="UpperEll"/>
+ <module name="PackageAnnotation"/>
+ <module name="CovariantEquals"/>
+ <module name="ArrayTypeStyle"/>
+
+ </module>
+
+</module>
+
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-04 09:29:38 UTC (rev 10585)
+++ trunk/pom.xml 2011-05-04 15:49:20 UTC (rev 10586)
@@ -559,9 +559,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.6</version>
<configuration>
- <configLocation>
- config/jboss_checks.xml
- </configLocation>
+ <configLocation>checkstyle.xml</configLocation>
</configuration>
</plugin>
<plugin>
13 years
JBoss hornetq SVN: r10585 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-04 05:29:38 -0400 (Wed, 04 May 2011)
New Revision: 10585
Removed:
trunk/build.bat
trunk/build.sh
Log:
Deleted obsolete files (which were left over for no apparent reason)
Deleted: trunk/build.bat
===================================================================
--- trunk/build.bat 2011-05-02 18:22:34 UTC (rev 10584)
+++ trunk/build.bat 2011-05-04 09:29:38 UTC (rev 10585)
@@ -1,4 +0,0 @@
-@echo off
-
-call src/bin/build.bat %*
-
Deleted: trunk/build.sh
===================================================================
--- trunk/build.sh 2011-05-02 18:22:34 UTC (rev 10584)
+++ trunk/build.sh 2011-05-04 09:29:38 UTC (rev 10585)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-src/bin/build.sh "$@"
13 years
JBoss hornetq SVN: r10584 - trunk/hornetq-rest/examples/javascript-chat/src/main/webapp.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-02 14:22:34 -0400 (Mon, 02 May 2011)
New Revision: 10584
Modified:
trunk/hornetq-rest/examples/javascript-chat/src/main/webapp/index.html
Log:
Just adding a few comments
Modified: trunk/hornetq-rest/examples/javascript-chat/src/main/webapp/index.html
===================================================================
--- trunk/hornetq-rest/examples/javascript-chat/src/main/webapp/index.html 2011-05-02 17:36:57 UTC (rev 10583)
+++ trunk/hornetq-rest/examples/javascript-chat/src/main/webapp/index.html 2011-05-02 18:22:34 UTC (rev 10584)
@@ -50,12 +50,17 @@
{
if (xhr.status == 200)
{
+ // getting the links from the rest resource
topicSender = xhr.getResponseHeader("msg-create");
subscriptions = xhr.getResponseHeader("msg-pull-subscriptions");
+
+ // just adding the report
document.getElementById("errors").innerHTML = "Subscriptions URL: " + subscriptions;
}
}
}
+
+ // this will send the request from javascript
xhr.send(null);
}
@@ -162,4 +167,4 @@
</pre>
</body>
-</html>
\ No newline at end of file
+</html>
13 years
JBoss hornetq SVN: r10583 - trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-02 13:36:57 -0400 (Mon, 02 May 2011)
New Revision: 10583
Modified:
trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java
Log:
changing commit with Bill
Modified: trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java
===================================================================
--- trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java 2011-04-29 17:04:14 UTC (rev 10582)
+++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java 2011-05-02 17:36:57 UTC (rev 10583)
@@ -70,7 +70,7 @@
strategy.setRegistration(registration);
strategy.start();
- session = factory.createSession(true, true, 0);
+ session = factory.createSession(false, false, 0);
if (registration.getSelector() != null)
{
consumer = session.createConsumer(destination, SelectorTranslator.convertToHornetQFilterString(registration.getSelector()));
@@ -127,6 +127,16 @@
@Override
public void onMessage(ClientMessage clientMessage)
{
+
+ try
+ {
+ clientMessage.acknowledge();
+ }
+ catch (HornetQException e)
+ {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+
boolean acknowledge = strategy.push(clientMessage);
if (acknowledge)
@@ -134,7 +144,7 @@
try
{
log.debug("Acknowledging: " + clientMessage.getMessageID());
- clientMessage.acknowledge();
+ session.commit();
return;
}
catch (HornetQException e)
@@ -144,14 +154,20 @@
}
else
{
- if (registration.isDisableOnFailure())
+ 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;
}
- // let hornetq decide what to do
- throw new RuntimeException("Failed to push message to " + registration.getTarget());
}
}
}
13 years