[jboss-svn-commits] JBL Code SVN: r20659 - in labs/jbosstm/trunk: ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jun 20 10:38:58 EDT 2008
Author: adinn
Date: 2008-06-20 10:38:58 -0400 (Fri, 20 Jun 2008)
New Revision: 20659
Removed:
labs/jbosstm/trunk/ext/concurrent.jar
Modified:
labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.bat
labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.sh
labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.bat
labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.sh
labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.bat
labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.sh
labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
labs/jbosstm/trunk/ext/Readme
Log:
switched to use java.util.concurrent classes and removed all mention of compatibility jar from code/readmes- fix for JBTM-375
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.bat 2008-06-20 14:19:32 UTC (rev 20658)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.bat 2008-06-20 14:38:58 UTC (rev 20659)
@@ -46,7 +46,6 @@
set EXT_CLASSPATH=%JBOSSTS_HOME%\lib\ext\jbossts-common.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\commons-logging-1.1.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\concurrent.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\connector-api.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\jdbc2_0-stdext.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%JBOSSTS_HOME%\lib\ext\jmxri.jar
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.sh 2008-06-20 14:19:32 UTC (rev 20658)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/setup-env.sh 2008-06-20 14:38:58 UTC (rev 20659)
@@ -77,7 +77,6 @@
EXT_CLASSPATH="$JBOSSTS_HOME/lib/ext/jbossts-common.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$JBOSSTS_HOME/lib/ext/commons-logging-1.1.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$JBOSSTS_HOME/lib/ext/concurrent.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$JBOSSTS_HOME/lib/ext/connector-api.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$JBOSSTS_HOME/lib/ext/jdbc2_0-stdext.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$JBOSSTS_HOME/lib/ext/jmxri.jar"
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.bat 2008-06-20 14:19:32 UTC (rev 20658)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.bat 2008-06-20 14:38:58 UTC (rev 20659)
@@ -43,7 +43,6 @@
set EXT_CLASSPATH=%@HOME_DIRECTORY@%\lib\ext\jbossts-common.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\commons-logging-1.1.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\concurrent.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\connector-api.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\jdbc2_0-stdext.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\jmxri.jar
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.sh 2008-06-20 14:19:32 UTC (rev 20658)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/withorb-setup-env.sh 2008-06-20 14:38:58 UTC (rev 20659)
@@ -75,7 +75,6 @@
EXT_CLASSPATH="$@HOME_DIRECTORY@/lib/ext/jbossts-common.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/commons-logging-1.1.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/concurrent.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/connector-api.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/jdbc2_0-stdext.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/jmxri.jar"
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.bat
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.bat 2008-06-20 14:19:32 UTC (rev 20658)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.bat 2008-06-20 14:38:58 UTC (rev 20659)
@@ -42,7 +42,6 @@
set EXT_CLASSPATH=%@HOME_DIRECTORY@%\lib\ext\jbossts-common.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\commons-logging-1.1.jar
-set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\concurrent.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\connector-api.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\jdbc2_0-stdext.jar
set EXT_CLASSPATH=%EXT_CLASSPATH%;%@HOME_DIRECTORY@%\lib\ext\jmxri.jar
Modified: labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.sh
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.sh 2008-06-20 14:19:32 UTC (rev 20658)
+++ labs/jbosstm/trunk/ArjunaCore/scripts/withoutorb-setup-env.sh 2008-06-20 14:38:58 UTC (rev 20659)
@@ -67,7 +67,6 @@
EXT_CLASSPATH="$@HOME_DIRECTORY@/lib/ext/jbossts-common.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/commons-logging-1.1.jar"
-EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/concurrent.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/connector-api.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/jdbc2_0-stdext.jar"
EXT_CLASSPATH="$EXT_CLASSPATH$CPS$@HOME_DIRECTORY@/lib/ext/jmxri.jar"
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java 2008-06-20 14:19:32 UTC (rev 20658)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/transaction/arjunacore/TransactionImple.java 2008-06-20 14:38:58 UTC (rev 20659)
@@ -60,7 +60,7 @@
import javax.transaction.RollbackException;
import java.lang.IllegalStateException;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
/*
* Is given an AtomicAction, but uses the TwoPhaseCoordinator aspects of it to
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java 2008-06-20 14:19:32 UTC (rev 20658)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/classes/com/arjuna/ats/internal/jta/transaction/jts/TransactionImple.java 2008-06-20 14:38:58 UTC (rev 20659)
@@ -64,7 +64,7 @@
import com.arjuna.ats.arjuna.common.*;
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.*;
Modified: labs/jbosstm/trunk/ext/Readme
===================================================================
--- labs/jbosstm/trunk/ext/Readme 2008-06-20 14:19:32 UTC (rev 20658)
+++ labs/jbosstm/trunk/ext/Readme 2008-06-20 14:38:58 UTC (rev 20659)
@@ -39,4 +39,3 @@
xalan.jar
xercesImpl.jar Xerces 2.3.0
xmlParserAPIs.jar Xerces 2.3.0
-concurrent.jar Build of Doug Lea's concurrent utilities for JDK 1.4.
Deleted: labs/jbosstm/trunk/ext/concurrent.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list