JBoss hornetq SVN: r10562 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/stomp.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-04-27 18:30:19 -0400 (Wed, 27 Apr 2011)
New Revision: 10562
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java
Log:
Fixing possible dead lock on stomp... (again, not part of the supported source code but I wanted to keep the implementation in sync)
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2011-04-27 22:29:37 UTC (rev 10561)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2011-04-27 22:30:19 UTC (rev 10562)
@@ -600,51 +600,51 @@
return new StompFrame(Stomp.Responses.CONNECTED, h);
}
- public void cleanup(StompConnection connection)
+ public void cleanup(final StompConnection connection)
{
connection.setValid(false);
- try
+ // Close the session outside of the lock on the StompConnection, otherwise it could dead lock
+ this.executor.execute(new Runnable()
{
- StompSession session = sessions.remove(connection.getID());
- if (session != null)
+ public void run()
{
- try
+ StompSession session = sessions.remove(connection.getID());
+ if (session != null)
{
- session.getSession().rollback(true);
- session.getSession().close(false);
- }
- catch (Exception e)
- {
- log.warn(e.getMessage(), e);
- }
- }
-
- // removed the transacted session belonging to the connection
- Iterator<Entry<String, StompSession>> iterator = transactedSessions.entrySet().iterator();
- while (iterator.hasNext())
- {
- Map.Entry<String, StompSession> entry = (Map.Entry<String, StompSession>)iterator.next();
- if (entry.getValue().getConnection() == connection)
- {
- ServerSession serverSession = entry.getValue().getSession();
try
{
- serverSession.rollback(true);
- serverSession.close(false);
+ session.getSession().rollback(true);
+ session.getSession().close(false);
}
catch (Exception e)
{
log.warn(e.getMessage(), e);
}
- iterator.remove();
}
+
+ // removed the transacted session belonging to the connection
+ Iterator<Entry<String, StompSession>> iterator = transactedSessions.entrySet().iterator();
+ while (iterator.hasNext())
+ {
+ Map.Entry<String, StompSession> entry = (Map.Entry<String, StompSession>)iterator.next();
+ if (entry.getValue().getConnection() == connection)
+ {
+ ServerSession serverSession = entry.getValue().getSession();
+ try
+ {
+ serverSession.rollback(true);
+ serverSession.close(false);
+ }
+ catch (Exception e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ iterator.remove();
+ }
+ }
}
- }
- finally
- {
- server.getStorageManager().clearContext();
- }
+ });
}
private void sendReply(final StompConnection connection, final StompFrame frame)
13 years, 8 months
JBoss hornetq SVN: r10561 - trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/stomp.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-04-27 18:29:37 -0400 (Wed, 27 Apr 2011)
New Revision: 10561
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/stomp/StompProtocolManager.java
Log:
Fixing possible dead lock on Stomp
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/stomp/StompProtocolManager.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2011-04-27 16:54:42 UTC (rev 10560)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/stomp/StompProtocolManager.java 2011-04-27 22:29:37 UTC (rev 10561)
@@ -600,51 +600,51 @@
return new StompFrame(Stomp.Responses.CONNECTED, h);
}
- public void cleanup(StompConnection connection)
+ public void cleanup(final StompConnection connection)
{
connection.setValid(false);
- try
+ // Close the session outside of the lock on the StompConnection, otherwise it could dead lock
+ this.executor.execute(new Runnable()
{
- StompSession session = sessions.remove(connection.getID());
- if (session != null)
+ public void run()
{
- try
+ StompSession session = sessions.remove(connection.getID());
+ if (session != null)
{
- session.getSession().rollback(true);
- session.getSession().close(false);
- }
- catch (Exception e)
- {
- log.warn(e.getMessage(), e);
- }
- }
-
- // removed the transacted session belonging to the connection
- Iterator<Entry<String, StompSession>> iterator = transactedSessions.entrySet().iterator();
- while (iterator.hasNext())
- {
- Map.Entry<String, StompSession> entry = (Map.Entry<String, StompSession>)iterator.next();
- if (entry.getValue().getConnection() == connection)
- {
- ServerSession serverSession = entry.getValue().getSession();
try
{
- serverSession.rollback(true);
- serverSession.close(false);
+ session.getSession().rollback(true);
+ session.getSession().close(false);
}
catch (Exception e)
{
log.warn(e.getMessage(), e);
}
- iterator.remove();
}
+
+ // removed the transacted session belonging to the connection
+ Iterator<Entry<String, StompSession>> iterator = transactedSessions.entrySet().iterator();
+ while (iterator.hasNext())
+ {
+ Map.Entry<String, StompSession> entry = (Map.Entry<String, StompSession>)iterator.next();
+ if (entry.getValue().getConnection() == connection)
+ {
+ ServerSession serverSession = entry.getValue().getSession();
+ try
+ {
+ serverSession.rollback(true);
+ serverSession.close(false);
+ }
+ catch (Exception e)
+ {
+ log.warn(e.getMessage(), e);
+ }
+ iterator.remove();
+ }
+ }
}
- }
- finally
- {
- server.getStorageManager().clearContext();
- }
+ });
}
private void sendReply(final StompConnection connection, final StompFrame frame)
13 years, 8 months
JBoss hornetq SVN: r10560 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/stomp.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-04-27 12:54:42 -0400 (Wed, 27 Apr 2011)
New Revision: 10560
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/stomp/StompDecoder.java
Log:
https://issues.jboss.org/browse/HORNETQ-683 - fixing stomp example - This won't affect any supported EAP code, however I wanted to fix it just in case on the EAP branch as well
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/stomp/StompDecoder.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/stomp/StompDecoder.java 2011-04-27 16:53:33 UTC (rev 10559)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/stomp/StompDecoder.java 2011-04-27 16:54:42 UTC (rev 10560)
@@ -27,7 +27,7 @@
*
*/
public class StompDecoder
-{
+{
private static final Logger log = Logger.getLogger(StompDecoder.class);
private static final boolean TRIM_LEADING_HEADER_VALUE_WHITESPACE = true;
@@ -68,6 +68,20 @@
private static final int COMMAND_UNSUBSCRIBE_LENGTH = COMMAND_UNSUBSCRIBE.length();
+ /**** added by meddy, 27 april 2011, handle header parser for reply to websocket protocol ****/
+ private static final String COMMAND_CONNECTED = "CONNECTED";
+
+ private static final int COMMAND_CONNECTED_LENGTH = COMMAND_CONNECTED.length();
+
+ private static final String COMMAND_MESSAGE = "MESSAGE";
+
+ private static final int COMMAND_MESSAGE_LENGTH = COMMAND_MESSAGE.length();
+
+ private static final String COMMAND_ERROR = "ERROR";
+
+ private static final int COMMAND_ERROR_LENGTH = COMMAND_ERROR.length();
+ /**** end ****/
+
private static final byte A = (byte)'A';
private static final byte B = (byte)'B';
@@ -232,6 +246,18 @@
// COMMIT
command = COMMAND_COMMIT;
}
+ /**** added by meddy, 27 april 2011, handle header parser for reply to websocket protocol ****/
+ else if (workingBuffer[offset+7]==E)
+ {
+ if (!tryIncrement(offset + COMMAND_CONNECTED_LENGTH + 1))
+ {
+ return null;
+ }
+
+ // CONNECTED
+ command = COMMAND_CONNECTED;
+ }
+ /**** end ****/
else
{
if (!tryIncrement(offset + COMMAND_CONNECT_LENGTH + 1))
@@ -256,6 +282,32 @@
break;
}
+ /**** added by meddy, 27 april 2011, handle header parser for reply to websocket protocol ****/
+ case E:
+ {
+ if (!tryIncrement(offset + COMMAND_ERROR_LENGTH + 1))
+ {
+ return null;
+ }
+
+ // ERROR
+ command = COMMAND_ERROR;
+
+ break;
+ }
+ case M:
+ {
+ if (!tryIncrement(offset + COMMAND_MESSAGE_LENGTH + 1))
+ {
+ return null;
+ }
+
+ // MESSAGE
+ command = COMMAND_MESSAGE;
+
+ break;
+ }
+ /**** end ****/
case S:
{
if (workingBuffer[offset + 1] == E)
13 years, 8 months
JBoss hornetq SVN: r10559 - trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/stomp.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-04-27 12:53:33 -0400 (Wed, 27 Apr 2011)
New Revision: 10559
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/stomp/StompDecoder.java
Log:
https://issues.jboss.org/browse/HORNETQ-683 - fixing stomp example
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/stomp/StompDecoder.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/stomp/StompDecoder.java 2011-04-27 01:24:12 UTC (rev 10558)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/protocol/stomp/StompDecoder.java 2011-04-27 16:53:33 UTC (rev 10559)
@@ -27,7 +27,7 @@
*
*/
public class StompDecoder
-{
+{
private static final Logger log = Logger.getLogger(StompDecoder.class);
private static final boolean TRIM_LEADING_HEADER_VALUE_WHITESPACE = true;
@@ -68,6 +68,20 @@
private static final int COMMAND_UNSUBSCRIBE_LENGTH = COMMAND_UNSUBSCRIBE.length();
+ /**** added by meddy, 27 april 2011, handle header parser for reply to websocket protocol ****/
+ private static final String COMMAND_CONNECTED = "CONNECTED";
+
+ private static final int COMMAND_CONNECTED_LENGTH = COMMAND_CONNECTED.length();
+
+ private static final String COMMAND_MESSAGE = "MESSAGE";
+
+ private static final int COMMAND_MESSAGE_LENGTH = COMMAND_MESSAGE.length();
+
+ private static final String COMMAND_ERROR = "ERROR";
+
+ private static final int COMMAND_ERROR_LENGTH = COMMAND_ERROR.length();
+ /**** end ****/
+
private static final byte A = (byte)'A';
private static final byte B = (byte)'B';
@@ -232,6 +246,18 @@
// COMMIT
command = COMMAND_COMMIT;
}
+ /**** added by meddy, 27 april 2011, handle header parser for reply to websocket protocol ****/
+ else if (workingBuffer[offset+7]==E)
+ {
+ if (!tryIncrement(offset + COMMAND_CONNECTED_LENGTH + 1))
+ {
+ return null;
+ }
+
+ // CONNECTED
+ command = COMMAND_CONNECTED;
+ }
+ /**** end ****/
else
{
if (!tryIncrement(offset + COMMAND_CONNECT_LENGTH + 1))
@@ -256,6 +282,32 @@
break;
}
+ /**** added by meddy, 27 april 2011, handle header parser for reply to websocket protocol ****/
+ case E:
+ {
+ if (!tryIncrement(offset + COMMAND_ERROR_LENGTH + 1))
+ {
+ return null;
+ }
+
+ // ERROR
+ command = COMMAND_ERROR;
+
+ break;
+ }
+ case M:
+ {
+ if (!tryIncrement(offset + COMMAND_MESSAGE_LENGTH + 1))
+ {
+ return null;
+ }
+
+ // MESSAGE
+ command = COMMAND_MESSAGE;
+
+ break;
+ }
+ /**** end ****/
case S:
{
if (workingBuffer[offset + 1] == E)
13 years, 8 months
JBoss hornetq SVN: r10558 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-04-26 21:24:12 -0400 (Tue, 26 Apr 2011)
New Revision: 10558
Added:
tags/HornetQ_2_2_2_Rest-Final-Examples/
Removed:
tags/HornetQ_Rest_2_2_2_Final-Examples/
Log:
renaming rest examples
13 years, 8 months
JBoss hornetq SVN: r10557 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-04-26 21:23:18 -0400 (Tue, 26 Apr 2011)
New Revision: 10557
Added:
tags/HornetQ_2_2_3_EAP_GA/
Log:
Tagging 2.2.3.EAP
13 years, 8 months
JBoss hornetq SVN: r10556 - 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-04-26 21:20:18 -0400 (Tue, 26 Apr 2011)
New Revision: 10556
Modified:
branches/Branch_2_2_EAP/build-maven.xml
branches/Branch_2_2_EAP/hornetq-rest/pom.xml
Log:
changing versions
Modified: branches/Branch_2_2_EAP/build-maven.xml
===================================================================
--- branches/Branch_2_2_EAP/build-maven.xml 2011-04-27 01:17:29 UTC (rev 10555)
+++ branches/Branch_2_2_EAP/build-maven.xml 2011-04-27 01:20:18 UTC (rev 10556)
@@ -13,7 +13,7 @@
-->
<project default="upload" name="HornetQ">
- <property name="hornetq.version" value="2.2.2.GA"/>
+ <property name="hornetq.version" value="2.2.3.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-04-27 01:17:29 UTC (rev 10555)
+++ branches/Branch_2_2_EAP/hornetq-rest/pom.xml 2011-04-27 01:20:18 UTC (rev 10556)
@@ -10,7 +10,7 @@
<properties>
<resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.2.GA</hornetq.version>
+ <hornetq.version>2.2.3.GA</hornetq.version>
</properties>
<licenses>
13 years, 8 months
JBoss hornetq SVN: r10555 - branches/Branch_2_2_EAP/src/config/common.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-04-26 21:17:29 -0400 (Tue, 26 Apr 2011)
New Revision: 10555
Modified:
branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties
Log:
version update
Modified: branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties
===================================================================
--- branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-04-26 02:54:05 UTC (rev 10554)
+++ branches/Branch_2_2_EAP/src/config/common/hornetq-version.properties 2011-04-27 01:17:29 UTC (rev 10555)
@@ -1,7 +1,7 @@
-hornetq.version.versionName=Favo de Mel
+hornetq.version.versionName=HQ_2_2_3_GA_EAP
hornetq.version.majorVersion=2
hornetq.version.minorVersion=2
-hornetq.version.microVersion=2
+hornetq.version.microVersion=3
hornetq.version.incrementingVersion=121
hornetq.version.versionSuffix=GA
hornetq.version.versionTag=GA
13 years, 8 months
JBoss hornetq SVN: r10554 - trunk/distribution.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-04-25 22:54:05 -0400 (Mon, 25 Apr 2011)
New Revision: 10554
Modified:
trunk/distribution/pom.xml
Log:
fixing sub-module
Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml 2011-04-25 21:01:22 UTC (rev 10553)
+++ trunk/distribution/pom.xml 2011-04-26 02:54:05 UTC (rev 10554)
@@ -31,7 +31,6 @@
<modules>
<module>jnp-client</module>
- <module>jboss-mc</module>
<module>hornetq</module>
</modules>
13 years, 8 months
JBoss hornetq SVN: r10553 - in trunk/hornetq-rest: hornetq-rest and 2 other directories.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2011-04-25 17:01:22 -0400 (Mon, 25 Apr 2011)
New Revision: 10553
Modified:
trunk/hornetq-rest/hornetq-rest-all.iml
trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml
trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java
trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushQueueConsumerTest.java
trunk/hornetq-rest/pom.xml
Log:
stupid push error
Modified: trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml
===================================================================
--- trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml 2011-04-22 15:15:21 UTC (rev 10552)
+++ trunk/hornetq-rest/hornetq-rest/hornetq-rest.iml 2011-04-25 21:01:22 UTC (rev 10553)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/../target/classes" />
- <output-test url="file://$MODULE_DIR$/../target/test-classes" />
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
@@ -11,7 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="hornetq-core" scope="PROVIDED" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.hornetq:hornetq-core:2.2.3-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.resteasy:resteasy-jaxrs:2.1.0.GA" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.resteasy:jaxrs-api:2.1.0.GA" level="project" />
@@ -29,7 +29,7 @@
<orderEntry type="library" scope="TEST" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.6.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.6.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.codehaus.jackson:jackson-xc:1.6.3" level="project" />
- <orderEntry type="module" module-name="hornetq-jms" scope="PROVIDED" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.hornetq:hornetq-jms:2.2.3-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
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-22 15:15:21 UTC (rev 10552)
+++ trunk/hornetq-rest/hornetq-rest/src/main/java/org/hornetq/rest/queue/push/PushConsumer.java 2011-04-25 21:01:22 UTC (rev 10553)
@@ -129,17 +129,13 @@
{
boolean acknowledge = strategy.push(clientMessage);
- if (registration.isDisableOnFailure())
- {
- log.error("Failed to push message to "+ registration.getTarget() + " disabling push registration...");
- disableFromFailure();
- }
if (acknowledge)
{
try
{
log.debug("Acknowledging: " + clientMessage.getMessageID());
clientMessage.acknowledge();
+ return;
}
catch (HornetQException e)
{
@@ -148,8 +144,14 @@
}
else
{
+ 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());
+ throw new RuntimeException("Failed to push message to " + registration.getTarget());
}
}
}
Modified: trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushQueueConsumerTest.java
===================================================================
--- trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushQueueConsumerTest.java 2011-04-22 15:15:21 UTC (rev 10552)
+++ trunk/hornetq-rest/hornetq-rest/src/test/java/org/hornetq/rest/test/PersistentPushQueueConsumerTest.java 2011-04-25 21:01:22 UTC (rev 10553)
@@ -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");
Modified: trunk/hornetq-rest/hornetq-rest-all.iml
===================================================================
--- trunk/hornetq-rest/hornetq-rest-all.iml 2011-04-22 15:15:21 UTC (rev 10552)
+++ trunk/hornetq-rest/hornetq-rest-all.iml 2011-04-25 21:01:22 UTC (rev 10553)
@@ -5,8 +5,6 @@
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<exclude-output />
<content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
- <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
Modified: trunk/hornetq-rest/pom.xml
===================================================================
--- trunk/hornetq-rest/pom.xml 2011-04-22 15:15:21 UTC (rev 10552)
+++ trunk/hornetq-rest/pom.xml 2011-04-25 21:01:22 UTC (rev 10553)
@@ -2,11 +2,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.hornetq</groupId>
- <artifactId>hornetq-pom</artifactId>
- <version>2.2.3-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-pom</artifactId>
+ <version>2.2.3-SNAPSHOT</version>
+ </parent>
<name>HornetQ REST Interface Parent POM</name>
<groupId>org.hornetq.rest</groupId>
@@ -16,6 +16,7 @@
<properties>
<resteasy.version>2.1.0.GA</resteasy.version>
+ <!--- test -->
<hornetq.version>${project.version}</hornetq.version>
</properties>
@@ -36,7 +37,7 @@
</distributionManagement>
<modules>
- <module>hornetq-rest</module>
+ <module>hornetq-rest</module>
</modules>
<dependencyManagement>
13 years, 8 months