[jboss-cvs] JBossAS SVN: r112224 - in tags/JBPAPP_5_1_2_ER1: build and 35 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 12 10:13:32 EDT 2011
Author: mbenitez
Date: 2011-09-12 10:13:30 -0400 (Mon, 12 Sep 2011)
New Revision: 112224
Modified:
tags/JBPAPP_5_1_2_ER1/
tags/JBPAPP_5_1_2_ER1/.gitignore
tags/JBPAPP_5_1_2_ER1/build/jbossas-5-jbm-xa-recovery.patch
tags/JBPAPP_5_1_2_ER1/cluster/src/etc/hapartition-jboss-beans.xml
tags/JBPAPP_5_1_2_ER1/cluster/src/main/org/jboss/ha/framework/server/lock/AbstractClusterLockSupport.java
tags/JBPAPP_5_1_2_ER1/cluster/src/main/org/jboss/ha/framework/server/lock/ClusterLockState.java
tags/JBPAPP_5_1_2_ER1/cluster/src/main/org/jboss/ha/framework/server/lock/NonGloballyExclusiveClusterLockSupport.java
tags/JBPAPP_5_1_2_ER1/cluster/src/main/org/jboss/ha/framework/server/lock/YieldingGloballyExclusiveClusterLockSupport.java
tags/JBPAPP_5_1_2_ER1/connector/src/main/org/jboss/resource/connectionmanager/xa/XAResourceWrapperImpl.java
tags/JBPAPP_5_1_2_ER1/connector/src/main/org/jboss/resource/connectionmanager/xa/XidWrapperImpl.java
tags/JBPAPP_5_1_2_ER1/main/src/bin/run.conf.bat
tags/JBPAPP_5_1_2_ER1/main/src/bin/run.sh
tags/JBPAPP_5_1_2_ER1/messaging/src/main/org/jboss/jms/server/destination/QueueMODefinition.java
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/aop.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/classloader.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/deployers.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/jmx.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/logging.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/vfs.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/java.policy
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/jax-ws-catalog.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/jboss-log4j.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/jboss-service.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/login-config.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/props/
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/standardjboss.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/standardjbosscmp-jdbc.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/xmdesc/
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/minimal/bootstrap.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/minimal/jboss-service.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/deploy/legacy-invokers-service.xml
tags/JBPAPP_5_1_2_ER1/server/src/etc/deployers/logbridge-jboss-beans.xml
tags/JBPAPP_5_1_2_ER1/server/src/main/org/jboss/deployment/FileNameVirtualFileFilter.java
tags/JBPAPP_5_1_2_ER1/system/src/main/org/jboss/system/server/profileservice/repository/AbstractBootstrapProfileFactory.java
tags/JBPAPP_5_1_2_ER1/system/src/resources/parsing-tests/common/profiles/clustering.profile
tags/JBPAPP_5_1_2_ER1/system/src/resources/parsing-tests/common/profiles/ejb3.profile
tags/JBPAPP_5_1_2_ER1/system/src/resources/parsing-tests/common/profiles/jboss-web.profile
tags/JBPAPP_5_1_2_ER1/system/src/resources/parsing-tests/config/profiles/default.profile
tags/JBPAPP_5_1_2_ER1/system/src/resources/parsing-tests/config/profiles/seam.profile
tags/JBPAPP_5_1_2_ER1/system/src/tests/org/jboss/test/server/profileservice/support/MavenProfileMetaData.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb2/
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb3/
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/sar/
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/servlet/
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/test/
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/classloader/leak/test/Ejb3ClassloaderLeakTestBase.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/classloader/leak/test/IsolatedEarWithDualCommonsLoggingClassloaderLeakTestCase.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/classloader/leak/test/J2EEClassloaderLeakTestBase.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakTestBase.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/J2EEClassloaderLeakTestBase.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/YieldingGloballyExclusiveClusterLockSupportUnitTestCase.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/cluster/web/notification/SessionSpecListenerAttribute.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/ejb3/common/AbstractReplierMDB.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/ejb3/common/EJB3TestCase.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/TransactionMDB.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/unit/
tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/spring/test/SpringFacadeTestCase.java
tags/JBPAPP_5_1_2_ER1/testsuite/src/resources/bootstrapdependencies/jbas5349/
tags/JBPAPP_5_1_2_ER1/tools/buildmagic/lib/
tags/JBPAPP_5_1_2_ER1/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java
tags/JBPAPP_5_1_2_ER1/varia/src/main/org/jboss/services/binding/managed/ServiceBindingMapper.java
tags/JBPAPP_5_1_2_ER1/varia/src/resources/seam/jboss-structure.xml
Log:
Merge jbossas-5-jbm-xa-recovery.patch from JBPAPP_5_1 branch
Property changes on: tags/JBPAPP_5_1_2_ER1
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/JBPAPP_5_1:112222
Property changes on: tags/JBPAPP_5_1_2_ER1/.gitignore
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: tags/JBPAPP_5_1_2_ER1/build/jbossas-5-jbm-xa-recovery.patch
===================================================================
--- tags/JBPAPP_5_1_2_ER1/build/jbossas-5-jbm-xa-recovery.patch 2011-09-12 02:30:39 UTC (rev 112223)
+++ tags/JBPAPP_5_1_2_ER1/build/jbossas-5-jbm-xa-recovery.patch 2011-09-12 14:13:30 UTC (rev 112224)
@@ -6,6 +6,6 @@
-->
+ <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.JBMESSAGING1"
+ value="org.jboss.jms.server.recovery.MessagingXAResourceRecovery;java:/DefaultJMSProvider"/>
+ <!-- for most configurations xaRecoveryNode should match the nodeIdentifier, which should be uniq between server instances -->
+ <!-- property name="com.arjuna.ats.jta.xaRecoveryNode" value="CHANGE_ME" -->
</properties>
- <properties depends="arjuna,txoj,jta" name="recoverymanager">
- <!--
Property changes on: tags/JBPAPP_5_1_2_ER1/cluster/src/etc/hapartition-jboss-beans.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/cluster/src/main/org/jboss/ha/framework/server/lock/AbstractClusterLockSupport.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/cluster/src/main/org/jboss/ha/framework/server/lock/ClusterLockState.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/cluster/src/main/org/jboss/ha/framework/server/lock/NonGloballyExclusiveClusterLockSupport.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/cluster/src/main/org/jboss/ha/framework/server/lock/YieldingGloballyExclusiveClusterLockSupport.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/connector/src/main/org/jboss/resource/connectionmanager/xa/XAResourceWrapperImpl.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/connector/src/main/org/jboss/resource/connectionmanager/xa/XidWrapperImpl.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/main/src/bin/run.conf.bat
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/main/src/bin/run.sh
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.sh:108548
+ /branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.sh:108548
/branches/JBPAPP_5_1/main/src/bin/run.sh:112222
Property changes on: tags/JBPAPP_5_1_2_ER1/messaging/src/main/org/jboss/jms/server/destination/QueueMODefinition.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/aop.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/classloader.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/deployers.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/jmx.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/logging.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap/vfs.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/bootstrap.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/java.policy
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/jax-ws-catalog.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/jboss-log4j.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/jboss-service.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/login-config.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/props
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/standardjboss.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/standardjbosscmp-jdbc.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/xmdesc
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/minimal/bootstrap.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/conf/minimal/jboss-service.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/deploy/legacy-invokers-service.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/etc/deployers/logbridge-jboss-beans.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/server/src/main/org/jboss/deployment/FileNameVirtualFileFilter.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/system/src/main/org/jboss/system/server/profileservice/repository/AbstractBootstrapProfileFactory.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/system/src/resources/parsing-tests/common/profiles/clustering.profile
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/system/src/resources/parsing-tests/common/profiles/ejb3.profile
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/system/src/resources/parsing-tests/common/profiles/jboss-web.profile
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/system/src/resources/parsing-tests/config/profiles/default.profile
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/system/src/resources/parsing-tests/config/profiles/seam.profile
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/system/src/tests/org/jboss/test/server/profileservice/support/MavenProfileMetaData.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb2
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb3
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/sar
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/servlet
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/test
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/classloader/leak/test/Ejb3ClassloaderLeakTestBase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/classloader/leak/test/IsolatedEarWithDualCommonsLoggingClassloaderLeakTestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/classloader/leak/test/J2EEClassloaderLeakTestBase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakTestBase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/J2EEClassloaderLeakTestBase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/YieldingGloballyExclusiveClusterLockSupportUnitTestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/cluster/web/notification/SessionSpecListenerAttribute.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/ejb3/common/AbstractReplierMDB.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/ejb3/common/EJB3TestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/TransactionMDB.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/unit
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/main/org/jboss/test/spring/test/SpringFacadeTestCase.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/testsuite/src/resources/bootstrapdependencies/jbas5349
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/tools/buildmagic/lib
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/varia/src/main/org/jboss/services/binding/managed/ServiceBindingMapper.java
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: tags/JBPAPP_5_1_2_ER1/varia/src/resources/seam/jboss-structure.xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
More information about the jboss-cvs-commits
mailing list