[jboss-cvs] JBossAS SVN: r112286 - in tags/JBPAPP_5_1_2_ER2/hornetq-int: src/main/java/org/jboss/as/integration/hornetq and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 4 10:34:29 EDT 2011
Author: mbenitez
Date: 2011-10-04 10:34:29 -0400 (Tue, 04 Oct 2011)
New Revision: 112286
Added:
tags/JBPAPP_5_1_2_ER2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/
tags/JBPAPP_5_1_2_ER2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java
Removed:
tags/JBPAPP_5_1_2_ER2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java
Modified:
tags/JBPAPP_5_1_2_ER2/hornetq-int/build.xml
tags/JBPAPP_5_1_2_ER2/hornetq-int/pom.xml
tags/JBPAPP_5_1_2_ER2/hornetq-int/src/resources/jbossts-properties.xml
Log:
Merge from JBPAPP_5_1 Branch r112285 https://issues.jboss.org/browse/JBPAPP-5080 - added HornetQ recovery API for tm recovery API
Modified: tags/JBPAPP_5_1_2_ER2/hornetq-int/build.xml
===================================================================
--- tags/JBPAPP_5_1_2_ER2/hornetq-int/build.xml 2011-10-04 13:34:32 UTC (rev 112285)
+++ tags/JBPAPP_5_1_2_ER2/hornetq-int/build.xml 2011-10-04 14:34:29 UTC (rev 112286)
@@ -93,7 +93,7 @@
<path refid="jboss.profileservice.spi.classpath"/>
<path refid="jboss.jboss.vfs.classpath"/>
<path refid="jboss.jboss.mdr.classpath"/>
-
+ <path refid="jboss.integration.classpath"/>
<path refid="jboss.server.classpath"/>
</path>
Modified: tags/JBPAPP_5_1_2_ER2/hornetq-int/pom.xml
===================================================================
--- tags/JBPAPP_5_1_2_ER2/hornetq-int/pom.xml 2011-10-04 13:34:32 UTC (rev 112285)
+++ tags/JBPAPP_5_1_2_ER2/hornetq-int/pom.xml 2011-10-04 14:34:29 UTC (rev 112286)
@@ -91,6 +91,10 @@
</dependency>
+ <dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.metadata</groupId>
<artifactId>jboss-metadata-client</artifactId>
Deleted: tags/JBPAPP_5_1_2_ER2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java
===================================================================
--- branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java 2011-10-04 13:34:32 UTC (rev 112285)
+++ tags/JBPAPP_5_1_2_ER2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java 2011-10-04 14:34:29 UTC (rev 112286)
@@ -1,59 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2010, Red Hat, Inc., and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.as.integration.hornetq.recovery;
-
-import org.jboss.tm.XAResourceRecoveryRegistry;
-import org.hornetq.jms.server.recovery.HornetQResourceRecovery;
-import org.hornetq.jms.server.recovery.RecoveryRegistry;
-import org.hornetq.jms.server.recovery.XARecoveryConfig;
-
-
-/**
- * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
- * 9/19/11
- */
-public class AS5RecoveryRegistry implements RecoveryRegistry
-{
- static volatile XAResourceRecoveryRegistry registry;
-
-
- public AS5RecoveryRegistry()
- {
- super();
- }
-
- public AS5RecoveryRegistry(XAResourceRecoveryRegistry registry)
- {
- AS5RecoveryRegistry.registry = registry;
- }
-
- public void register(HornetQResourceRecovery resourceRecovery)
- {
- registry.addXAResourceRecovery(resourceRecovery);
- }
-
- public void unRegister(HornetQResourceRecovery resourceRecovery)
- {
- registry.removeXAResourceRecovery(resourceRecovery);
- }
-
-}
Copied: tags/JBPAPP_5_1_2_ER2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java (from rev 112285, branches/JBPAPP_5_1/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java)
===================================================================
--- tags/JBPAPP_5_1_2_ER2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java (rev 0)
+++ tags/JBPAPP_5_1_2_ER2/hornetq-int/src/main/java/org/jboss/as/integration/hornetq/recovery/AS5RecoveryRegistry.java 2011-10-04 14:34:29 UTC (rev 112286)
@@ -0,0 +1,59 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2010, Red Hat, Inc., and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.as.integration.hornetq.recovery;
+
+import org.jboss.tm.XAResourceRecoveryRegistry;
+import org.hornetq.jms.server.recovery.HornetQResourceRecovery;
+import org.hornetq.jms.server.recovery.RecoveryRegistry;
+import org.hornetq.jms.server.recovery.XARecoveryConfig;
+
+
+/**
+ * @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
+ * 9/19/11
+ */
+public class AS5RecoveryRegistry implements RecoveryRegistry
+{
+ static volatile XAResourceRecoveryRegistry registry;
+
+
+ public AS5RecoveryRegistry()
+ {
+ super();
+ }
+
+ public AS5RecoveryRegistry(XAResourceRecoveryRegistry registry)
+ {
+ AS5RecoveryRegistry.registry = registry;
+ }
+
+ public void register(HornetQResourceRecovery resourceRecovery)
+ {
+ registry.addXAResourceRecovery(resourceRecovery);
+ }
+
+ public void unRegister(HornetQResourceRecovery resourceRecovery)
+ {
+ registry.removeXAResourceRecovery(resourceRecovery);
+ }
+
+}
Modified: tags/JBPAPP_5_1_2_ER2/hornetq-int/src/resources/jbossts-properties.xml
===================================================================
--- tags/JBPAPP_5_1_2_ER2/hornetq-int/src/resources/jbossts-properties.xml 2011-10-04 13:34:32 UTC (rev 112285)
+++ tags/JBPAPP_5_1_2_ER2/hornetq-int/src/resources/jbossts-properties.xml 2011-10-04 14:34:29 UTC (rev 112286)
@@ -239,8 +239,9 @@
<!--
com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple
-->
- <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
- value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/>
+ <!--HornetQ recovery is now done automatically via the Resource Adapter configuration, however its still possible to add it here if need be-->
+ <!--<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1"
+ value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"/>-->
<!--
<property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ2"
value="org.hornetq.jms.server.recovery.HornetQXAResourceRecovery;org.hornetq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445"/>-->
More information about the jboss-cvs-commits
mailing list