[jboss-svn-commits] JBL Code SVN: r37857 - in labs/jbosstm/workspace/mlittle/STM-Arjuna: etc and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Jan 22 17:21:17 EST 2012
Author: mark.little at jboss.com
Date: 2012-01-22 17:21:14 -0500 (Sun, 22 Jan 2012)
New Revision: 37857
Added:
labs/jbosstm/workspace/mlittle/STM-Arjuna/etc/
labs/jbosstm/workspace/mlittle/STM-Arjuna/etc/jbossts-properties.xml
labs/jbosstm/workspace/mlittle/STM-Arjuna/lib/jboss-logging.jar
Modified:
labs/jbosstm/workspace/mlittle/STM-Arjuna/lib/jbosscore.jar
labs/jbosstm/workspace/mlittle/STM-Arjuna/lib/jbossts-common.jar
labs/jbosstm/workspace/mlittle/STM-Arjuna/pom.xml
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/proxy/LockManagerProxy.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/types/AtomicArrayImpl.java
labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/LinkedListUnitTest.java
Log:
Moving closer to trunk of JBossTS.
Added: labs/jbosstm/workspace/mlittle/STM-Arjuna/etc/jbossts-properties.xml
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/etc/jbossts-properties.xml (rev 0)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/etc/jbossts-properties.xml 2012-01-22 22:21:14 UTC (rev 37857)
@@ -0,0 +1,128 @@
+<?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>
Added: labs/jbosstm/workspace/mlittle/STM-Arjuna/lib/jboss-logging.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosstm/workspace/mlittle/STM-Arjuna/lib/jboss-logging.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/lib/jbosscore.jar
===================================================================
(Binary files differ)
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/lib/jbossts-common.jar
===================================================================
(Binary files differ)
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/pom.xml
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/pom.xml 2012-01-20 13:41:49 UTC (rev 37856)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/pom.xml 2012-01-22 22:21:14 UTC (rev 37857)
@@ -15,6 +15,15 @@
<target>1.5</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${basedir}/etc/</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -27,18 +36,25 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jbossts-common</artifactId>
- <version>4.5.0</version>
+ <version>4.15.3</version>
<scope>system</scope>
<systemPath>${basedir}/lib/jbossts-common.jar</systemPath>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jbosscore</artifactId>
- <version>4.5.0</version>
+ <version>4.15.3</version>
<scope>system</scope>
<systemPath>${basedir}/lib/jbosscore.jar</systemPath>
</dependency>
<dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging</artifactId>
+ <version>4.15.3</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/lib/jboss-logging.jar</systemPath>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
<version>1.0.4</version>
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/proxy/LockManagerProxy.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/proxy/LockManagerProxy.java 2012-01-20 13:41:49 UTC (rev 37856)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/proxy/LockManagerProxy.java 2012-01-22 22:21:14 UTC (rev 37857)
@@ -36,6 +36,7 @@
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.arjuna.state.InputObjectState;
import com.arjuna.ats.arjuna.state.OutputObjectState;
+import com.arjuna.ats.internal.arjuna.common.UidHelper;
import com.arjuna.ats.txoj.LockManager;
public class LockManagerProxy<T> extends LockManager
@@ -329,7 +330,7 @@
else
{
os.packBoolean(true);
- _container.getUidForHandle((T) ptr).pack(os);
+ UidHelper.packInto(_container.getUidForHandle((T) ptr), os);
}
}
catch (final ClassCastException ex)
@@ -547,7 +548,7 @@
afield.set(_theObject, null);
else
{
- u.unpack(os);
+ u = UidHelper.unpackFrom(os);
afield.set(_theObject, _container.getHandle(u));
}
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/types/AtomicArrayImpl.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/types/AtomicArrayImpl.java 2012-01-20 13:41:49 UTC (rev 37856)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/main/java/org/jboss/stm/internal/types/AtomicArrayImpl.java 2012-01-22 22:21:14 UTC (rev 37857)
@@ -35,6 +35,7 @@
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.arjuna.state.InputObjectState;
import com.arjuna.ats.arjuna.state.OutputObjectState;
+import com.arjuna.ats.internal.arjuna.common.UidHelper;
// TODO maybe pull all of this into a separate jar
@@ -147,7 +148,7 @@
try
{
- temp.pack(os);
+ UidHelper.packInto(temp, os);
}
catch (final Exception ex)
{
@@ -206,10 +207,8 @@
try
{
- Uid temp = new Uid(Uid.nullUid());
+ Uid temp = UidHelper.unpackFrom(os);
- temp.unpack(os);
-
_array.set(i, _container.getHandle(temp));
}
catch (final Exception ex)
Modified: labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/LinkedListUnitTest.java
===================================================================
--- labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/LinkedListUnitTest.java 2012-01-20 13:41:49 UTC (rev 37856)
+++ labs/jbosstm/workspace/mlittle/STM-Arjuna/src/test/java/org/jboss/stm/LinkedListUnitTest.java 2012-01-22 22:21:14 UTC (rev 37857)
@@ -39,6 +39,7 @@
import com.arjuna.ats.arjuna.coordinator.BasicAction;
import com.arjuna.ats.arjuna.state.InputObjectState;
import com.arjuna.ats.arjuna.state.OutputObjectState;
+import com.arjuna.ats.internal.arjuna.common.UidHelper;
import com.arjuna.ats.txoj.Lock;
import com.arjuna.ats.txoj.LockManager;
import com.arjuna.ats.txoj.LockMode;
@@ -111,15 +112,15 @@
else
{
os.packBoolean(true);
- theContainer.getUidForHandle(_prev).pack(os);
+ UidHelper.packInto(theContainer.getUidForHandle(_prev), os);
}
if (_next == null)
os.packBoolean(false);
else
{
- os.packBoolean(true);
- theContainer.getUidForHandle(_next).pack(os);
+ os.packBoolean(true);
+ UidHelper.packInto(theContainer.getUidForHandle(_next), os);
}
os.packString(_nodeName);
@@ -135,7 +136,7 @@
_prev = null;
else
{
- id.unpack(os);
+ id = UidHelper.unpackFrom(os);
_prev = theContainer.getHandle(id);
}
@@ -145,7 +146,7 @@
_next = null;
else
{
- id.unpack(os);
+ id = UidHelper.unpackFrom(os);
_next = theContainer.getHandle(id);
}
More information about the jboss-svn-commits
mailing list