Mail Archive Home | gotm-commits List | December 2005 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Tuesday, December 20, 2005 @ 11:49:31
Author: rouvoy
Path: /cvsroot/gotm/gotm-jts
Modified:
examples/benchmark/src/java/org/objectweb/benchmark/jts/Benchmark2PC.java
examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkAPC.java
examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkJTS.java
examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkThread.java
examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolIteratable.java
examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolResource.java
examples/benchmark/src/java/org/objectweb/benchmark/jts/JavaTransactionServiceIteratable.java
examples/benchmark/src/java/org/objectweb/benchmark/jts/SynchronizationIteratable.java
examples/benchmark/src/java/org/objectweb/benchmark/jts/XAResourceIteratable.java
examples/benchmark/src/java/org/objectweb/benchmark/lib/ConcurrentScenario.java
examples/benchmark/src/java/org/objectweb/benchmark/lib/IntegerSuite.java
examples/benchmark/src/java/org/objectweb/benchmark/lib/OutcomeImpl.java
examples/benchmark/src/java/org/objectweb/benchmark/lib/Timer.java
examples/junit/src/java/org/objectweb/gotm/jts/tck/GoTMLocalTestCase.java
src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java
src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java
src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java
* Updating the AoKell & ASM libraries,
* Optimization of iterations,
* Removing useless Exceptions.
-----------------------------------------------------------------------------------------------+
examples/benchmark/src/java/org/objectweb/benchmark/jts/Benchmark2PC.java
| 7 +--
examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkAPC.java
| 9 ++---
examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkJTS.java
| 9 ++---
examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkThread.java
| 9 ++---
examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolIteratable.java
| 12 +++---
examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolResource.java
| 9 ++---
examples/benchmark/src/java/org/objectweb/benchmark/jts/JavaTransactionServiceIteratable.java
| 6 +--
examples/benchmark/src/java/org/objectweb/benchmark/jts/SynchronizationIteratable.java
| 9 ++---
examples/benchmark/src/java/org/objectweb/benchmark/jts/XAResourceIteratable.java
| 9 ++---
examples/benchmark/src/java/org/objectweb/benchmark/lib/ConcurrentScenario.java
| 14 ++++++-
examples/benchmark/src/java/org/objectweb/benchmark/lib/IntegerSuite.java
| 13 +++----
examples/benchmark/src/java/org/objectweb/benchmark/lib/OutcomeImpl.java
| 7 +--
examples/benchmark/src/java/org/objectweb/benchmark/lib/Timer.java
| 6 +--
examples/junit/src/java/org/objectweb/gotm/jts/tck/GoTMLocalTestCase.java
| 7 +--
src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java
| 6 +--
src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java
| 18 ++--------
src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java
| 16 ++++----
17 files changed, 78 insertions(+), 88 deletions(-)
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/Benchmark2PC.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/Benchmark2PC.java:1.7
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/Benchmark2PC.java:1.8
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/Benchmark2PC.java:1.7
Mon Dec 19 17:13:58 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/Benchmark2PC.java
Tue Dec 20 11:49:31 2005
@@ -22,14 +22,13 @@
Contributor(s): ______________________________________.
---------------------------------------------------------------------
- $Id: Benchmark2PC.java,v 1.7 2005/12/19 16:13:58 rouvoy Exp $
+ $Id: Benchmark2PC.java,v 1.8 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.benchmark.jts;
import java.io.FileWriter;
import java.util.HashMap;
-import java.util.Map;
import org.objectweb.benchmark.api.Scenario;
import org.objectweb.benchmark.jts.scenario.TransactionScenarioXACommit;
@@ -45,7 +44,7 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
* @fractal.itf name="runnable" signature="java.lang.Runnable"
*/
public class Benchmark2PC
@@ -70,7 +69,7 @@
*/
public void run() {
System.out.println("[2PC] Configuring the transaction services...");
- Map tm = new HashMap();
+ HashMap tm = new HashMap();
tm.put("GoTM-2PC", "2PC");
tm.put("GoTM-2PCPA", "2PCPA");
tm.put("GoTM-2PCPC", "2PCPC");
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkAPC.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkAPC.java:1.9
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkAPC.java:1.10
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkAPC.java:1.9
Fri Dec 16 17:03:29 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkAPC.java
Tue Dec 20 11:49:31 2005
@@ -22,14 +22,13 @@
Contributor(s): ______________________________________.
---------------------------------------------------------------------
- $Id: BenchmarkAPC.java,v 1.9 2005/12/16 16:03:29 rouvoy Exp $
+ $Id: BenchmarkAPC.java,v 1.10 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.benchmark.jts;
import java.io.FileWriter;
import java.util.HashMap;
-import java.util.Map;
import org.objectweb.benchmark.api.Scenario;
import org.objectweb.benchmark.jts.scenario.TransactionScenarioXACommit;
@@ -45,7 +44,7 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
* @fractal.itf name="runnable" signature="java.lang.Runnable"
*/
public class BenchmarkAPC
@@ -66,10 +65,10 @@
* @see java.lang.Runnable#run()
*/
public void run() {
- Map configs = new HashMap();
+ HashMap configs = new HashMap();
System.out.println("[APC] Configuring the transaction services...");
- Map context = new HashMap();
+ HashMap context = new HashMap();
System.getProperties().put("gotm-communication","org.objectweb.gotm.lib.message.FcEventBusThread");
context.put("factory","org.objectweb.gotm.lib.factory.FcTransactionFactoryObservable");
System.getProperties().put("gotm-protocol",
"org.objectweb.gotm.lib.protocol.coordinator.Fc2PCPA");
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkJTS.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkJTS.java:1.10
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkJTS.java:1.11
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkJTS.java:1.10
Mon Dec 19 17:13:58 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkJTS.java
Tue Dec 20 11:49:31 2005
@@ -22,14 +22,13 @@
Contributor(s): ______________________________________.
---------------------------------------------------------------------
- $Id: BenchmarkJTS.java,v 1.10 2005/12/19 16:13:58 rouvoy Exp $
+ $Id: BenchmarkJTS.java,v 1.11 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.benchmark.jts;
import java.io.FileWriter;
import java.util.HashMap;
-import java.util.Map;
import org.objectweb.benchmark.api.Scenario;
import org.objectweb.benchmark.jts.scenario.TransactionScenarioCommit;
@@ -47,7 +46,7 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
* @fractal.itf name="runnable" signature="java.lang.Runnable"
*/
public class BenchmarkJTS
@@ -71,8 +70,8 @@
* @see java.lang.Runnable#run()
*/
public void run() {
- Map tm = new HashMap();
- Map ctx = new HashMap() ;
+ HashMap tm = new HashMap();
+ HashMap ctx = new HashMap() ;
System.out.println("[JTS] Configuring the transaction services...");
try {
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkThread.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkThread.java:1.1
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkThread.java:1.2
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkThread.java:1.1
Mon Dec 19 17:13:58 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/BenchmarkThread.java
Tue Dec 20 11:49:31 2005
@@ -22,14 +22,13 @@
Contributor(s): ______________________________________.
---------------------------------------------------------------------
- $Id: BenchmarkThread.java,v 1.1 2005/12/19 16:13:58 rouvoy Exp $
+ $Id: BenchmarkThread.java,v 1.2 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.benchmark.jts;
import java.io.FileWriter;
import java.util.HashMap;
-import java.util.Map;
import org.objectweb.benchmark.api.Scenario;
import org.objectweb.benchmark.jts.scenario.TransactionScenarioCommit;
@@ -49,7 +48,7 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @fractal.itf name="runnable" signature="java.lang.Runnable"
*/
public class BenchmarkThread
@@ -73,8 +72,8 @@
* @see java.lang.Runnable#run()
*/
public void run() {
- Map tm = new HashMap();
- Map ctx = new HashMap() ;
+ HashMap tm = new HashMap();
+ HashMap ctx = new HashMap() ;
System.out.println("[JTS] Configuring the transaction services...");
try {
System.getProperties().put("gotm-2pc-participant","org.objectweb.gotm.lib.protocol.participant.Fc2PCNoLog");
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolIteratable.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolIteratable.java:1.6
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolIteratable.java:1.7
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolIteratable.java:1.6
Fri Dec 16 17:03:29 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolIteratable.java
Tue Dec 20 11:49:31 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
- $Id: CommitProtocolIteratable.java,v 1.6 2005/12/16 16:03:29 rouvoy Exp $
+ $Id: CommitProtocolIteratable.java,v 1.7 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.benchmark.jts;
@@ -38,12 +38,12 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class CommitProtocolIteratable
implements Iterable, Rename {
/** list of <code>tx_manager</code> to benchmark. */
- final Map tx_manager;
+ final HashMap tx_manager;
/** <code>name</code> . */
String name;
@@ -53,7 +53,7 @@
*/
public CommitProtocolIteratable(Map tm) {
this.tx_manager = new HashMap();
- Map context = new HashMap();
+ HashMap context = new HashMap();
context.put("factory","org.objectweb.gotm.lib.factory.FcTransactionFactoryObservable");
System.getProperties().put("gotm-communication","org.objectweb.gotm.lib.message.FcEventBusThread");
@@ -89,7 +89,7 @@
* GoTM Commit Protocol Generator & Iterator implementation.
*
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
private class CommitProtocolIterator
implements Iterator {
@@ -111,7 +111,7 @@
*/
public Object next() {
Entry e = (Entry) entries.next();
- Map next = new HashMap();
+ HashMap next = new HashMap();
name = (String) e.getKey();
System.out
.println(("[JTS] Benchmarking the " + name + "
configuration..."));
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolResource.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolResource.java:1.3
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolResource.java:1.4
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolResource.java:1.3
Fri Dec 16 17:03:29 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/CommitProtocolResource.java
Tue Dec 20 11:49:31 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: CommitProtocolResource.java,v 1.3 2005/12/16 16:03:29 rouvoy Exp $
+$Id: CommitProtocolResource.java,v 1.4 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.benchmark.jts;
@@ -31,14 +31,13 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import org.objectweb.benchmark.jts.data.CounterImpl;
import org.objectweb.benchmark.jts.scenario.TransactionScenarioAbstract;
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class CommitProtocolResource
implements Iterable {
@@ -65,11 +64,11 @@
/**
* XA Resource Generator & Iterator implementation.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
private class CommitProtocolResourceIterator implements Iterator {
private final List commit=new ArrayList(),abort = new
ArrayList();
- private final Map next = new HashMap();
+ private final HashMap next = new HashMap();
private int counter = 0;
/**
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/JavaTransactionServiceIteratable.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/JavaTransactionServiceIteratable.java:1.2
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/JavaTransactionServiceIteratable.java:1.3
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/JavaTransactionServiceIteratable.java:1.2
Fri Dec 16 17:03:29 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/JavaTransactionServiceIteratable.java
Tue Dec 20 11:49:31 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: JavaTransactionServiceIteratable.java,v 1.2 2005/12/16 16:03:29 rouvoy
Exp $
+$Id: JavaTransactionServiceIteratable.java,v 1.3 2005/12/20 10:49:31 rouvoy
Exp $
====================================================================*/
package org.objectweb.benchmark.jts;
@@ -38,7 +38,7 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class JavaTransactionServiceIteratable
implements Iterable, Rename {
@@ -82,7 +82,7 @@
*/
public Object next() {
Entry e = (Entry) entries.next();
- Map next = new HashMap();
+ HashMap next = new HashMap();
name= (String) e.getKey();
System.out.println(("Benchmarking the "+name+"
configuration..."));
next.put(TransactionScenarioAbstract.TX_MANAGER, e.getValue());
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/SynchronizationIteratable.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/SynchronizationIteratable.java:1.4
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/SynchronizationIteratable.java:1.5
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/SynchronizationIteratable.java:1.4
Mon Dec 19 17:13:58 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/SynchronizationIteratable.java
Tue Dec 20 11:49:31 2005
@@ -24,9 +24,9 @@
---------------------------------------------------------------------
<<<<<<< SynchronizationIteratable.java
-$Id: SynchronizationIteratable.java,v 1.4 2005/12/19 16:13:58 rouvoy Exp $
+$Id: SynchronizationIteratable.java,v 1.5 2005/12/20 10:49:31 rouvoy Exp $
=======
-$Id: SynchronizationIteratable.java,v 1.4 2005/12/19 16:13:58 rouvoy Exp $
+$Id: SynchronizationIteratable.java,v 1.5 2005/12/20 10:49:31 rouvoy Exp $
>>>>>>> 1.3
====================================================================*/
package org.objectweb.benchmark.jts;
@@ -35,7 +35,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import org.objectweb.benchmark.jts.data.CounterImpl;
import org.objectweb.benchmark.jts.scenario.TransactionScenarioAbstract;
@@ -43,7 +42,7 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class SynchronizationIteratable
implements Iterable, Rename {
@@ -52,7 +51,7 @@
int index;
private class SynchronizationIterator implements Iterator {
- private final Map next = new HashMap();
+ private final HashMap next = new HashMap();
/**
*
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/XAResourceIteratable.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/XAResourceIteratable.java:1.6
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/XAResourceIteratable.java:1.7
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/XAResourceIteratable.java:1.6
Mon Dec 19 17:13:58 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/jts/XAResourceIteratable.java
Tue Dec 20 11:49:31 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: XAResourceIteratable.java,v 1.6 2005/12/19 16:13:58 rouvoy Exp $
+$Id: XAResourceIteratable.java,v 1.7 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.benchmark.jts;
@@ -31,14 +31,13 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import org.objectweb.benchmark.jts.data.CounterImpl;
import org.objectweb.benchmark.jts.scenario.TransactionScenarioAbstract;
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class XAResourceIteratable
implements Iterable {
@@ -80,10 +79,10 @@
/**
* XA Resource Generator & Iterator implementation.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
private class XAResourceIterator implements Iterator {
- private final Map next = new HashMap();
+ private final HashMap next = new HashMap();
private int counter = 0;
private boolean failure = fails;
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/ConcurrentScenario.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/ConcurrentScenario.java:1.1
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/ConcurrentScenario.java:1.2
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/ConcurrentScenario.java:1.1
Mon Dec 19 17:13:57 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/ConcurrentScenario.java
Tue Dec 20 11:49:31 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: ConcurrentScenario.java,v 1.1 2005/12/19 16:13:57 rouvoy Exp $
+$Id: ConcurrentScenario.java,v 1.2 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.benchmark.lib;
@@ -33,7 +33,7 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ConcurrentScenario
extends ScenarioAbstract {
@@ -43,7 +43,7 @@
protected int nbThreads=1;
/**
- * @param scenarios
+ * @param scenario
*/
public ConcurrentScenario(Scenario scenario) {
super(scenario.toString());
@@ -77,8 +77,16 @@
}
+ /**
+ * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
+ * @version $Revision: 1.2 $
+ */
private class ScenarioThread extends Thread {
private Scenario s;
+ /**
+ * ScenarioThread object contructor.
+ * @param s
+ */
public ScenarioThread(Scenario s) {
this.s = s;
}
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/IntegerSuite.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/IntegerSuite.java:1.1
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/IntegerSuite.java:1.2
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/IntegerSuite.java:1.1
Mon Dec 19 17:13:57 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/IntegerSuite.java
Tue Dec 20 11:49:31 2005
@@ -23,19 +23,18 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: IntegerSuite.java,v 1.1 2005/12/19 16:13:57 rouvoy Exp $
+$Id: IntegerSuite.java,v 1.2 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.benchmark.lib;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.Map;
import org.objectweb.benchmark.lib.visitor.Rename;
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class IntegerSuite
implements Iterable, Rename {
@@ -44,7 +43,9 @@
final String tag;
/**
- * @param iteration
+ * @param tag
+ * @param from
+ * @param to
* @param step
*/
public IntegerSuite(String tag, int from, int to, int step) {
@@ -64,10 +65,10 @@
/**
* XA Resource Generator & Iterator implementation.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
private class IntegerSuiteIterator implements Iterator {
- private final Map next = new HashMap();
+ private final HashMap next = new HashMap();
private int counter = from;
/* (non-Javadoc)
* @see java.util.Iterator#hasNext()
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/OutcomeImpl.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/OutcomeImpl.java:1.3
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/OutcomeImpl.java:1.4
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/OutcomeImpl.java:1.3
Mon Dec 19 17:13:57 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/OutcomeImpl.java
Tue Dec 20 11:49:31 2005
@@ -23,14 +23,13 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: OutcomeImpl.java,v 1.3 2005/12/19 16:13:57 rouvoy Exp $
+$Id: OutcomeImpl.java,v 1.4 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.benchmark.lib;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Vector;
import org.objectweb.benchmark.api.Outcome;
@@ -39,10 +38,10 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class OutcomeImpl implements Outcome {
- private Map values = new HashMap();
+ private HashMap values = new HashMap();
/* (non-Javadoc)
* @see org.objectweb.benchmark.api.Outcome#values(java.lang.String)
Index:
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/Timer.java
diff -u
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/Timer.java:1.3
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/Timer.java:1.4
---
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/Timer.java:1.3
Mon Dec 19 17:13:57 2005
+++
gotm-jts/examples/benchmark/src/java/org/objectweb/benchmark/lib/Timer.java
Tue Dec 20 11:49:31 2005
@@ -23,13 +23,13 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: Timer.java,v 1.3 2005/12/19 16:13:57 rouvoy Exp $
+$Id: Timer.java,v 1.4 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.benchmark.lib;
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class Timer {
private class Measure {
@@ -77,7 +77,7 @@
private ThreadLocal measures = new ThreadLocal();
- private Measure current(){
+ Measure current(){
Measure cur = (Measure) measures.get();
if (cur == null){
cur = new Measure();
Index:
gotm-jts/examples/junit/src/java/org/objectweb/gotm/jts/tck/GoTMLocalTestCase.java
diff -u
gotm-jts/examples/junit/src/java/org/objectweb/gotm/jts/tck/GoTMLocalTestCase.java:1.6
gotm-jts/examples/junit/src/java/org/objectweb/gotm/jts/tck/GoTMLocalTestCase.java:1.7
---
gotm-jts/examples/junit/src/java/org/objectweb/gotm/jts/tck/GoTMLocalTestCase.java:1.6
Fri Dec 16 17:03:29 2005
+++
gotm-jts/examples/junit/src/java/org/objectweb/gotm/jts/tck/GoTMLocalTestCase.java
Tue Dec 20 11:49:31 2005
@@ -23,12 +23,11 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: GoTMLocalTestCase.java,v 1.6 2005/12/16 16:03:29 rouvoy Exp $
+$Id: GoTMLocalTestCase.java,v 1.7 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.jts.tck;
import java.util.HashMap;
-import java.util.Map;
import javax.transaction.TransactionManager;
@@ -37,7 +36,7 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class GoTMLocalTestCase
extends LocalTestCase {
@@ -45,7 +44,7 @@
private static TransactionManager gotm ;
static {
- Map ctx = new HashMap() ;
+ HashMap ctx = new HashMap() ;
System.getProperties().put("gotm-2pc-participant","org.objectweb.gotm.lib.protocol.participant.Fc2PCNoLog");
System.getProperties().put("gotm-protocol","org.objectweb.gotm.lib.protocol.coordinator.Fc2PCNoLog");
System.getProperties().put("gotm-communication","org.objectweb.gotm.lib.message.FcEventBusSimple");
Index:
gotm-jts/src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java
diff -u
gotm-jts/src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java:1.8
gotm-jts/src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java:1.9
---
gotm-jts/src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java:1.8
Fri Dec 16 18:21:38 2005
+++
gotm-jts/src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java
Tue Dec 20 11:49:31 2005
@@ -22,7 +22,7 @@
Contributor(s): ______________________________________.
---------------------------------------------------------------------
- $Id: SynchronizationActionProvider.java,v 1.8 2005/12/16 17:21:38 rouvoy
Exp $
+ $Id: SynchronizationActionProvider.java,v 1.9 2005/12/20 10:49:31 rouvoy
Exp $
====================================================================*/
package org.objectweb.gotm.lib.jta;
@@ -39,7 +39,7 @@
* Implementation of a <code>ResourceManagerWithPool</code> for the
* <code>Synchronization</code> object.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
* @fractal.itf name="synchronization-action-provider"
signature="org.objectweb.gotm.lib.action.ActionProvider"
*/
public class SynchronizationActionProvider extends ActionProviderAbstract
@@ -74,7 +74,7 @@
* @see
org.objectweb.gotm.lib.resource.ResourceManagerImpl#declareActions()
*/
protected Map actions() {
- Map a = new HashMap();
+ HashMap a = new HashMap();
a.put(org.objectweb.gotm.lib.state.Status.COMMITTING,
new BeforeCompletion());
a.put(org.objectweb.gotm.lib.state.Status.ABORTING,
Index: gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java
diff -u
gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java:1.20
gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java:1.21
--- gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java:1.20
Mon Dec 19 16:08:22 2005
+++ gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java Tue
Dec 20 11:49:31 2005
@@ -22,7 +22,7 @@
Contributor(s): ______________________________________.
---------------------------------------------------------------------
- $Id: TransactionImpl.java,v 1.20 2005/12/19 15:08:22 rouvoy Exp $
+ $Id: TransactionImpl.java,v 1.21 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.jta;
@@ -41,7 +41,6 @@
import org.objectweb.gotm.ComponentImpl;
import org.objectweb.gotm.GoTMException;
import org.objectweb.gotm.lib.coordination.TimeoutAttribute;
-import org.objectweb.gotm.lib.coordination.TransactionAbortedException;
import org.objectweb.gotm.lib.message.EventConverter;
import org.objectweb.gotm.lib.resource.ResourceManager;
import org.objectweb.gotm.lib.state.InvalidStateException;
@@ -53,7 +52,7 @@
/**
* Adapter for the Java Transaction API (JTA).
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.20 $
+ * @version $Revision: 1.21 $
* @fractal.itf name="transaction" signature="javax.transaction.Transaction"
* @fractal.itf name="user-transaction"
signature="javax.transaction.UserTransaction"
*/
@@ -101,20 +100,14 @@
throw new IllegalStateException("Transaciton is inactive.");
try {
this.publish.notify(Status.PREPARE, new HashMap());
- } catch (TransactionAbortedException e) { // Transaction aborted
during phase 1
- if (this.logger.isLoggable(DEBUG))
- this.logger.log(DEBUG, "Transaction has rolled back : ",e);
- throw new HeuristicRollbackException("Transaction has rolled
back.");
} catch (InvalidTransitionException e) { // Transaction marked to
abort
this.publish.notify(Status.ABORT, new HashMap());
- if (this.logger.isLoggable(DEBUG))
- this.logger.log(DEBUG, "Transaction has rolled back (marked
rollback): ",e);
throw new RollbackException("Transaction has rolled back (marked
rollback).");
} catch (Exception e) {
- if (this.logger.isLoggable(ERROR))
- this.logger.log(ERROR, "Failure during commit: ",e);
throw new SystemException(e.getMessage());
}
+ if (this.txStatus.checkStatus(Status.ABORTED))
+ throw new HeuristicRollbackException("Transaction has rolled
back.");
}
/* (non-Javadoc)
@@ -206,9 +199,6 @@
this.logger.log(DEBUG, "JTA.rollback()");
try {
this.publish.notify(Status.ABORT,new HashMap());
- } catch (TransactionAbortedException e) {
- if (this.logger.isLoggable(DEBUG))
- this.logger.log(DEBUG, "TransactionAborted: ",e);
} catch (Exception e) {
if (this.logger.isLoggable(ERROR))
this.logger.log(ERROR, "Failure during rollback: ",e);
Index:
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java
diff -u
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java:1.12
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java:1.13
---
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java:1.12
Mon Dec 19 16:08:22 2005
+++
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java
Tue Dec 20 11:49:31 2005
@@ -22,7 +22,7 @@
Contributor(s): ______________________________________.
---------------------------------------------------------------------
- $Id: XAResourceActionProvider.java,v 1.12 2005/12/19 15:08:22 rouvoy Exp $
+ $Id: XAResourceActionProvider.java,v 1.13 2005/12/20 10:49:31 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.jta.xa;
@@ -47,7 +47,7 @@
/**
* Implementation of the XA Resource specification.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
* @fractal.itf name="xa-action-provider"
signature="org.objectweb.gotm.lib.action.ActionProvider"
*/
public class XAResourceActionProvider extends ActionProviderAbstract {
@@ -84,7 +84,7 @@
* @see
org.objectweb.gotm.lib.resource.ResourceManagerImpl#declareActions()
*/
protected Map actions() {
- Map a = new HashMap();
+ HashMap a = new HashMap();
a.put("enlist", new StartAction(XAResource.TMNOFLAGS));
a.put("delist", new EndAction(XAResource.TMNOFLAGS));
a.put(Status.START, new StartAction(XAResource.TMNOFLAGS));
@@ -101,7 +101,7 @@
/**
* Implementation of the XA Start Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
private final class StartAction implements Action {
private int flag;
@@ -131,7 +131,7 @@
/**
* Implementation of the XA End Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
private final class EndAction
implements Action {
@@ -156,7 +156,7 @@
/**
* Implementation of the XA Prepare Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
private final class PrepareAction implements Action {
/**
@@ -192,7 +192,7 @@
/**
* Implementation of the XA Commit Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
private final class CommitAction implements Action {
/* (non-Javadoc)
@@ -211,7 +211,7 @@
/**
* Implementation of the XA Rollback Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
private final class RollbackAction implements Action {
/* (non-Javadoc)
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.