[jboss-svn-commits] JBL Code SVN: r37360 - in labs/jbosstm/trunk: ArjunaJTA/narayana-jta and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Aug 4 11:36:15 EDT 2011
Author: tomjenkinson
Date: 2011-08-04 11:36:14 -0400 (Thu, 04 Aug 2011)
New Revision: 37360
Added:
labs/jbosstm/trunk/ArjunaJTA/narayana-jta/src/
labs/jbosstm/trunk/ArjunaJTA/narayana-jta/src/main/
labs/jbosstm/trunk/ArjunaJTA/narayana-jta/src/main/resources/
labs/jbosstm/trunk/ArjunaJTA/narayana-jta/src/main/resources/jbossts-properties.xml
labs/jbosstm/trunk/ArjunaJTS/narayana-jts/src/
labs/jbosstm/trunk/ArjunaJTS/narayana-jts/src/main/
labs/jbosstm/trunk/ArjunaJTS/narayana-jts/src/main/resources/
labs/jbosstm/trunk/ArjunaJTS/narayana-jts/src/main/resources/jbossts-properties.xml
Removed:
labs/jbosstm/trunk/ArjunaJTA/jbossts-properties-arjunajta.xml
labs/jbosstm/trunk/ArjunaJTS/jbossts-properties-arjunajts.xml
Modified:
labs/jbosstm/trunk/ArjunaJTA/quickstarts/maven/pom.xml
labs/jbosstm/trunk/dist/src/main/assembly/bin.xml
labs/jbosstm/trunk/qa/run-tests.xml
Log:
moved the jbossts-properties.xml so it is inside the uber jar
Deleted: labs/jbosstm/trunk/ArjunaJTA/jbossts-properties-arjunajta.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jbossts-properties-arjunajta.xml 2011-08-04 14:47:49 UTC (rev 37359)
+++ labs/jbosstm/trunk/ArjunaJTA/jbossts-properties-arjunajta.xml 2011-08-04 15:36:14 UTC (rev 37360)
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2009, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
- See the copyright.txt in the distribution for a
- full listing of individual contributors.
- This copyrighted material is made available to anyone wishing to use,
- modify, copy, or redistribute it subject to the terms and conditions
- of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- 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,
- v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
- (C) 2009,
- @author JBoss, a division of Red Hat.
--->
-<properties>
- <!--
- This is the JBossTS configuration file for running ArjunaJTA.
- It should be called jbossts-properties.xml.
- You need a different version for ArjunaCore or JTS usage.
-
- ***************************
-
- Property values may be literals or be tokens of the form ${p1[,p2][:v]}
- in which case the token values are substituted for the values of the corresponding system
- properties as follows:
-
- - Any occurance of ${p} with the System.getProperty(p) value.
- If there is no such property p defined, then the ${p} reference will remain unchanged.
-
- - If the property reference is of the form ${p:v} and there is no such property p,
- then the default value v will be returned.
-
- - If the property reference is of the form ${p1,p2} or ${p1,p2:v} then
- the primary and the secondary properties will be tried in turn, before
- returning either the unchanged input, or the default value.
-
- The property ${/} is replaced with System.getProperty("file.separator")
- value and the property ${:} is replaced with System.getProperty("path.separator").
-
- Note this substitution applies to property values only at the point they are read from
- the config file. Tokens in system properties won't be substituted.
- -->
-
- <!-- (default is YES) -->
- <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry>
-
- <!-- default is under user.home - must be writeable!) -->
- <entry key="ObjectStoreEnvironmentBean.objectStoreDir">PutObjectStoreDirHere</entry>
-
- <!-- (default is ON) -->
- <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry>
-
- <!-- (Must be unique across all Arjuna instances.) -->
- <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry>
-
- <!-- Which Xid types to recover -->
- <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry>
-
- <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames">
- com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter
- com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter
- </entry>
-
- <!--
- Base port number for determining a unique number to associate with an instance of the transaction service
- (which is needed in order to support multiple instances on the same machine).
- Use the value 0 to allow the system to select the first available port number.
- If the port number is non-zero and the port is in use then the value will be incremented until either a successful binding
- to the loopback address is created or until the the maximum number of ports (specified by the
- CoreEnvironmentBean.socketProcessIdMaxPorts property) have been tried or until the port number
- reaches the maximum possible port number.
- -->
- <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry>
-
-
-
- <!--
- Periodic recovery modules to use. Invoked in the order they appear in the list.
- Check http://www.jboss.org/community/docs/DOC-10788 for more information
- on recovery modules and their configuration when running in various
- deployments.
- -->
- <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames">
- com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule
- com.arjuna.ats.internal.txoj.recovery.TORecoveryModule
- com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule
- </entry>
-
- <!-- Expiry scanners to use (order of invocation is random). -->
- <entry key="RecoveryEnvironmentBean.expiryScannerClassNames">
- com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner
- </entry>
-
- <!--
- Add the following to the set of expiryScannerClassNames above to move logs that cannot be completed by failure recovery.
- But be sure you know what you are doing and why!
- com.arjuna.ats.internal.arjuna.recovery.AtomicActionExpiryScanner
- -->
-
- <!--
- The address and port number on which the recovery manager listens
- If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
- -->
- <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry>
-
- <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry>
-
- <!--
- Use this to fix the port on which the TransactionStatusManager listens,
- The default behaviour is to use any free port.
- -->
- <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry>
-
- <!--
- Use this to fix the address on which the TransactionStatusManager binds,
- The default behaviour is to use the loopback address (ie localhost).
- If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
- -->
- <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry>
-
- <!--
- For cases where the recovery manager is in process with the transaction manager and nothing else uses
- the ObjectStore, it is possible to disable the socket based recovery listener by setting this to NO.
- Caution: use of this property can allow multiple recovery processes to run on the same ObjectStore
- if you are not careful. That in turn can lead to incorrect transaction processing. Use with care.
- -->
- <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry>
-
-</properties>
Copied: labs/jbosstm/trunk/ArjunaJTA/narayana-jta/src/main/resources/jbossts-properties.xml (from rev 37341, labs/jbosstm/trunk/ArjunaJTA/jbossts-properties-arjunajta.xml)
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/narayana-jta/src/main/resources/jbossts-properties.xml (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTA/narayana-jta/src/main/resources/jbossts-properties.xml 2011-08-04 15:36:14 UTC (rev 37360)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ 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,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ (C) 2009,
+ @author JBoss, a division of Red Hat.
+-->
+<properties>
+ <!--
+ This is the JBossTS configuration file for running ArjunaJTA.
+ It should be called jbossts-properties.xml.
+ You need a different version for ArjunaCore or JTS usage.
+
+ ***************************
+
+ Property values may be literals or be tokens of the form ${p1[,p2][:v]}
+ in which case the token values are substituted for the values of the corresponding system
+ properties as follows:
+
+ - Any occurance of ${p} with the System.getProperty(p) value.
+ If there is no such property p defined, then the ${p} reference will remain unchanged.
+
+ - If the property reference is of the form ${p:v} and there is no such property p,
+ then the default value v will be returned.
+
+ - If the property reference is of the form ${p1,p2} or ${p1,p2:v} then
+ the primary and the secondary properties will be tried in turn, before
+ returning either the unchanged input, or the default value.
+
+ The property ${/} is replaced with System.getProperty("file.separator")
+ value and the property ${:} is replaced with System.getProperty("path.separator").
+
+ Note this substitution applies to property values only at the point they are read from
+ the config file. Tokens in system properties won't be substituted.
+ -->
+
+ <!-- (default is YES) -->
+ <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry>
+
+ <!-- default is under user.home - must be writeable!) -->
+ <entry key="ObjectStoreEnvironmentBean.objectStoreDir">PutObjectStoreDirHere</entry>
+
+ <!-- (default is ON) -->
+ <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry>
+
+ <!-- (Must be unique across all Arjuna instances.) -->
+ <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry>
+
+ <!-- Which Xid types to recover -->
+ <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry>
+
+ <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames">
+ com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter
+ com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter
+ </entry>
+
+ <!--
+ Base port number for determining a unique number to associate with an instance of the transaction service
+ (which is needed in order to support multiple instances on the same machine).
+ Use the value 0 to allow the system to select the first available port number.
+ If the port number is non-zero and the port is in use then the value will be incremented until either a successful binding
+ to the loopback address is created or until the the maximum number of ports (specified by the
+ CoreEnvironmentBean.socketProcessIdMaxPorts property) have been tried or until the port number
+ reaches the maximum possible port number.
+ -->
+ <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry>
+
+
+
+ <!--
+ Periodic recovery modules to use. Invoked in the order they appear in the list.
+ Check http://www.jboss.org/community/docs/DOC-10788 for more information
+ on recovery modules and their configuration when running in various
+ deployments.
+ -->
+ <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames">
+ com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule
+ com.arjuna.ats.internal.txoj.recovery.TORecoveryModule
+ com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule
+ </entry>
+
+ <!-- Expiry scanners to use (order of invocation is random). -->
+ <entry key="RecoveryEnvironmentBean.expiryScannerClassNames">
+ com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner
+ </entry>
+
+ <!--
+ Add the following to the set of expiryScannerClassNames above to move logs that cannot be completed by failure recovery.
+ But be sure you know what you are doing and why!
+ com.arjuna.ats.internal.arjuna.recovery.AtomicActionExpiryScanner
+ -->
+
+ <!--
+ The address and port number on which the recovery manager listens
+ If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
+ -->
+ <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry>
+
+ <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry>
+
+ <!--
+ Use this to fix the port on which the TransactionStatusManager listens,
+ The default behaviour is to use any free port.
+ -->
+ <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry>
+
+ <!--
+ Use this to fix the address on which the TransactionStatusManager binds,
+ The default behaviour is to use the loopback address (ie localhost).
+ If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
+ -->
+ <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry>
+
+ <!--
+ For cases where the recovery manager is in process with the transaction manager and nothing else uses
+ the ObjectStore, it is possible to disable the socket based recovery listener by setting this to NO.
+ Caution: use of this property can allow multiple recovery processes to run on the same ObjectStore
+ if you are not careful. That in turn can lead to incorrect transaction processing. Use with care.
+ -->
+ <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry>
+
+</properties>
Modified: labs/jbosstm/trunk/ArjunaJTA/quickstarts/maven/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/quickstarts/maven/pom.xml 2011-08-04 14:47:49 UTC (rev 37359)
+++ labs/jbosstm/trunk/ArjunaJTA/quickstarts/maven/pom.xml 2011-08-04 15:36:14 UTC (rev 37360)
@@ -12,23 +12,41 @@
along with this distribution; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -->
<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">
- <parent>
- <groupId>org.jboss.narayana.jta.quickstarts</groupId>
- <artifactId>quickstarts</artifactId>
- <version>5.0.0.M1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
<modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.narayana.jta.quickstarts</groupId>
<artifactId>maven</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>basic maven example</name>
<description>basic maven example</description>
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
<build>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<!-- This plugin allows our example to be tested -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.7.2</version>
<configuration>
<workingDirectory>${project.build.directory}/surefire-working-directory</workingDirectory>
</configuration>
@@ -37,6 +55,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<goals>
@@ -58,6 +77,11 @@
</build>
<dependencies>
<dependency>
+ <groupId>org.jboss.narayana.jta</groupId>
+ <artifactId>narayana-jta</artifactId>
+ <version>5.0.0.M1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
Deleted: labs/jbosstm/trunk/ArjunaJTS/jbossts-properties-arjunajts.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jbossts-properties-arjunajts.xml 2011-08-04 14:47:49 UTC (rev 37359)
+++ labs/jbosstm/trunk/ArjunaJTS/jbossts-properties-arjunajts.xml 2011-08-04 15:36:14 UTC (rev 37360)
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<!--
- JBoss, Home of Professional Open Source
- Copyright 2009, Red Hat Middleware LLC, and individual contributors
- as indicated by the @author tags.
- See the copyright.txt in the distribution for a
- full listing of individual contributors.
- This copyrighted material is made available to anyone wishing to use,
- modify, copy, or redistribute it subject to the terms and conditions
- of the GNU Lesser General Public License, v. 2.1.
- This program is distributed in the hope that it will be useful, but WITHOUT A
- 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,
- v.2.1 along with this distribution; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
- (C) 2009,
- @author JBoss, a division of Red Hat.
--->
-<properties>
- <!--
- This is the JBossTS configuration file for running ArjunaJTS.
- It should be called jbossts-properties.xml.
- You need a different version for ArjunaCore or JTA usage.
-
- ***************************
-
- Property values may be literals or be tokens of the form ${p1[,p2][:v]}
- in which case the token values are substituted for the values of the corresponding system
- properties as follows:
-
- - Any occurance of ${p} with the System.getProperty(p) value.
- If there is no such property p defined, then the ${p} reference will remain unchanged.
-
- - If the property reference is of the form ${p:v} and there is no such property p,
- then the default value v will be returned.
-
- - If the property reference is of the form ${p1,p2} or ${p1,p2:v} then
- the primary and the secondary properties will be tried in turn, before
- returning either the unchanged input, or the default value.
-
- The property ${/} is replaced with System.getProperty("file.separator")
- value and the property ${:} is replaced with System.getProperty("path.separator").
-
- Note this substitution applies to property values only at the point they are read from
- the config file. Tokens in system properties won't be substituted.
- -->
-
- <!-- (default is YES) -->
- <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry>
-
- <!-- default is under user.home - must be writeable!) -->
- <entry key="ObjectStoreEnvironmentBean.objectStoreDir">PutObjectStoreDirHere</entry>
-
- <!-- (default is ON) -->
- <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry>
-
- <!-- (Must be unique across all Arjuna instances.) -->
- <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry>
-
- <!-- Which Xid types to recover -->
- <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry>
-
- <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames">
- com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter
- com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter
- </entry>
-
- <!--
- Base port number for determining a unique number to associate with an instance of the transaction service
- (which is needed in order to support multiple instances on the same machine).
- Use the value 0 to allow the system to select the first available port number.
- If the port number is non-zero and the port is in use then the value will be incremented until either a successful binding
- to the loopback address is created or until the the maximum number of ports (specified by the
- CoreEnvironmentBean.socketProcessIdMaxPorts property) have been tried or until the port number
- reaches the maximum possible port number.
- -->
- <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry>
-
-
-
- <!--
- Periodic recovery modules to use. Invoked in the order they appear in the list.
- Check http://www.jboss.org/community/docs/DOC-10788 for more information
- on recovery modules and their configuration when running in various
- deployments.
- -->
- <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames">
- com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule
- com.arjuna.ats.internal.txoj.recovery.TORecoveryModule
- com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule
- com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule
- com.arjuna.ats.internal.jta.recovery.jts.XARecoveryModule
- </entry>
-
- <!-- Expiry scanners to use (order of invocation is random). -->
- <entry key="RecoveryEnvironmentBean.expiryScannerClassNames">
- com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner
- com.arjuna.ats.internal.jts.recovery.contact.ExpiredContactScanner
- com.arjuna.ats.internal.jts.recovery.transactions.ExpiredToplevelScanner
- com.arjuna.ats.internal.jts.recovery.transactions.ExpiredServerScanner
- </entry>
-
- <!--
- Add the following to the set of expiryScannerClassNames above to move logs that cannot be completed by failure recovery.
- But be sure you know what you are doing and why!
- com.arjuna.ats.internal.arjuna.recovery.AtomicActionExpiryScanner
- -->
-
- <!--
- The address and port number on which the recovery manager listens
- If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
- -->
- <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry>
-
- <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry>
-
- <!--
- Use this to fix the port on which the TransactionStatusManager listens,
- The default behaviour is to use any free port.
- -->
- <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry>
-
- <!--
- Use this to fix the address on which the TransactionStatusManager binds,
- The default behaviour is to use the loopback address (ie localhost).
- If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
- -->
- <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry>
-
- <!--
- For cases where the recovery manager is in process with the transaction manager and nothing else uses
- the ObjectStore, it is possible to disable the socket based recovery listener by setting this to NO.
- Caution: use of this property can allow multiple recovery processes to run on the same ObjectStore
- if you are not careful. That in turn can lead to incorrect transaction processing. Use with care.
- -->
- <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry>
-
-
- <!-- Recovery Activators to use. -->
- <entry key="RecoveryEnvironmentBean.recoveryActivatorClassNames">com.arjuna.ats.internal.jts.orbspecific.recovery.RecoveryEnablement</entry>
-
-
- <entry key="JTAEnvironmentBean.transactionManagerClassName">com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple</entry>
-
- <entry key="JTAEnvironmentBean.userTransactionClassName">com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple</entry>
-
- <entry key="JTAEnvironmentBean.transactionSynchronizationRegistryClassName">com.arjuna.ats.internal.jta.transaction.jts.TransactionSynchronizationRegistryImple</entry>
-
-
- <entry key="OrbPortabilityEnvironmentBean.bindMechanism">CONFIGURATION_FILE</entry>
-
- <entry key="OrbPortabilityEnvironmentBean.orbInitializationProperties">
- <!-- This class handles context propagation issues, and should never be commented out or removed. -->
- com.arjuna.orbportability.orb.PreInit1=com.arjuna.ats.internal.jts.context.ContextPropagationManager
- <!-- This property ensures the JTS knows which ORB to use and should never be commented out or removed -->
- com.arjuna.orbportability.orb.PostInit=com.arjuna.ats.jts.utils.ORBSetup
- <!-- This property ensures the crash recovery is initialised correctly and should never be commented out or removed -->
- com.arjuna.orbportability.orb.PostInit2=com.arjuna.ats.internal.jts.recovery.RecoveryInit
- <!-- This property ensures the JTS knows which ORB to use and should never be commented out or removed -->
- com.arjuna.orbportability.orb.PostSet1=com.arjuna.ats.jts.utils.ORBSetup
- </entry>
-
- <!--
- This property controls the port on which the Recovery ORB listens
- -->
- <entry key="JTSEnvironmentBean.recoveryManagerPort">4711</entry>
-
- <!--
- This property controls the address on which the Recovery ORB binds - defaults to the loopback connection
- If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
- -->
- <entry key="JTSEnvironmentBean.recoveryManagerAddress"></entry>
-
-
-</properties>
Copied: labs/jbosstm/trunk/ArjunaJTS/narayana-jts/src/main/resources/jbossts-properties.xml (from rev 37341, labs/jbosstm/trunk/ArjunaJTS/jbossts-properties-arjunajts.xml)
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/narayana-jts/src/main/resources/jbossts-properties.xml (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/narayana-jts/src/main/resources/jbossts-properties.xml 2011-08-04 15:36:14 UTC (rev 37360)
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<!--
+ JBoss, Home of Professional Open Source
+ Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags.
+ See the copyright.txt in the distribution for a
+ full listing of individual contributors.
+ This copyrighted material is made available to anyone wishing to use,
+ modify, copy, or redistribute it subject to the terms and conditions
+ of the GNU Lesser General Public License, v. 2.1.
+ This program is distributed in the hope that it will be useful, but WITHOUT A
+ 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,
+ v.2.1 along with this distribution; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+
+ (C) 2009,
+ @author JBoss, a division of Red Hat.
+-->
+<properties>
+ <!--
+ This is the JBossTS configuration file for running ArjunaJTS.
+ It should be called jbossts-properties.xml.
+ You need a different version for ArjunaCore or JTA usage.
+
+ ***************************
+
+ Property values may be literals or be tokens of the form ${p1[,p2][:v]}
+ in which case the token values are substituted for the values of the corresponding system
+ properties as follows:
+
+ - Any occurance of ${p} with the System.getProperty(p) value.
+ If there is no such property p defined, then the ${p} reference will remain unchanged.
+
+ - If the property reference is of the form ${p:v} and there is no such property p,
+ then the default value v will be returned.
+
+ - If the property reference is of the form ${p1,p2} or ${p1,p2:v} then
+ the primary and the secondary properties will be tried in turn, before
+ returning either the unchanged input, or the default value.
+
+ The property ${/} is replaced with System.getProperty("file.separator")
+ value and the property ${:} is replaced with System.getProperty("path.separator").
+
+ Note this substitution applies to property values only at the point they are read from
+ the config file. Tokens in system properties won't be substituted.
+ -->
+
+ <!-- (default is YES) -->
+ <entry key="CoordinatorEnvironmentBean.commitOnePhase">YES</entry>
+
+ <!-- default is under user.home - must be writeable!) -->
+ <entry key="ObjectStoreEnvironmentBean.objectStoreDir">PutObjectStoreDirHere</entry>
+
+ <!-- (default is ON) -->
+ <entry key="ObjectStoreEnvironmentBean.transactionSync">ON</entry>
+
+ <!-- (Must be unique across all Arjuna instances.) -->
+ <entry key="CoreEnvironmentBean.nodeIdentifier">1</entry>
+
+ <!-- Which Xid types to recover -->
+ <entry key="JTAEnvironmentBean.xaRecoveryNodes">1</entry>
+
+ <entry key="JTAEnvironmentBean.xaResourceOrphanFilterClassNames">
+ com.arjuna.ats.internal.jta.recovery.arjunacore.JTATransactionLogXAResourceOrphanFilter
+ com.arjuna.ats.internal.jta.recovery.arjunacore.JTANodeNameXAResourceOrphanFilter
+ </entry>
+
+ <!--
+ Base port number for determining a unique number to associate with an instance of the transaction service
+ (which is needed in order to support multiple instances on the same machine).
+ Use the value 0 to allow the system to select the first available port number.
+ If the port number is non-zero and the port is in use then the value will be incremented until either a successful binding
+ to the loopback address is created or until the the maximum number of ports (specified by the
+ CoreEnvironmentBean.socketProcessIdMaxPorts property) have been tried or until the port number
+ reaches the maximum possible port number.
+ -->
+ <entry key="CoreEnvironmentBean.socketProcessIdPort">0</entry>
+
+
+
+ <!--
+ Periodic recovery modules to use. Invoked in the order they appear in the list.
+ Check http://www.jboss.org/community/docs/DOC-10788 for more information
+ on recovery modules and their configuration when running in various
+ deployments.
+ -->
+ <entry key="RecoveryEnvironmentBean.recoveryModuleClassNames">
+ com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule
+ com.arjuna.ats.internal.txoj.recovery.TORecoveryModule
+ com.arjuna.ats.internal.jts.recovery.transactions.TopLevelTransactionRecoveryModule
+ com.arjuna.ats.internal.jts.recovery.transactions.ServerTransactionRecoveryModule
+ com.arjuna.ats.internal.jta.recovery.jts.XARecoveryModule
+ </entry>
+
+ <!-- Expiry scanners to use (order of invocation is random). -->
+ <entry key="RecoveryEnvironmentBean.expiryScannerClassNames">
+ com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner
+ com.arjuna.ats.internal.jts.recovery.contact.ExpiredContactScanner
+ com.arjuna.ats.internal.jts.recovery.transactions.ExpiredToplevelScanner
+ com.arjuna.ats.internal.jts.recovery.transactions.ExpiredServerScanner
+ </entry>
+
+ <!--
+ Add the following to the set of expiryScannerClassNames above to move logs that cannot be completed by failure recovery.
+ But be sure you know what you are doing and why!
+ com.arjuna.ats.internal.arjuna.recovery.AtomicActionExpiryScanner
+ -->
+
+ <!--
+ The address and port number on which the recovery manager listens
+ If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
+ -->
+ <entry key="RecoveryEnvironmentBean.recoveryPort">4712</entry>
+
+ <entry key="RecoveryEnvironmentBean.recoveryAddress"></entry>
+
+ <!--
+ Use this to fix the port on which the TransactionStatusManager listens,
+ The default behaviour is to use any free port.
+ -->
+ <entry key="RecoveryEnvironmentBean.transactionStatusManagerPort">0</entry>
+
+ <!--
+ Use this to fix the address on which the TransactionStatusManager binds,
+ The default behaviour is to use the loopback address (ie localhost).
+ If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
+ -->
+ <entry key="RecoveryEnvironmentBean.transactionStatusManagerAddress"></entry>
+
+ <!--
+ For cases where the recovery manager is in process with the transaction manager and nothing else uses
+ the ObjectStore, it is possible to disable the socket based recovery listener by setting this to NO.
+ Caution: use of this property can allow multiple recovery processes to run on the same ObjectStore
+ if you are not careful. That in turn can lead to incorrect transaction processing. Use with care.
+ -->
+ <entry key="RecoveryEnvironmentBean.recoveryListener">YES</entry>
+
+
+ <!-- Recovery Activators to use. -->
+ <entry key="RecoveryEnvironmentBean.recoveryActivatorClassNames">com.arjuna.ats.internal.jts.orbspecific.recovery.RecoveryEnablement</entry>
+
+
+ <entry key="JTAEnvironmentBean.transactionManagerClassName">com.arjuna.ats.internal.jta.transaction.jts.TransactionManagerImple</entry>
+
+ <entry key="JTAEnvironmentBean.userTransactionClassName">com.arjuna.ats.internal.jta.transaction.jts.UserTransactionImple</entry>
+
+ <entry key="JTAEnvironmentBean.transactionSynchronizationRegistryClassName">com.arjuna.ats.internal.jta.transaction.jts.TransactionSynchronizationRegistryImple</entry>
+
+
+ <entry key="OrbPortabilityEnvironmentBean.bindMechanism">CONFIGURATION_FILE</entry>
+
+ <entry key="OrbPortabilityEnvironmentBean.orbInitializationProperties">
+ <!-- This class handles context propagation issues, and should never be commented out or removed. -->
+ com.arjuna.orbportability.orb.PreInit1=com.arjuna.ats.internal.jts.context.ContextPropagationManager
+ <!-- This property ensures the JTS knows which ORB to use and should never be commented out or removed -->
+ com.arjuna.orbportability.orb.PostInit=com.arjuna.ats.jts.utils.ORBSetup
+ <!-- This property ensures the crash recovery is initialised correctly and should never be commented out or removed -->
+ com.arjuna.orbportability.orb.PostInit2=com.arjuna.ats.internal.jts.recovery.RecoveryInit
+ <!-- This property ensures the JTS knows which ORB to use and should never be commented out or removed -->
+ com.arjuna.orbportability.orb.PostSet1=com.arjuna.ats.jts.utils.ORBSetup
+ </entry>
+
+ <!--
+ This property controls the port on which the Recovery ORB listens
+ -->
+ <entry key="JTSEnvironmentBean.recoveryManagerPort">4711</entry>
+
+ <!--
+ This property controls the address on which the Recovery ORB binds - defaults to the loopback connection
+ If running within an AS then the address the AS is bound to (jboss.bind.address) takes precedence
+ -->
+ <entry key="JTSEnvironmentBean.recoveryManagerAddress"></entry>
+
+
+</properties>
Modified: labs/jbosstm/trunk/dist/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/dist/src/main/assembly/bin.xml 2011-08-04 14:47:49 UTC (rev 37359)
+++ labs/jbosstm/trunk/dist/src/main/assembly/bin.xml 2011-08-04 15:36:14 UTC (rev 37360)
@@ -294,13 +294,13 @@
<destName>jts_third_party_licenses.txt</destName>
</file>
<file>
- <source>../ArjunaJTA/jbossts-properties-arjunajta.xml</source>
+ <source>../ArjunaJTA/narayana-jta/src/main/resources/jbossts-properties.xml</source>
<fileMode>0644</fileMode>
<outputDirectory>etc</outputDirectory>
<destName>jbossts-properties.xml.jta</destName>
</file>
<file>
- <source>../ArjunaJTS/jbossts-properties-arjunajts.xml</source>
+ <source>../ArjunaJTS/narayana-jts/src/main/resources/jbossts-properties.xml</source>
<fileMode>0644</fileMode>
<outputDirectory>etc</outputDirectory>
<destName>jbossts-properties.xml.jts</destName>
Modified: labs/jbosstm/trunk/qa/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/qa/run-tests.xml 2011-08-04 14:47:49 UTC (rev 37359)
+++ labs/jbosstm/trunk/qa/run-tests.xml 2011-08-04 15:36:14 UTC (rev 37360)
@@ -275,7 +275,7 @@
<!-- override the config file, so that we can run jta mode tests even with jts binaries -->
<property name="additional.elements"
- value="-Dcom.arjuna.ats.arjuna.common.propertiesFile=../ArjunaJTA/jbossts-properties-arjunajta.xml"/>
+ value="-Dcom.arjuna.ats.arjuna.common.propertiesFile=../ArjunaJTA/narayana-jta/src/main/resources/jbossts-properties.xml"/>
<!-- txcore : 28 tests, 2 minutes -->
<antcall target="junit-tests">
More information about the jboss-svn-commits
mailing list