JBoss hornetq SVN: r10437 - trunk.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2011-03-31 17:20:51 -0400 (Thu, 31 Mar 2011)
New Revision: 10437
Modified:
trunk/build-hornetq.xml
Log:
fix distro to include rest examples
Modified: trunk/build-hornetq.xml
===================================================================
--- trunk/build-hornetq.xml 2011-03-31 20:26:43 UTC (rev 10436)
+++ trunk/build-hornetq.xml 2011-03-31 21:20:51 UTC (rev 10437)
@@ -1348,6 +1348,22 @@
</fileset>
</copy>
+ <mkdir dir="${build.distro.examples.dir}/rest"/>
+ <copy todir="${build.distro.examples.dir}/rest">
+ <fileset dir="hornetq-rest/examples">
+ <exclude name="build.properties"/>
+ <exclude name="**/target"/>
+ <exclude name="**/target/**"/>
+ <exclude name="**/build/**"/>
+ <exclude name="**/data**"/>
+ <exclude name="**/logs/**"/>
+ <exclude name="**/*.dat"/>
+ <exclude name="**/*.svn"/>
+ <exclude name="**/*.iml"/>
+ <exclude name="**/*.*~"/>
+ </fileset>
+ </copy>
+
<chmod perm="ugo+rx" parallel="false" verbose="true">
<fileset dir="${build.distro.examples.dir}">
<include name="**/build.sh"/>
13 years
JBoss hornetq SVN: r10436 - tags.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2011-03-31 16:26:43 -0400 (Thu, 31 Mar 2011)
New Revision: 10436
Added:
tags/HornetQ_Rest_2_2_2_Final-Examples/
Log:
Tag examples as the poms were screwed up
13 years
JBoss hornetq SVN: r10435 - trunk/src/main/org/hornetq/core/paging/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-31 14:18:25 -0400 (Thu, 31 Mar 2011)
New Revision: 10435
Modified:
trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
Log:
https://issues.jboss.org/browse/HORNETQ-664 - avoiding blocking on page and transactions
Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2011-03-31 14:30:13 UTC (rev 10434)
+++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2011-03-31 18:18:25 UTC (rev 10435)
@@ -885,24 +885,10 @@
currentPage.write(pagedMessage);
- if (tx != null)
+ if (sync || tx != null)
{
- SyncPageStoreTX syncPage = (SyncPageStoreTX)tx.getProperty(TransactionPropertyIndexes.PAGE_SYNC);
- if (syncPage == null)
- {
- syncPage = new SyncPageStoreTX();
- tx.putProperty(TransactionPropertyIndexes.PAGE_SYNC, syncPage);
- tx.addOperation(syncPage);
- }
- syncPage.addStore(this);
+ sync();
}
- else
- {
- if (sync)
- {
- sync();
- }
- }
return true;
}
@@ -957,63 +943,6 @@
}
}
- private static class SyncPageStoreTX extends TransactionOperationAbstract
- {
- Set<PagingStore> storesToSync = new HashSet<PagingStore>();
-
- public void addStore(PagingStore store)
- {
- storesToSync.add(store);
- }
-
- /* (non-Javadoc)
- * @see org.hornetq.core.transaction.TransactionOperation#beforePrepare(org.hornetq.core.transaction.Transaction)
- */
- public void beforePrepare(Transaction tx) throws Exception
- {
- sync();
- }
-
- void sync() throws Exception
- {
- OperationContext originalTX = OperationContextImpl.getContext();
-
- try
- {
- // We only want to sync paging here, no need to wait for any other events
- OperationContextImpl.clearContext();
-
- for (PagingStore store : storesToSync)
- {
- store.sync();
- }
-
- // We can't perform a commit/sync on the journal before we can assure page files are synced or we may get
- // out of sync
- OperationContext ctx = OperationContextImpl.getContext();
-
- if (ctx != null)
- {
- // if null it means there were no operations done before, hence no need to wait any completions
- ctx.waitCompletion();
- }
- }
- finally
- {
- OperationContextImpl.setContext(originalTX);
- }
-
- }
-
- /* (non-Javadoc)
- * @see org.hornetq.core.transaction.TransactionOperation#beforeCommit(org.hornetq.core.transaction.Transaction)
- */
- public void beforeCommit(Transaction tx) throws Exception
- {
- sync();
- }
- }
-
private class FinishPageMessageOperation implements TransactionOperation
{
private final PageTransactionInfo pageTransaction;
13 years
JBoss hornetq SVN: r10434 - in trunk/hornetq-rest: examples/dup-send and 5 other directories.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2011-03-31 10:30:13 -0400 (Thu, 31 Mar 2011)
New Revision: 10434
Modified:
trunk/hornetq-rest/examples/dup-send/pom.xml
trunk/hornetq-rest/examples/javascript-chat/pom.xml
trunk/hornetq-rest/examples/jms-to-rest/pom.xml
trunk/hornetq-rest/examples/jms-to-rest/src/main/java/JmsHelper.java
trunk/hornetq-rest/examples/push/pom.xml
trunk/hornetq-rest/examples/push/src/main/java/JmsHelper.java
trunk/hornetq-rest/pom.xml
Log:
fix examples
Modified: trunk/hornetq-rest/examples/dup-send/pom.xml
===================================================================
--- trunk/hornetq-rest/examples/dup-send/pom.xml 2011-03-30 21:52:37 UTC (rev 10433)
+++ trunk/hornetq-rest/examples/dup-send/pom.xml 2011-03-31 14:30:13 UTC (rev 10434)
@@ -1,14 +1,14 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.hornetq.rest</groupId>
+ <artifactId>hornetq-rest-all</artifactId>
+ <version>2.2.2.Final</version>
+ </parent>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>dup-send</artifactId>
- <version>2.2.0.CR1</version>
<packaging>war</packaging>
- <properties>
- <resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.0.CR1</hornetq.version>
- </properties>
<name>Duplicate Send Demo</name>
<repositories>
<repository>
@@ -103,42 +103,35 @@
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-core</artifactId>
- <version>${hornetq.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.2.0.Final</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jms</artifactId>
- <version>${hornetq.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.jms</groupId>
<artifactId>jboss-jms-api_1.1_spec</artifactId>
- <version>1.0.0.Beta1</version>
</dependency>
<dependency>
<groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest</artifactId>
- <version>${hornetq.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
- <version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/hornetq-rest/examples/javascript-chat/pom.xml
===================================================================
--- trunk/hornetq-rest/examples/javascript-chat/pom.xml 2011-03-30 21:52:37 UTC (rev 10433)
+++ trunk/hornetq-rest/examples/javascript-chat/pom.xml 2011-03-31 14:30:13 UTC (rev 10434)
@@ -1,14 +1,14 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.hornetq.rest</groupId>
+ <artifactId>hornetq-rest-all</artifactId>
+ <version>2.2.2.Final</version>
+ </parent>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>javascript-chat</artifactId>
- <version>2.2.0.CR1</version>
<packaging>war</packaging>
- <properties>
- <resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.0.CR1</hornetq.version>
- </properties>
<name>Browser Chat App</name>
<repositories>
<repository>
@@ -117,17 +117,14 @@
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-core</artifactId>
- <version>${hornetq.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.2.0.Final</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jms</artifactId>
- <version>${hornetq.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.jms</groupId>
Modified: trunk/hornetq-rest/examples/jms-to-rest/pom.xml
===================================================================
--- trunk/hornetq-rest/examples/jms-to-rest/pom.xml 2011-03-30 21:52:37 UTC (rev 10433)
+++ trunk/hornetq-rest/examples/jms-to-rest/pom.xml 2011-03-31 14:30:13 UTC (rev 10434)
@@ -1,14 +1,14 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.hornetq.rest</groupId>
+ <artifactId>hornetq-rest-all</artifactId>
+ <version>2.2.2.Final</version>
+ </parent>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>mixed-jms-rest</artifactId>
- <version>2.2.0.CR1</version>
<packaging>war</packaging>
- <properties>
- <resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.0.CR1</hornetq.version>
- </properties>
<name>Mixed JMS and REST Producers/Consumers</name>
<repositories>
<repository>
@@ -103,42 +103,35 @@
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-core</artifactId>
- <version>${hornetq.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.2.0.Final</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jms</artifactId>
- <version>${hornetq.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.jms</groupId>
<artifactId>jboss-jms-api_1.1_spec</artifactId>
- <version>1.0.0.Beta1</version>
</dependency>
<dependency>
<groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest</artifactId>
- <version>${hornetq.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
- <version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/hornetq-rest/examples/jms-to-rest/src/main/java/JmsHelper.java
===================================================================
--- trunk/hornetq-rest/examples/jms-to-rest/src/main/java/JmsHelper.java 2011-03-30 21:52:37 UTC (rev 10433)
+++ trunk/hornetq-rest/examples/jms-to-rest/src/main/java/JmsHelper.java 2011-03-31 14:30:13 UTC (rev 10434)
@@ -1,9 +1,11 @@
import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClientSessionFactory;
import org.hornetq.api.core.client.HornetQClient;
+import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.impl.FileConfiguration;
import org.hornetq.jms.client.HornetQConnectionFactory;
import org.hornetq.jms.client.HornetQDestination;
+import org.hornetq.jms.client.HornetQJMSConnectionFactory;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
@@ -20,8 +22,7 @@
config.setConfigurationUrl(configFile);
config.start();
TransportConfiguration transport = config.getConnectorConfigurations().get("netty-connector");
- ClientSessionFactory factory = HornetQClient.createClientSessionFactory(transport);
- return new HornetQConnectionFactory(factory);
+ return new HornetQJMSConnectionFactory(HornetQClient.createServerLocatorWithoutHA(transport));
}
Modified: trunk/hornetq-rest/examples/push/pom.xml
===================================================================
--- trunk/hornetq-rest/examples/push/pom.xml 2011-03-30 21:52:37 UTC (rev 10433)
+++ trunk/hornetq-rest/examples/push/pom.xml 2011-03-31 14:30:13 UTC (rev 10434)
@@ -1,14 +1,14 @@
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.hornetq.rest</groupId>
+ <artifactId>hornetq-rest-all</artifactId>
+ <version>2.2.2.Final</version>
+ </parent>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>push</artifactId>
- <version>2.2.0.CR1</version>
<packaging>war</packaging>
- <properties>
- <resteasy.version>2.0.1.GA</resteasy.version>
- <hornetq.version>2.2.0.CR1</hornetq.version>
- </properties>
<name>Push Subscriptions</name>
<repositories>
<repository>
@@ -109,7 +109,6 @@
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-core</artifactId>
- <version>${hornetq.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.netty</groupId>
@@ -119,32 +118,27 @@
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jms</artifactId>
- <version>${hornetq.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.jms</groupId>
<artifactId>jboss-jms-api_1.1_spec</artifactId>
- <version>1.0.0.Beta1</version>
</dependency>
<dependency>
<groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest</artifactId>
- <version>${hornetq.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
- <version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
- <version>${resteasy.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: trunk/hornetq-rest/examples/push/src/main/java/JmsHelper.java
===================================================================
--- trunk/hornetq-rest/examples/push/src/main/java/JmsHelper.java 2011-03-30 21:52:37 UTC (rev 10433)
+++ trunk/hornetq-rest/examples/push/src/main/java/JmsHelper.java 2011-03-31 14:30:13 UTC (rev 10434)
@@ -4,6 +4,7 @@
import org.hornetq.core.config.impl.FileConfiguration;
import org.hornetq.jms.client.HornetQConnectionFactory;
import org.hornetq.jms.client.HornetQDestination;
+import org.hornetq.jms.client.HornetQJMSConnectionFactory;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
@@ -20,9 +21,7 @@
config.setConfigurationUrl(configFile);
config.start();
TransportConfiguration transport = config.getConnectorConfigurations().get("netty-connector");
- ClientSessionFactory factory = HornetQClient.createClientSessionFactory(transport);
- return new HornetQConnectionFactory(factory);
+ return new HornetQJMSConnectionFactory(HornetQClient.createServerLocatorWithoutHA(transport));
}
-
}
Modified: trunk/hornetq-rest/pom.xml
===================================================================
--- trunk/hornetq-rest/pom.xml 2011-03-30 21:52:37 UTC (rev 10433)
+++ trunk/hornetq-rest/pom.xml 2011-03-31 14:30:13 UTC (rev 10434)
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.2.0.Final</version>
+ <version>3.2.3.Final</version>
</dependency>
<dependency>
<groupId>junit</groupId>
13 years
JBoss hornetq SVN: r10433 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-30 17:52:37 -0400 (Wed, 30 Mar 2011)
New Revision: 10433
Added:
tags/HornetQ_2_2_2_Final/
Removed:
tags/HornetQ_2_2_2_Final_pending/
Log:
Final tag
13 years
JBoss hornetq SVN: r10432 - tags.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-30 17:52:00 -0400 (Wed, 30 Mar 2011)
New Revision: 10432
Added:
tags/HornetQ_2_2_2_Final_pending/
Removed:
tags/hornetq_2_2_2_Final_pending/
Log:
Final tag
13 years
JBoss hornetq SVN: r10431 - branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-03-30 14:56:22 -0400 (Wed, 30 Mar 2011)
New Revision: 10431
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
Log:
removing invalid log
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2011-03-30 18:53:13 UTC (rev 10430)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2011-03-30 18:56:22 UTC (rev 10431)
@@ -250,8 +250,6 @@
public void onMessage(final ClientMessage message)
{
- HornetQMessageHandler.log.info("onMessage(" + message + ")");
-
if (HornetQMessageHandler.trace)
{
HornetQMessageHandler.log.trace("onMessage(" + message + ")");
13 years
JBoss hornetq SVN: r10430 - tags.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-03-30 14:53:13 -0400 (Wed, 30 Mar 2011)
New Revision: 10430
Added:
tags/hornetq_2_2_2_Final_pending/
Log:
created pending tag for hornetq 2.2.2.Final
13 years
JBoss hornetq SVN: r10429 - tags.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-03-30 14:51:39 -0400 (Wed, 30 Mar 2011)
New Revision: 10429
Removed:
tags/hornetq_2_2_2_Final_pending/
Log:
removing pending branch
13 years
JBoss hornetq SVN: r10428 - trunk/src/main/org/hornetq/ra/inflow.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2011-03-30 14:50:28 -0400 (Wed, 30 Mar 2011)
New Revision: 10428
Modified:
trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
Log:
remove log message
Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2011-03-30 18:28:16 UTC (rev 10427)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2011-03-30 18:50:28 UTC (rev 10428)
@@ -250,8 +250,6 @@
public void onMessage(final ClientMessage message)
{
- HornetQMessageHandler.log.info("onMessage(" + message + ")");
-
if (HornetQMessageHandler.trace)
{
HornetQMessageHandler.log.trace("onMessage(" + message + ")");
13 years