[jboss-svn-commits] JBL Code SVN: r36626 - in labs/jbosstm/trunk/ArjunaCore: arjuna and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 17 09:26:03 EST 2011
Author: tomjenkinson
Date: 2011-02-17 09:26:03 -0500 (Thu, 17 Feb 2011)
New Revision: 36626
Added:
labs/jbosstm/trunk/ArjunaCore/arjuna/src/
labs/jbosstm/trunk/ArjunaCore/arjuna/src/test/
labs/jbosstm/trunk/ArjunaCore/arjuna/src/test/resources/
labs/jbosstm/trunk/ArjunaCore/arjuna/src/test/resources/jbossts-properties.xml
labs/jbosstm/trunk/ArjunaCore/txoj/src/
labs/jbosstm/trunk/ArjunaCore/txoj/src/test/
labs/jbosstm/trunk/ArjunaCore/txoj/src/test/resources/
labs/jbosstm/trunk/ArjunaCore/txoj/src/test/resources/jbossts-properties.xml
Removed:
labs/jbosstm/trunk/ArjunaCore/jbossts-properties.xml
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
labs/jbosstm/trunk/ArjunaCore/src/main/assembly/bin.xml
labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
Log:
JBTM-574 include some test jbossts-properties.xml to use
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml 2011-02-17 13:31:10 UTC (rev 36625)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/pom.xml 2011-02-17 14:26:03 UTC (rev 36626)
@@ -35,14 +35,8 @@
<testSourceDirectory>tests/classes</testSourceDirectory>
<testResources>
<testResource>
- <directory>etc</directory>
+ <directory>src/test/resources</directory>
</testResource>
- <testResource>
- <directory>../</directory>
- <includes>
- <include>jbossts-properties.xml</include>
- </includes>
- </testResource>
</testResources>
Added: labs/jbosstm/trunk/ArjunaCore/arjuna/src/test/resources/jbossts-properties.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/src/test/resources/jbossts-properties.xml (rev 0)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/src/test/resources/jbossts-properties.xml 2011-02-17 14:26:03 UTC (rev 36626)
@@ -0,0 +1 @@
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties/>
\ No newline at end of file
Deleted: labs/jbosstm/trunk/ArjunaCore/jbossts-properties.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/jbossts-properties.xml 2011-02-17 13:31:10 UTC (rev 36625)
+++ labs/jbosstm/trunk/ArjunaCore/jbossts-properties.xml 2011-02-17 14:26:03 UTC (rev 36626)
@@ -1,128 +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 ArjunaCore.
- It should be called jbossts-properties.xml.
- You need a different version for JTA 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>
-
- <!--
- 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.recoveryExtensions">
- com.arjuna.ats.internal.arjuna.recovery.AtomicActionRecoveryModule
- com.arjuna.ats.internal.txoj.recovery.TORecoveryModule
- </entry>
-
- <!-- Expiry scanners to use (order of invocation is random). -->
- <entry key="RecoveryEnvironmentBean.expiryScanners">
- com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner
- </entry>
-
- <!--
- Add the following to the set of expiryScanners 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/ArjunaCore/src/main/assembly/bin.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/src/main/assembly/bin.xml 2011-02-17 13:31:10 UTC (rev 36625)
+++ labs/jbosstm/trunk/ArjunaCore/src/main/assembly/bin.xml 2011-02-17 14:26:03 UTC (rev 36626)
@@ -175,11 +175,6 @@
<outputDirectory>etc</outputDirectory>
</file>
<file>
- <source>jbossts-properties.xml</source>
- <fileMode>0644</fileMode>
- <outputDirectory>etc</outputDirectory>
- </file>
- <file>
<source>../ext/third_party_licenses.txt</source>
<fileMode>0644</fileMode>
<outputDirectory>lib/ext</outputDirectory>
@@ -198,10 +193,21 @@
<destName>setup-env.bat</destName>
<filtered>true</filtered>
</file>
- <fileSet>
- <directory>docs/user_guide/FailureRecoveryGuide.pdf</directory>
+ <file>
+ <source>docs/user_guide/FailureRecoveryGuide.pdf</source>
<outputDirectory>docs</outputDirectory>
- </fileSet>
+ </file>
+ <file>
+ <source>jbossts-properties-arjunacore.xml</source>
+ <fileMode>0644</fileMode>
+ <destName>default-jbossts-properties.xml</destName>
+ </file>
+ <file>
+ <source>jbossts-properties-arjunacore.xml</source>
+ <fileMode>0644</fileMode>
+ <outputDirectory>etc</outputDirectory>
+ <destName>jbossts-properties.xml</destName>
+ </file>
</files>
<fileSets>
<fileSet>
Modified: labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml 2011-02-17 13:31:10 UTC (rev 36625)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/pom.xml 2011-02-17 14:26:03 UTC (rev 36626)
@@ -35,10 +35,7 @@
<testSourceDirectory>tests/classes</testSourceDirectory>
<testResources>
<testResource>
- <directory>../</directory>
- <includes>
- <include>jbossts-properties.xml</include>
- </includes>
+ <directory>src/test/resources</directory>
</testResource>
</testResources>
Added: labs/jbosstm/trunk/ArjunaCore/txoj/src/test/resources/jbossts-properties.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/txoj/src/test/resources/jbossts-properties.xml (rev 0)
+++ labs/jbosstm/trunk/ArjunaCore/txoj/src/test/resources/jbossts-properties.xml 2011-02-17 14:26:03 UTC (rev 36626)
@@ -0,0 +1 @@
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties/>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list