Mail Archive Home | gotm-commits List | June 2005 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Tuesday, June 28, 2005 @ 10:02:31
Author: rouvoy
Path: /cvsroot/gotm/gotm-jts
Added: examples/benchmark/.cvsignore examples/benchmark/build.xml
examples/benchmark/lib/carol/carol.jar
examples/benchmark/lib/cli/commons-cli.jar
examples/benchmark/lib/cli/commons-logging.jar
examples/benchmark/lib/jotm/jonas_timer.jar
examples/benchmark/lib/jotm/jotm.jar
examples/benchmark/lib/jotm/jotm_iiop_stubs.jar
examples/benchmark/lib/jotm/jotm_jrmp_stubs.jar
examples/benchmark/lib/log4j/log4j.jar
examples/benchmark/lib/spec/jta-spec1_0_1.jar
examples/benchmark/lib/spec/jts1_0.jar
examples/benchmark/lib/xapool/objectweb-datasource.jar
examples/benchmark/lib/xapool/xapool.jar
examples/benchmark/src/cfg/benchmark.xml
examples/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcApplication.fractal
examples/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcExplorer.fractal
examples/benchmark/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/ClientAttributeController.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/Counter.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterAttributes.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterImpl.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/InvokeRunnableAction.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/JtaClient.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioAttributeController.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioImpl.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Collector.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Scenario.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Serie.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieAverage.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMax.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMin.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieVisitor.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Timer.java
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/VisitorImpl.java
examples/local/.cvsignore examples/local/build.xml
examples/local/src/cfg/local.xml
examples/local/src/fractal/org/objectweb/gotm/jts/local/FcApplication.fractal
examples/local/src/fractal/org/objectweb/gotm/jts/local/FcExplorer.fractal
examples/local/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
examples/local/src/java/org/objectweb/gotm/jts/local/Counter.java
examples/local/src/java/org/objectweb/gotm/jts/local/CounterAttributes.java
examples/local/src/java/org/objectweb/gotm/jts/local/CounterImpl.java
examples/local/src/java/org/objectweb/gotm/jts/local/InvokeRunnableAction.java
examples/local/src/java/org/objectweb/gotm/jts/local/JtaClient.java
src/xml/JTA.xml
Modified: .classpath .cvsignore .settings/org.eclipse.core.resources.prefs
build.xml
src/java/org/objectweb/gotm/lib/jta/SynchronizationImpl.java
src/java/org/objectweb/gotm/lib/jta/XAResourceImpl.java
Removed: example/benchmark/.cvsignore example/benchmark/build.xml
example/benchmark/lib/carol/carol.jar
example/benchmark/lib/cli/commons-cli.jar
example/benchmark/lib/cli/commons-logging.jar
example/benchmark/lib/jotm/jonas_timer.jar
example/benchmark/lib/jotm/jotm.jar
example/benchmark/lib/jotm/jotm_iiop_stubs.jar
example/benchmark/lib/jotm/jotm_jrmp_stubs.jar
example/benchmark/lib/log4j/log4j.jar
example/benchmark/lib/spec/jta-spec1_0_1.jar
example/benchmark/lib/spec/jts1_0.jar
example/benchmark/lib/xapool/objectweb-datasource.jar
example/benchmark/lib/xapool/xapool.jar
example/benchmark/src/cfg/benchmark.xml
example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcApplication.fractal
example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcExplorer.fractal
example/benchmark/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/ClientAttributeController.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/Counter.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterAttributes.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterImpl.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/InvokeRunnableAction.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/JtaClient.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioAttributeController.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioImpl.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Collector.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Scenario.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Serie.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieAverage.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMax.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMin.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieVisitor.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Timer.java
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/VisitorImpl.java
example/local/.cvsignore example/local/build.xml
example/local/src/cfg/local.xml
example/local/src/fractal/org/objectweb/gotm/jts/local/FcApplication.fractal
example/local/src/fractal/org/objectweb/gotm/jts/local/FcExplorer.fractal
example/local/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
example/local/src/java/org/objectweb/gotm/jts/local/Counter.java
example/local/src/java/org/objectweb/gotm/jts/local/CounterAttributes.java
example/local/src/java/org/objectweb/gotm/jts/local/CounterImpl.java
example/local/src/java/org/objectweb/gotm/jts/local/InvokeRunnableAction.java
example/local/src/java/org/objectweb/gotm/jts/local/JtaClient.java
src/cfg/JTA.xml
* renaming the example directory into examples.
* improving the jts benchmark.
* moving explorer configurations into the src/xml directory.
----------------------------------------------------------------------------------------------------------+
.classpath
| 114 +----
.cvsignore
| 2
.settings/org.eclipse.core.resources.prefs
| 14
build.xml
| 73 ++-
example/benchmark/.cvsignore
| 2
example/benchmark/build.xml
| 99 ----
example/benchmark/lib/carol/carol.jar
| <<Binary file>>
example/benchmark/lib/cli/commons-cli.jar
| <<Binary file>>
example/benchmark/lib/cli/commons-logging.jar
| <<Binary file>>
example/benchmark/lib/jotm/jonas_timer.jar
| <<Binary file>>
example/benchmark/lib/jotm/jotm.jar
| <<Binary file>>
example/benchmark/lib/jotm/jotm_iiop_stubs.jar
| <<Binary file>>
example/benchmark/lib/jotm/jotm_jrmp_stubs.jar
| <<Binary file>>
example/benchmark/lib/log4j/log4j.jar
| <<Binary file>>
example/benchmark/lib/spec/jta-spec1_0_1.jar
| <<Binary file>>
example/benchmark/lib/spec/jts1_0.jar
| <<Binary file>>
example/benchmark/lib/xapool/objectweb-datasource.jar
| <<Binary file>>
example/benchmark/lib/xapool/xapool.jar
| <<Binary file>>
example/benchmark/src/cfg/benchmark.xml
| 18
example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcApplication.fractal
| 28 -
example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcExplorer.fractal
| 14
example/benchmark/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
| 14
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/ClientAttributeController.java
| 49 --
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/Counter.java
| 55 --
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterAttributes.java
| 53 --
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterImpl.java
| 211 ----------
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/InvokeRunnableAction.java
| 79 ---
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/JtaClient.java
| 156 -------
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioAttributeController.java
| 49 --
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioImpl.java
| 193 ---------
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Collector.java
| 100 ----
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Scenario.java
| 51 --
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Serie.java
| 99 ----
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieAverage.java
| 57 --
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMax.java
| 59 --
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMin.java
| 61 --
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieVisitor.java
| 51 --
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Timer.java
| 73 ---
example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/VisitorImpl.java
| 61 --
example/local/.cvsignore
| 2
example/local/build.xml
| 91 ----
example/local/src/cfg/local.xml
| 18
example/local/src/fractal/org/objectweb/gotm/jts/local/FcApplication.fractal
| 24 -
example/local/src/fractal/org/objectweb/gotm/jts/local/FcExplorer.fractal
| 14
example/local/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
| 14
example/local/src/java/org/objectweb/gotm/jts/local/Counter.java
| 55 --
example/local/src/java/org/objectweb/gotm/jts/local/CounterAttributes.java
| 53 --
example/local/src/java/org/objectweb/gotm/jts/local/CounterImpl.java
| 201 ---------
example/local/src/java/org/objectweb/gotm/jts/local/InvokeRunnableAction.java
| 79 ---
example/local/src/java/org/objectweb/gotm/jts/local/JtaClient.java
| 202 ---------
examples/benchmark/.cvsignore
| 2
examples/benchmark/build.xml
| 99 ++++
examples/benchmark/lib/carol/carol.jar
| <<Binary file>>
examples/benchmark/lib/cli/commons-cli.jar
| <<Binary file>>
examples/benchmark/lib/cli/commons-logging.jar
| <<Binary file>>
examples/benchmark/lib/jotm/jonas_timer.jar
| <<Binary file>>
examples/benchmark/lib/jotm/jotm.jar
| <<Binary file>>
examples/benchmark/lib/jotm/jotm_iiop_stubs.jar
| <<Binary file>>
examples/benchmark/lib/jotm/jotm_jrmp_stubs.jar
| <<Binary file>>
examples/benchmark/lib/log4j/log4j.jar
| <<Binary file>>
examples/benchmark/lib/spec/jta-spec1_0_1.jar
| <<Binary file>>
examples/benchmark/lib/spec/jts1_0.jar
| <<Binary file>>
examples/benchmark/lib/xapool/objectweb-datasource.jar
| <<Binary file>>
examples/benchmark/lib/xapool/xapool.jar
| <<Binary file>>
examples/benchmark/src/cfg/benchmark.xml
| 18
examples/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcApplication.fractal
| 28 +
examples/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcExplorer.fractal
| 14
examples/benchmark/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
| 14
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/ClientAttributeController.java
| 50 ++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/Counter.java
| 55 ++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterAttributes.java
| 53 ++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterImpl.java
| 211 ++++++++++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/InvokeRunnableAction.java
| 79 +++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/JtaClient.java
| 156 +++++++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioAttributeController.java
| 50 ++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioImpl.java
| 194 +++++++++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Collector.java
| 101 ++++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Scenario.java
| 52 ++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Serie.java
| 100 ++++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieAverage.java
| 58 ++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMax.java
| 60 ++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMin.java
| 62 ++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieVisitor.java
| 52 ++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Timer.java
| 74 +++
examples/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/VisitorImpl.java
| 62 ++
examples/local/.cvsignore
| 2
examples/local/build.xml
| 91 ++++
examples/local/src/cfg/local.xml
| 18
examples/local/src/fractal/org/objectweb/gotm/jts/local/FcApplication.fractal
| 24 +
examples/local/src/fractal/org/objectweb/gotm/jts/local/FcExplorer.fractal
| 14
examples/local/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
| 14
examples/local/src/java/org/objectweb/gotm/jts/local/Counter.java
| 55 ++
examples/local/src/java/org/objectweb/gotm/jts/local/CounterAttributes.java
| 53 ++
examples/local/src/java/org/objectweb/gotm/jts/local/CounterImpl.java
| 201 +++++++++
examples/local/src/java/org/objectweb/gotm/jts/local/InvokeRunnableAction.java
| 79 +++
examples/local/src/java/org/objectweb/gotm/jts/local/JtaClient.java
| 202 +++++++++
src/cfg/JTA.xml
| 25 -
src/java/org/objectweb/gotm/lib/jta/SynchronizationImpl.java
| 14
src/java/org/objectweb/gotm/lib/jta/XAResourceImpl.java
| 12
src/xml/JTA.xml
| 25 +
100 files changed, 2526 insertions(+), 2535 deletions(-)
Index: gotm-jts/.classpath
diff -u gotm-jts/.classpath:1.7 gotm-jts/.classpath:1.8
--- gotm-jts/.classpath:1.7 Tue Apr 19 11:38:09 2005
+++ gotm-jts/.classpath Tue Jun 28 10:02:28 2005
@@ -1,96 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="src/fractal">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="example/benchmark/src/fractal">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="example/benchmark/src/java">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="example/local/src/java">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="example/local/src/fractal">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="test/java">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/ow-transaction">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/gotm">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/gotm-explorer">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="example/benchmark/lib/jotm/jotm.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/fractal-pool">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="lib/jta/jta-1_01.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib"
path="/fractal-import/lib/fractal/fractal.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib"
path="/fractal-import/lib/utils/ow_util_trace.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib"
path="/fractal-import/lib/fractal-adl/fractal-adl.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib"
path="/fractal-import/lib/monolog/ow_monolog.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="/fractal-template">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib"
path="example/local/output/build/lib/ow-gotm.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/browser.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/fractal-browser.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/fractal-plugin.jar">
- <attributes>
- </attributes>
- </classpathentry>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="examples/benchmark/src/fractal"/>
+ <classpathentry kind="src" path="examples/benchmark/src/java"/>
+ <classpathentry kind="src" path="examples/local/src/fractal"/>
+ <classpathentry kind="src" path="examples/local/src/java"/>
+ <classpathentry kind="src" path="src/fractal"/>
+ <classpathentry kind="src" path="test/java"/>
+ <classpathentry kind="src" path="/ow-transaction"/>
+ <classpathentry kind="src" path="/gotm"/>
+ <classpathentry kind="src" path="/gotm-explorer"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" path="/fractal-pool"/>
+ <classpathentry kind="lib" path="lib/jta/jta-1_01.jar"/>
+ <classpathentry kind="lib"
path="/fractal-import/lib/fractal/fractal.jar"/>
+ <classpathentry kind="lib"
path="/fractal-import/lib/utils/ow_util_trace.jar"/>
+ <classpathentry kind="lib"
path="/fractal-import/lib/fractal-adl/fractal-adl.jar"/>
+ <classpathentry kind="lib"
path="/fractal-import/lib/monolog/ow_monolog.jar"/>
+ <classpathentry kind="src" path="/fractal-template"/>
+ <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/browser.jar"/>
+ <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/fractal-browser.jar"/>
+ <classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/fractal-plugin.jar"/>
+ <classpathentry kind="lib"
path="examples/benchmark/lib/jotm/jotm.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Index: gotm-jts/.cvsignore
diff -u gotm-jts/.cvsignore:1.3 gotm-jts/.cvsignore:1.4
--- gotm-jts/.cvsignore:1.3 Tue Apr 19 11:38:09 2005
+++ gotm-jts/.cvsignore Tue Jun 28 10:02:28 2005
@@ -1,3 +1,5 @@
build
output
files*
+alias.xml
+build.properties
Index: gotm-jts/.settings/org.eclipse.core.resources.prefs
diff -u gotm-jts/.settings/org.eclipse.core.resources.prefs:1.5
gotm-jts/.settings/org.eclipse.core.resources.prefs:1.6
--- gotm-jts/.settings/org.eclipse.core.resources.prefs:1.5 Mon May 23
13:21:01 2005
+++ gotm-jts/.settings/org.eclipse.core.resources.prefs Tue Jun 28 10:02:28
2005
@@ -1,11 +1,11 @@
-#Wed Apr 20 19:34:45 CEST 2005
+#Mon Jun 27 16:47:12 CEST 2005
eclipse.preferences.version=1
-encoding//example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcApplication.fractal=ISO-8859-1
-encoding//example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcExplorer.fractal=ISO-8859-1
-encoding//example/benchmark/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal=ISO-8859-1
-encoding//example/local/src/fractal/org/objectweb/gotm/jts/local/FcApplication.fractal=ISO-8859-1
-encoding//example/local/src/fractal/org/objectweb/gotm/jts/local/FcExplorer.fractal=ISO-8859-1
-encoding//example/local/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal=ISO-8859-1
+encoding//examples/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcApplication.fractal=ISO-8859-1
+encoding//examples/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcExplorer.fractal=ISO-8859-1
+encoding//examples/benchmark/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal=ISO-8859-1
+encoding//examples/local/src/fractal/org/objectweb/gotm/jts/local/FcApplication.fractal=ISO-8859-1
+encoding//examples/local/src/fractal/org/objectweb/gotm/jts/local/FcExplorer.fractal=ISO-8859-1
+encoding//examples/local/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal=ISO-8859-1
encoding//src/fractal/org/objectweb/gotm/lib/FcTransactionManagerImpl.fractal=ISO-8859-1
encoding//src/fractal/org/objectweb/gotm/lib/TpJTSImpl.fractal=ISO-8859-1
encoding//src/fractal/org/objectweb/gotm/lib/TpManagerImpl.fractal=ISO-8859-1
Index: gotm-jts/build.xml
diff -u gotm-jts/build.xml:1.5 gotm-jts/build.xml:1.6
--- gotm-jts/build.xml:1.5 Wed Mar 2 16:27:50 2005
+++ gotm-jts/build.xml Tue Jun 28 10:02:28 2005
@@ -21,7 +21,7 @@
<!-- Initial developer(s): Romain Rouvoy. -->
<!-- Contributor(s): ______________________________________. -->
-<!-- $Id: build.xml,v 1.5 2005/03/02 15:27:50 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.6 2005/06/28 08:02:28 rouvoy Exp $ -->
<!-- ==================================================================== -->
<project name="GoTM JTS" default="all">
@@ -35,30 +35,60 @@
<property name="jts.version" value="0.2"/>
<property name="jts.dist" value="GoTM-JTS"/>
+ <property name="dist-src" value="${jts.dist}-${jts.version}-src" />
+ <property name="dist-bin" value="${jts.dist}-${jts.version}-bin" />
+
+ <property name="dist-src.dir" value="${dist.dir}/${dist-src}" />
+ <property name="dist-bin.dir" value="${dist.dir}/${dist-bin}" />
+
+
<!-- ================ -->
<!-- PATH DEFINITIONS -->
<!-- ================ -->
<path id="classpath">
- <fileset dir="${build.dir}/${lib.dir}" includes="**/*.jar"/>
+ <fileset dir="${basedir}" includes="${lib.dir}/**/*.jar"/>
+ <fileset dir="${build.dir}" includes="${lib.dir}/**/*.jar"/>
</path>
- <!-- ================== -->
- <!-- TARGET DEFINITIONS -->
- <!-- ================== -->
+
+ <!-- ======================= -->
+ <!-- MAIN TARGET DEFINITIONS -->
+ <!-- ======================= -->
+
<target name="all" description="clean + import">
- <antcall target="clean"/>
- <antcall target="import"/>
+ <antcall target="clean" />
+ <antcall target="import" />
+ </target>
+
+ <target name="import" depends="jts-build,clear"
+ description="Imports the GoTM JTS module."/>
+
+ <target name="export" depends="-jts-prepare"
+ description="Exports the module into the ${dist.dir} directory">
+ <mkdir dir="${dist-src.dir}" />
+ <copy todir="${dist-src.dir}">
+ <fileset dir="${basedir}" includes="**/*.*" excludes="output/**"/>
+ <fileset dir="${build.dir}" includes="**/*.*"/>
+ </copy>
</target>
- <target name="-jts-prepare" depends="-gotm.explorer">
+ <target name="distrib"
+ depends="jts-dist-src,jts-dist-bin"
+ description="build all distributions" />
+
+
+ <!-- ====================== -->
+ <!-- SUB TARGET DEFINITIONS -->
+ <!-- ====================== -->
+
+ <target name="-jts-prepare" depends="copy-alias,-gotm.explorer">
<copy todir="${build.dir}/${lib.dir}">
<mapper type="flatten"/>
<fileset dir="${basedir}/${lib.dir}" includes="**/*"/>
</copy>
</target>
- <target name="jts-compile" depends="-jts-prepare"
- description="Compiles GoTM Java personalities">
+ <target name="jts-compile" depends="-jts-prepare">
<mkdir dir="${build.dir}/${class.dir}"/>
<java.c srcdir="${basedir}/${src.dir}/${java.dir}" />
<copy todir="${build.dir}/${class.dir}">
@@ -66,8 +96,7 @@
</copy>
</target>
- <target name="jts-build" depends="jts-compile,fractal-adl"
- description="build GoTM Java personalities">
+ <target name="jts-build" depends="jts-compile,fractal-adl">
<jar destfile="${build.dir}/${lib.dir}/${jts.jar}">
<fileset dir="${build.dir}/${class.dir}">
<include name="**/*"/>
@@ -77,5 +106,23 @@
<delete dir="${build.dir}/${class.dir}"/>
</target>
- <target name="import" depends="jts-build,clear"/>
+ <target name="jts-jdoc"
+ depends="-jts-prepare"
+ description="Generates the javadoc.">
+ <java.doc/>
+ </target>
+
+ <target name="jts-dist-src" depends="export">
+ <archive dir="${dist.dir}" includes="${dist-src}"/>
+ </target>
+
+ <target name="jts-dist-bin"
+ depends="jts-build,jts-jdoc">
+ <mkdir dir="${dist-bin.dir}" />
+ <copy todir="${dist-bin.dir}">
+ <fileset dir="${build.dir}" includes="${doc.dir}/**/*" />
+ <fileset dir="${build.dir}" includes="${lib.dir}/**/*" />
+ </copy>
+ <archive dir="${dist.dir}" includes="${dist-bin}"/>
+ </target>
</project>
Index: gotm-jts/example/benchmark/.cvsignore
diff -u gotm-jts/example/benchmark/.cvsignore:1.2
gotm-jts/example/benchmark/.cvsignore:removed
--- gotm-jts/example/benchmark/.cvsignore:1.2 Tue Apr 19 11:38:09 2005
+++ gotm-jts/example/benchmark/.cvsignore Tue Jun 28 10:02:31 2005
@@ -1,2 +0,0 @@
-build
-output
Index: gotm-jts/example/benchmark/build.xml
diff -u gotm-jts/example/benchmark/build.xml:1.5
gotm-jts/example/benchmark/build.xml:removed
--- gotm-jts/example/benchmark/build.xml:1.5 Mon May 23 13:21:01 2005
+++ gotm-jts/example/benchmark/build.xml Tue Jun 28 10:02:31 2005
@@ -1,99 +0,0 @@
-<!-- ==================================================================== -->
-
-<!-- ObjectWeb GoTM is an open Tx Monitor Project -->
-<!-- Contact: http://www.objectweb.org -->
-
-<!-- This library is free software; you can redistribute it and/or -->
-<!-- modify it under the terms of the GNU Lesser General Public -->
-<!-- License as published by the Free Software Foundation; either -->
-<!-- version 2.1 of the License, or any later version. -->
-
-<!-- This library is distributed in the hope that it will be useful, -->
-<!-- but WITHOUT ANY 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 along with this library; if not, write to the Free Software -->
-<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
-<!-- USA -->
-
-<!-- Initial developer(s): Romain Rouvoy. -->
-<!-- Contributor(s): ______________________________________. -->
-
-<!-- $Id: build.xml,v 1.5 2005/05/23 11:21:01 rouvoy Exp $ -->
-<!-- ==================================================================== -->
-
-<project name="JTS Benchmark" default="all">
- <description>GoTM JTS Benchmark [gotm.objectweb.org] - GoTM is an open
Transaction Monitor</description>
-
- <!-- ==================== -->
- <!-- PROPERTY DEFINITIONS -->
- <!-- ==================== -->
- <import file="${basedir}/../../../fractal-import/build.xml"/>
- <property name="examples.jar" value="ow-gotm-jts-benchmark.jar"/>
- <property name="examples.version" value="0.1a"/>
- <property name="dist.name" value="GoTM-JTS-Benchmark"/>
-
- <!-- ================ -->
- <!-- PATH DEFINITIONS -->
- <!-- ================ -->
- <path id="classpath">
- <fileset dir="${build.dir}/${lib.dir}" includes="**/*.jar"/>
- </path>
-
- <!-- ================== -->
- <!-- TARGET DEFINITIONS -->
- <!-- ================== -->
- <target name="all" description="clean + execute">
- <antcall target="clean"/>
- <antcall target="execute"/>
- </target>
-
- <target name="-bench-prepare" depends="-gotm.jts">
- <copy todir="${build.dir}/${lib.dir}">
- <mapper type="flatten"/>
- <fileset dir="${basedir}/${lib.dir}" includes="**/*.*"/>
- </copy>
- </target>
-
- <target name="bench-compile" depends="-bench-prepare">
- <mkdir dir="${build.dir}/${class.dir}"/>
- <java.c srcdir="${basedir}/${src.dir}/${java.dir}"/>
- <copy todir="${build.dir}/${class.dir}">
- <fileset dir="${basedir}/${src.dir}/${cfg.dir}" includes="**/*"/>
- </copy>
- <copy todir="${build.dir}/${class.dir}">
- <fileset dir="${build.dir}/${cfg.dir}" includes="**/*"/>
- </copy>
- </target>
-
- <target name="bench-build" depends="bench-compile,fractal-adl">
- <jar destfile="${build.dir}/${lib.dir}/${examples.jar}">
- <fileset dir="${build.dir}/${class.dir}" includes="**/*"/>
- </jar>
- </target>
-
- <target name="import" depends="bench-build,clear"/>
-
- <target name="execute" depends="import"
- description="run local JTS example">
- <property name="julia.cfg" value="${build.dir}/${cfg.dir}/julia.cfg"/>
- <property name="cache.cfg" value="${build.dir}/${cfg.dir}/cache.cfg"/>
- <java classname="org.objectweb.fractal.adl.Launcher"
- classpathref="classpath"
- fork="yes"
- failonerror="yes">
- <sysproperty key="fractal.provider"
- value="org.objectweb.fractal.julia.Julia"/>
- <sysproperty key="julia.loader"
- value="org.objectweb.fractal.julia.loader.DynamicLoader" />
- <sysproperty key="julia.config"
- value="${julia.cfg},${cache.cfg}" />
-<!-- <jvmarg line="-XX:NewSize=128m -XX:MaxNewSize=128m
-XX:SurvivorRatio=8 -Xms512m -Xmx512m"/>-->
-<!-- <jvmarg
line="-Xbootclasspath/p:${build.dir}/${lib.dir}/thread.jar"/>-->
- <arg line=" -fractal org.objectweb.gotm.jts.benchmark.FcApplication
r"/>
- <!-- <arg line="-fractal org.objectweb.gotm.lib.xid.FcXidStateFctr
r"/> -->
- </java>
- </target>
-</project>
\ No newline at end of file
Index: gotm-jts/example/benchmark/lib/carol/carol.jar
cvs rdiff: failed to read diff file header /tmp/cvs2JMI4B for carol.jar,v:
end of file
Index: gotm-jts/example/benchmark/lib/cli/commons-cli.jar
cvs rdiff: failed to read diff file header /tmp/cvsryxBuE for
commons-cli.jar,v: end of file
Index: gotm-jts/example/benchmark/lib/cli/commons-logging.jar
cvs rdiff: failed to read diff file header /tmp/cvsQ8O4Ly for
commons-logging.jar,v: end of file
Index: gotm-jts/example/benchmark/lib/jotm/jonas_timer.jar
cvs rdiff: failed to read diff file header /tmp/cvsfrJyXz for
jonas_timer.jar,v: end of file
Index: gotm-jts/example/benchmark/lib/jotm/jotm.jar
cvs rdiff: failed to read diff file header /tmp/cvssD1o6A for jotm.jar,v: end
of file
Index: gotm-jts/example/benchmark/lib/jotm/jotm_iiop_stubs.jar
cvs rdiff: failed to read diff file header /tmp/cvsVpoWlJ for
jotm_iiop_stubs.jar,v: end of file
Index: gotm-jts/example/benchmark/lib/jotm/jotm_jrmp_stubs.jar
cvs rdiff: failed to read diff file header /tmp/cvsoWOjLK for
jotm_jrmp_stubs.jar,v: end of file
Index: gotm-jts/example/benchmark/lib/log4j/log4j.jar
cvs rdiff: failed to read diff file header /tmp/cvs95cyIL for log4j.jar,v:
end of file
Index: gotm-jts/example/benchmark/lib/spec/jta-spec1_0_1.jar
cvs rdiff: failed to read diff file header /tmp/cvsUXzqGH for
jta-spec1_0_1.jar,v: end of file
Index: gotm-jts/example/benchmark/lib/spec/jts1_0.jar
cvs rdiff: failed to read diff file header /tmp/cvsnohqHP for jts1_0.jar,v:
end of file
Index: gotm-jts/example/benchmark/lib/xapool/objectweb-datasource.jar
cvs rdiff: failed to read diff file header /tmp/cvserI8zR for
objectweb-datasource.jar,v: end of file
Index: gotm-jts/example/benchmark/lib/xapool/xapool.jar
cvs rdiff: failed to read diff file header /tmp/cvsb3f2CS for xapool.jar,v:
end of file
Index: gotm-jts/example/benchmark/src/cfg/benchmark.xml
diff -u gotm-jts/example/benchmark/src/cfg/benchmark.xml:1.1
gotm-jts/example/benchmark/src/cfg/benchmark.xml:removed
--- gotm-jts/example/benchmark/src/cfg/benchmark.xml:1.1 Wed Mar 2
16:27:50 2005
+++ gotm-jts/example/benchmark/src/cfg/benchmark.xml Tue Jun 28 10:02:31
2005
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<browser>
-
- <include url="JTA.xml" />
-
- <!-- ================================================================= -->
- <!-- Main -->
- <!-- ================================================================= -->
- <node type-name="java.lang.Runnable">
- <menu>
- <item label="Run">
- <code>org.objectweb.gotm.jts.benchmark.InvokeRunnableAction</code>
- </item>
- </menu>
- </node>
-
-</browser>
\ No newline at end of file
Index:
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcApplication.fractal
diff -u
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcApplication.fractal:1.2
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcApplication.fractal:removed
---
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcApplication.fractal:1.2
Wed Feb 23 18:39:47 2005
+++
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcApplication.fractal
Tue Jun 28 10:02:31 2005
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE definition PUBLIC
- "-//objectweb.org//DTD Fractal ADL 2.0//EN"
- "classpath://org/objectweb/fractal/adl/xml/basic.dtd">
-
-<definition name="org.objectweb.gotm.jts.benchmark.FcApplication">
-
- <interface name="r" role="server"
- signature="java.lang.Runnable"/>
-
- <component name="FcClient"
- definition="org.objectweb.gotm.jts.benchmark.FcJtaClient"/>
- <component name="FcScenario"
-
definition="org.objectweb.gotm.jts.benchmark.FcTransactionScenarioImpl"/>
- <component name="FcCounter"
- definition="org.objectweb.gotm.jts.benchmark.TpCounterImpl"/>
- <component name="FcTransactionManager"
- definition="org.objectweb.gotm.lib.FcTransactionManagerImpl"/>
-
- <binding client="this.r"
- server="FcClient.runnable"/>
- <binding client="FcClient.transaction-manager"
- server="FcTransactionManager.transaction-manager"/>
- <binding client="FcClient.scenario"
- server="FcScenario.scenario"/>
- <binding client="FcScenario.counter"
- server="FcCounter.component"/>
-</definition>
\ No newline at end of file
Index:
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcExplorer.fractal
diff -u
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcExplorer.fractal:1.1
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcExplorer.fractal:removed
---
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcExplorer.fractal:1.1
Fri Jan 14 17:56:03 2005
+++
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/jts/benchmark/FcExplorer.fractal
Tue Jun 28 10:02:31 2005
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE definition PUBLIC
- "-//objectweb.org//DTD Fractal ADL 2.0//EN"
- "classpath://org/objectweb/fractal/adl/xml/basic.dtd">
-
-<definition name="org.objectweb.gotm.jts.benchmark.FcExplorer">
- <component name="FcExplorer"
- definition="org.objectweb.gotm.lib.FcExplorerImpl"/>
- <component name="FcApplication"
- definition="org.objectweb.gotm.jts.benchmark.FcApplication"/>
-
- <binding client="FcExplorer.fcAppl"
- server="FcApplication.component"/>
-</definition>
\ No newline at end of file
Index:
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
diff -u
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal:1.3
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal:removed
---
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal:1.3
Wed Mar 2 16:27:51 2005
+++
gotm-jts/example/benchmark/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
Tue Jun 28 10:02:31 2005
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN"
"classpath://org/objectweb/fractal/adl/xml/standard.dtd">
-<!--<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN"
"classpath://org/objectweb/fractal/adl/xml/basic.dtd">-->
-
-<definition name="org.objectweb.gotm.lib.FcExplorerImpl">
- <interface name="fcAppl" role="client"
- signature="org.objectweb.fractal.api.Component" />
-
- <content class="BrowserImpl"/>
-
- <attributes signature="BrowserAttributes">
- <attribute value="benchmark.xml" name="ConfigFiles"/>
- </attributes>
-</definition>
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/ClientAttributeController.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/ClientAttributeController.java:1.1
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/ClientAttributeController.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/ClientAttributeController.java:1.1
Wed Feb 23 18:39:46 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/ClientAttributeController.java
Tue Jun 28 10:02:31 2005
@@ -1,50 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: ClientAttributeController.java,v 1.1 2005/02/23 17:39:46 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark;
-
-import org.objectweb.fractal.api.control.AttributeController;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 10 janv. 2005
- * @modified $Date: 2005/02/23 17:39:46 $
- * @version $Revision: 1.1 $
- */
-public interface ClientAttributeController
-extends AttributeController
-{
- /**
- * @param nb the number of benchmark iteration to perform.
- */
- public void setIterations(int nb);
-
- /**
- * @return the number of benchmark iteration performed.
- */
- public int getIterations();
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/Counter.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/Counter.java:1.1
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/Counter.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/Counter.java:1.1
Fri Jan 14 17:56:02 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/Counter.java
Tue Jun 28 10:02:31 2005
@@ -1,55 +0,0 @@
-/*====================================================================
-
- ObjectWeb GoTM project - http://gotm.objectweb.org
- Contact: gotm@xxxxxxxxxxxxx
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY 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 along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA
-
- Initial developer(s): Romain Rouvoy.
- Contributor(s): ______________________________________.
-
- ---------------------------------------------------------------------
- $Id: Counter.java,v 1.1 2005/01/14 16:56:02 rouvoy Exp $
- ====================================================================*/
-
-package org.objectweb.gotm.jts.benchmark;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 6 janv. 2005
- * @modified $Date: 2005/01/14 16:56:02 $
- * @version $Revision: 1.1 $
- * @fractal.itf name="counter"
- */
-public interface Counter {
- /** Comment for <code>COUNTER</code>. */
- public static final String COUNTER = "counter";
-
- /**
- * Initialize the counter value.
- */
- public void init();
-
- /**
- * Increment the value of the counter.
- */
- public void incr();
-
- /**
- * @return the value of the counter.
- */
- public int value();
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterAttributes.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterAttributes.java:1.1
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterAttributes.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterAttributes.java:1.1
Fri Jan 14 17:56:02 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterAttributes.java
Tue Jun 28 10:02:31 2005
@@ -1,53 +0,0 @@
-/*====================================================================
-
- ObjectWeb GoTM project - http://gotm.objectweb.org
- Contact: gotm@xxxxxxxxxxxxx
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY 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 along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA
-
- Initial developer(s): Romain Rouvoy.
- Contributor(s): ______________________________________.
-
- ---------------------------------------------------------------------
- $Id: CounterAttributes.java,v 1.1 2005/01/14 16:56:02 rouvoy Exp $
- ====================================================================*/
-
-package org.objectweb.gotm.jts.benchmark;
-
-import org.objectweb.fractal.api.control.AttributeController;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 6 janv. 2005
- * @modified $Date: 2005/01/14 16:56:02 $
- * @version $Revision: 1.1 $
- * @fractal.controller name="attribute"
- */
-public interface CounterAttributes
- extends AttributeController
-{
- /**
- * @return the value of the counter.
- */
- public int getCounter() ;
-
-
- /**
- * Defines the value of the counter.
- * @param value the value to set
- */
- public void setCounter(int value) ;
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterImpl.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterImpl.java:1.4
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterImpl.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterImpl.java:1.4
Mon May 23 13:21:00 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/CounterImpl.java
Tue Jun 28 10:02:31 2005
@@ -1,211 +0,0 @@
-/*====================================================================
-
- ObjectWeb GoTM project - http://gotm.objectweb.org
- Contact: gotm@xxxxxxxxxxxxx
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY 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 along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA
-
- Initial developer(s): Romain Rouvoy.
- Contributor(s): ______________________________________.
-
- ---------------------------------------------------------------------
- $Id: CounterImpl.java,v 1.4 2005/05/23 11:21:00 rouvoy Exp $
- ====================================================================*/
-
-package org.objectweb.gotm.jts.benchmark;
-
-import javax.transaction.Status;
-import javax.transaction.Synchronization;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
-import org.objectweb.fractal.lib.LoggablePrimitive;
-import org.objectweb.gotm.jts.benchmark.Counter;
-import org.objectweb.gotm.jts.benchmark.CounterAttributes;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 3 janv. 2005
- * @modified $Date: 2005/05/23 11:21:00 $
- * @version $Revision: 1.4 $
- * @fractal.itf name="synchronization" role="server"
signature="javax.transaction.Synchronization"
- * @fractal.itf name="xa-resource" role="server"
signature="javax.transaction.xa.XAResource"
- */
-public class CounterImpl
- extends LoggablePrimitive
- implements Synchronization,
- XAResource,
- Counter,
- CounterAttributes
-{
- /**
- * @fractal.attr value="0"
- */
- private int counter ;
-
- /** <code>clone</code> . */
- private int clone ;
-
- /**
- *
- */
- public CounterImpl() {
- this.counter = this.clone = 0 ;
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.Synchronization#beforeCompletion()
- */
- public void beforeCompletion() {
-// getLogger().log(DEBUG,"Receiving beforeCompletion()...");
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.Synchronization#afterCompletion(int)
- */
- public void afterCompletion(int arg0) {
-// getLogger().log(DEBUG,"Receiving afterCompletion("+arg0+")...");
-// try {
-// Thread.sleep(1);
-// } catch (InterruptedException e) {
-// e.printStackTrace();
-// }
- if (arg0 == Status.STATUS_COMMITTED) {
- this.counter += this.clone ;
- }
- this.clone = 0 ;
- }
-
- /* (non-Javadoc)
- * @see org.objectweb.gotm.jts.local.Counter#init()
- */
- public void init() {
- this.counter = this.clone = 0 ;
- }
-
- /* (non-Javadoc)
- * @see org.objectweb.gotm.jts.local.Counter#incr()
- */
- public void incr() {
- this.clone++ ;
-// try {
-// Thread.sleep(10);
-// } catch (InterruptedException e) {
-// e.printStackTrace();
-// }
- }
-
- public String toString() {
- return ""+this.counter;
- }
-
- /* (non-Javadoc)
- * @see org.objectweb.gotm.jts.local.CounterAttributes#getCounter()
- */
- public int getCounter() {
- return this.counter;
- }
-
- /* (non-Javadoc)
- * @see org.objectweb.gotm.jts.local.CounterAttributes#setCounter(int)
- */
- public void setCounter(int value) {
- this.counter = value ;
- }
-
- /* (non-Javadoc)
- * @see org.objectweb.gotm.jts.local.Counter#value()
- */
- public int value() {
- return this.counter+this.clone;
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.xa.XAResource#commit(javax.transaction.xa.Xid,
boolean)
- */
- public void commit(Xid arg0, boolean arg1) {
-// getLogger().log(DEBUG,"Receiving setTransactionTimeout("+arg0+")");
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.xa.XAResource#end(javax.transaction.xa.Xid,
int)
- */
- public void end(Xid arg0, int arg1) {
-// getLogger().log(DEBUG,"Receiving end("+arg0+", "+arg1+")");
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.xa.XAResource#forget(javax.transaction.xa.Xid)
- */
- public void forget(Xid arg0) {
-// getLogger().log(DEBUG,"Receiving forget("+arg0+")");
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.xa.XAResource#getTransactionTimeout()
- */
- public int getTransactionTimeout() {
-// getLogger().log(DEBUG,"Receiving getTransactionTimeout()");
- return 0;
- }
-
- /* (non-Javadoc)
- * @see
javax.transaction.xa.XAResource#isSameRM(javax.transaction.xa.XAResource)
- */
- public boolean isSameRM(XAResource arg0) {
-// getLogger().log(DEBUG,"Receiving setTransactionTimeout("+arg0+")");
- return false;
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.xa.XAResource#prepare(javax.transaction.xa.Xid)
- */
- public int prepare(Xid arg0) {
-// getLogger().log(DEBUG,"Receiving prepare("+arg0+")");
- return XA_OK;
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.xa.XAResource#recover(int)
- */
- public Xid[] recover(int arg0) {
-// getLogger().log(DEBUG,"Receiving recover("+arg0+")");
- return null;
- }
-
- /* (non-Javadoc)
- * @see
javax.transaction.xa.XAResource#rollback(javax.transaction.xa.Xid)
- */
- public void rollback(Xid arg0) {
-// getLogger().log(DEBUG,"Receiving rollback("+arg0+")");
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.xa.XAResource#setTransactionTimeout(int)
- */
- public boolean setTransactionTimeout(int arg0) {
-// getLogger().log(DEBUG,"Receiving setTransactionTimeout("+arg0+")");
- return false;
- }
-
- /* (non-Javadoc)
- * @see javax.transaction.xa.XAResource#start(javax.transaction.xa.Xid,
int)
- */
- public void start(Xid arg0, int arg1) {
-// getLogger().log(DEBUG,"Receiving start("+arg0+", "+arg1+")");
- }
-
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/InvokeRunnableAction.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/InvokeRunnableAction.java:1.1
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/InvokeRunnableAction.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/InvokeRunnableAction.java:1.1
Fri Jan 14 17:56:02 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/InvokeRunnableAction.java
Tue Jun 28 10:02:31 2005
@@ -1,79 +0,0 @@
-/*===========================================================================
-
-ObjectWeb Naming Context Framework
-Copyright (C) 2003 USTL - LIFL - GOAL
-Contact: openccm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Jerome Moroy.
-Contributor(s): ______________________________________.
-
-===========================================================================*/
-
-package org.objectweb.gotm.jts.benchmark;
-import org.objectweb.util.browser.api.MenuItem;
-import org.objectweb.util.browser.api.MenuItemTreeView;
-import org.objectweb.util.browser.api.TreeView;
-
-/**
- * This action allows to invoke the main method of the demo.
- * @author <a href="mailto:Jerome.Moroy@xxxxxxx";>Jerome Moroy</a>
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 3 janv. 2005
- * @modified $Date: 2005/01/14 16:56:02 $
- * @version $Revision: 1.1 $
- */
-public class InvokeRunnableAction
- implements MenuItem
-{
- /* (non-Javadoc)
- * @see
org.objectweb.util.browser.api.MenuItem#actionPerformed(org.objectweb.util.browser.api.MenuItemTreeView)
- */
- public void actionPerformed(MenuItemTreeView e) {
- Runnable m = (Runnable)e.getSelectedObject();
- InvokeThread t = new InvokeThread(m);
- t.start();
- }
-
- /* (non-Javadoc)
- * @see
org.objectweb.util.browser.api.MenuItem#getStatus(org.objectweb.util.browser.api.TreeView)
- */
- public int getStatus(TreeView treeView) {
- return MenuItem.ENABLED_STATUS;
- }
-
- /**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 3 janv. 2005
- * @modified $Date: 2005/01/14 16:56:02 $
- * @version $Revision: 1.1 $
- */
- public class InvokeThread extends Thread {
- protected Runnable m_ = null;
-
- /**
- * @param m action to run.
- */
- public InvokeThread(Runnable m) {
- this.m_ = m;
- }
-
- public void run() {
- this.m_.run();
- }
- }
-}
\ No newline at end of file
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/JtaClient.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/JtaClient.java:1.4
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/JtaClient.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/JtaClient.java:1.4
Mon May 23 13:21:00 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/JtaClient.java
Tue Jun 28 10:02:31 2005
@@ -1,156 +0,0 @@
-/*====================================================================
-
- ObjectWeb GoTM project - http://gotm.objectweb.org
- Contact: gotm@xxxxxxxxxxxxx
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY 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 along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA
-
- Initial developer(s): Romain Rouvoy.
- Contributor(s): ______________________________________.
-
- ---------------------------------------------------------------------
- $Id: JtaClient.java,v 1.4 2005/05/23 11:21:00 rouvoy Exp $
- ====================================================================*/
-
-package org.objectweb.gotm.jts.benchmark;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.transaction.TransactionManager;
-
-import org.objectweb.fractal.lib.BindablePrimitive;
-import org.objectweb.gotm.jts.benchmark.tools.Collector;
-import org.objectweb.gotm.jts.benchmark.tools.Scenario;
-import org.objectweb.jotm.Jotm;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 3 janv. 2005
- * @modified $Date: 2005/05/23 11:21:00 $
- * @version $Revision: 1.4 $
- * @fractal.itf name="runnable" signature="java.lang.Runnable"
- * @fractal.itf name="transaction-manager" role="client"
signature="javax.transaction.TransactionManager"
- * @fractal.itf name="scenario" role="client"
signature="org.objectweb.gotm.jts.benchmark.tools.Scenario"
- */
-public class JtaClient
- extends BindablePrimitive
- implements Runnable, ClientAttributeController
-{
- /** Fractal ADL Identifier for the <code>TX_MANAGER</code> interface. */
- public static final String TX_MANAGER = "transaction-manager";
-
- /* (non-Javadoc)
- * @see org.objectweb.gotm.lib.BindingFeature#clientFc()
- */
- public String[] clientFc() {
- return new String[] {TX_MANAGER, Scenario.SCENARIO};
- }
-
- /**
- * @fractal.attr value="1000"
- */
- private int iterations ;
-
- private Jotm jotm = null;
-
- /* (non-Javadoc)
- * @see
org.objectweb.gotm.jts.benchmark.ClientAttributeController#setIteration(int)
- */
- public void setIterations(int nb) {
- this.iterations = nb ;
- }
-
- /* (non-Javadoc)
- * @see
org.objectweb.gotm.jts.benchmark.ClientAttributeController#getIteration()
- */
- public int getIterations() {
- return this.iterations;
- }
-
- /**
- * @return the associated transaction manager.
- */
- protected TransactionManager getTransactionManager() {
- return (TransactionManager) fcBindings.get(TX_MANAGER);
- }
-
- /**
- * @return the associated scenario.
- */
- protected Scenario getScenario() {
- return (Scenario) fcBindings.get(Scenario.SCENARIO);
- }
-
-
- /**
- * @param tm
- * @return the collector containing all the results.
- */
- private Collector run(TransactionManager tm) {
- Map config = new HashMap();
- config.put("tm",tm);
-// int nb = 5;
- for (int nb=5000 ; nb<=50000 ; nb+=5000) {
- Collector collect = new Collector();
- config.put("collector", collect);
- config.put("nb", new Integer(nb));
-
- config.put("commit",Boolean.FALSE);
- getScenario().init(config);
- for (int i=0 ; i < getIterations() ; i++) {
- getScenario().run();
- }
-
- config.put("commit",Boolean.TRUE);
- getScenario().init(config);
- for (int i=0 ; i < getIterations() ; i++) {
- getScenario().run();
- }
- System.out.println("* Results for "+nb+":\n"+collect);
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Runnable#run()
- */
- public void run() {
- System.out.println("Running Scenarios:");
-
- System.out.println("GoTM:");
- run(getTransactionManager());
-
- System.out.println("JOTM:");
- try {
- this.jotm = new Jotm(true, false);
- } catch (NamingException e) {
- e.printStackTrace();
- }
- run(this.jotm.getTransactionManager());
- this.jotm.stop();
-
-// run(null);
- System.exit(0);
- }
-
- /**
- * @param args command line arguments
- */
- public static void main(String[] args) {
- new JtaClient().run();
- }
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioAttributeController.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioAttributeController.java:1.1
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioAttributeController.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioAttributeController.java:1.1
Wed Feb 23 18:39:46 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioAttributeController.java
Tue Jun 28 10:02:31 2005
@@ -1,50 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: TransactionScenarioAttributeController.java,v 1.1 2005/02/23 17:39:46
rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark;
-
-import org.objectweb.fractal.api.control.AttributeController;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 24 janv. 2005
- * @modified $Date: 2005/02/23 17:39:46 $
- * @version $Revision: 1.1 $
- */
-public interface TransactionScenarioAttributeController
-extends AttributeController
-{
- /**
- * @param nb the number of transactional components to allocate.
- */
- public void setComponents(int nb) ;
-
- /**
- * @return the number of transactional components allocated.
- */
- public int getComponents();
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioImpl.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioImpl.java:1.3
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioImpl.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioImpl.java:1.3
Mon May 23 13:21:00 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/TransactionScenarioImpl.java
Tue Jun 28 10:02:31 2005
@@ -1,194 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: TransactionScenarioImpl.java,v 1.3 2005/05/23 11:21:00 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark;
-
-import java.util.Map;
-import java.util.Vector;
-
-import javax.transaction.Synchronization;
-import javax.transaction.TransactionManager;
-import javax.transaction.xa.XAResource;
-
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.lib.BindablePrimitive;
-import org.objectweb.gotm.jts.benchmark.tools.Collector;
-import org.objectweb.gotm.jts.benchmark.tools.Scenario;
-import org.objectweb.gotm.jts.benchmark.tools.Timer;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 24 janv. 2005
- * @modified $Date: 2005/05/23 11:21:00 $
- * @version $Revision: 1.3 $
- * @fractal.itf name="counter" role="client"
signature="org.objectweb.fractal.api.Component"
- */
-public class TransactionScenarioImpl
-extends BindablePrimitive
-implements Scenario, TransactionScenarioAttributeController
-{
- /**
- * @fractal.attr value="5"
- */
- private int components ;
-
- private Collector collect ;
- private boolean commit ;
- private TransactionManager tm;
-
- private Timer timer ;
- private Vector counters ;
- private int nbres;
-
- /* (non-Javadoc)
- * @see org.objectweb.fractal.lib.BindablePrimitive#clientFc()
- */
- protected String[] clientFc() {
- return new String[] {Counter.COUNTER};
- }
-
- /* (non-Javadoc)
- * @see
org.objectweb.gotm.jts.benchmark.TransactionScenarioAttributeController#setComponents(int)
- */
- public void setComponents(int nb) {
- this.components = nb ;
- }
-
- /* (non-Javadoc)
- * @see
org.objectweb.gotm.jts.benchmark.TransactionScenarioAttributeController#getComponents()
- */
- public int getComponents() {
- return this.components;
- }
-
-
- protected void init(int nb) {
- for (int i=0;i<=nb;i++) {
- Counter counter = new CounterImpl();
- this.counters.add(counter);
- }
- }
- /**
- * @param c
- * @return the component
- */
- protected Component getComponent(int c) {
- return (Component) this.counters.get(c);
- }
-
- /**
- * @param c
- * @return the associated counter.
- */
- protected Counter getCounter(int c) {
- return (Counter) this.counters.get(c);
- }
-
- /**
- * @param c
- * @return the associated synchronization object.
- */
- protected Synchronization getSynchronization(int c) {
- return (Synchronization) this.counters.get(c);
- }
-
- /**
- * @param c
- * @return the associated XA resource object.
- */
- protected XAResource getXAResource(int c) {
- return (XAResource) this.counters.get(c);
- }
-
-
-
- /* (non-Javadoc)
- * @see
org.objectweb.gotm.jts.benchmark.tools.Scenario#init(java.util.Map)
- */
- public void init(Map config) {
- this.collect = (Collector) config.get("collector");
- this.commit = ((Boolean)config.get("commit")).booleanValue();
- this.tm = (TransactionManager)config.get("tm");
- this.nbres = ((Integer)config.get("nb")).intValue();
- this.timer = new Timer();
- this.counters = new Vector();
- init(this.nbres);
- }
-
- /**
- * @param nb
- */
- public void go(int nb) {
- try {
- this.timer.start();
- tm.begin();
-// this.timer.stop();
-// collect.collect("begin()",this.timer.display());
- } catch (Exception e) {
- e.printStackTrace();
- }
-
-// this.timer.start();
- for (int c=0 ; c < nb ; c++) {
- try {
-
tm.getTransaction().registerSynchronization(getSynchronization(c));
- } catch (Exception e) {
- e.printStackTrace();
- }
- getCounter(c).incr();
- getCounter(c).value(); // simulates counter access.
- }
-// this.timer.stop();
-// collect.collect("registerSynchronization()",this.timer.display());
-
- if (commit) {
- try {
-// this.timer.start();
- tm.commit();
- this.timer.stop();
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else {
- try {
-// this.timer.start();
- tm.rollback();
- this.timer.stop();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- collect.collect(commit?"commit()":"rollback()",this.timer.display());
- }
-
- /* (non-Javadoc)
- * @see java.lang.Runnable#run()
- */
- public void run() {
- go(this.nbres);
- }
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Collector.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Collector.java:1.3
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Collector.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Collector.java:1.3
Mon May 23 13:21:00 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Collector.java
Tue Jun 28 10:02:31 2005
@@ -1,101 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: Collector.java,v 1.3 2005/05/23 11:21:00 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark.tools;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 21 janv. 2005
- * @modified $Date: 2005/05/23 11:21:00 $
- * @version $Revision: 1.3 $
- */
-public class Collector {
- /** <code>measures</code> . */
- private final Map measures;
-
- /**
- *
- */
- public Collector() {
- this.measures = new HashMap();
- }
-
- /**
- * @return the name of the series handled by the collector.
- */
- public String[] getSeries() {
- return (String[]) this.measures.keySet().toArray(new String[0]);
- }
-
- /**
- * @param name
- * @return the serie corresponding to the name.
- */
- protected Serie getSerie(String name) {
- Serie s = (Serie) this.measures.get(name);
- if (s == null) {
- //System.out.println("Creating the serie "+name);
- s = new Serie(name);
- this.measures.put(name, s);
- }
- return s;
- }
-
-
- /**
- * @param serie
- * @param value
- */
- public void collect(String serie, Number value) {
- //System.err.println("Collecting the value "+value+" for the serie
"+serie);
- getSerie(serie).collect(value);
- }
-
- /**
- * @param serie
- * @param visitor
- */
- public void visitSerie(String serie, SerieVisitor visitor) {
- //System.err.println("Visiting the serie "+serie);
- getSerie(serie).accept(visitor);
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- StringBuffer buf = new StringBuffer();
- for (Iterator i = this.measures.values().iterator() ; i.hasNext();) {
- buf.append(i.next().toString()+"\n");
- }
- return buf.toString();
- }
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Scenario.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Scenario.java:1.1
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Scenario.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Scenario.java:1.1
Wed Feb 23 18:39:46 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Scenario.java
Tue Jun 28 10:02:31 2005
@@ -1,52 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: Scenario.java,v 1.1 2005/02/23 17:39:46 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark.tools;
-
-import java.util.Map;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 24 janv. 2005
- * @modified $Date: 2005/02/23 17:39:46 $
- * @version $Revision: 1.1 $
- * @fractal.itf name="scenario"
- * @fractal.itf name="runnable" signature="java.lang.Runnable"
- */
-public interface Scenario
-extends Runnable
-{
- /** Fractal ADL Identifier for the <code>Scenario</code> interface.*/
- public static final String SCENARIO = "scenario";
-
- /**
- * Initialize the scenario.
- * @param config the configuration to apply to the scenario.
- */
- public void init(Map config) ;
-
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Serie.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Serie.java:1.3
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Serie.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Serie.java:1.3
Mon May 23 13:21:00 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Serie.java
Tue Jun 28 10:02:31 2005
@@ -1,100 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: Serie.java,v 1.3 2005/05/23 11:21:00 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark.tools;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 21 janv. 2005
- * @modified $Date: 2005/05/23 11:21:00 $
- * @version $Revision: 1.3 $
- */
-public class Serie {
- private final Vector data ;
- private final String topic ;
-
- /**
- * @param subject
- */
- public Serie(String subject) {
- this.data = new Vector();
- this.topic = subject;
- }
-
- /**
- * @param value
- */
- public void collect(Number value) {
- this.data.add(value);
- }
-
- /**
- * @param visitor the visitor to apply.
- */
- public void accept(SerieVisitor visitor) {
- visitor.setName(this.topic);
- for (Iterator i = this.data.iterator() ; i.hasNext() ; ) {
- visitor.accept((Number)i.next());
- }
- }
-
- /**
- * @return the list of values.
- */
- public String values() {
- StringBuffer buffer = new StringBuffer(this.topic+": [");
- for (Iterator i = this.data.iterator() ; i.hasNext() ; ) {
- buffer.append(i.next().toString());
- if (i.hasNext()) buffer.append("; ");
- }
- return buffer.toString()+"]";
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- StringBuffer buffer = new StringBuffer(this.topic+": ");
- SerieVisitor v = new SerieMin();
-// accept(v);
-// v.setName(" MIN");
-// buffer.append(v.compute().values());
- v = new SerieAverage();
- accept(v);
- v.setName(" AVG");
- buffer.append(v.compute().values());
- v = new SerieMax();
- accept(v);
- v.setName(" MAX");
- buffer.append(v.compute().values());
-// buffer.append(values());
- return buffer.toString();
- }
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieAverage.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieAverage.java:1.1
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieAverage.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieAverage.java:1.1
Wed Feb 23 18:39:46 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieAverage.java
Tue Jun 28 10:02:31 2005
@@ -1,58 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: SerieAverage.java,v 1.1 2005/02/23 17:39:46 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark.tools;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 21 janv. 2005
- * @modified $Date: 2005/02/23 17:39:46 $
- * @version $Revision: 1.1 $
- */
-public class SerieAverage
- extends VisitorImpl{
-
- private double sum = 0 ;
- private int nb = 0 ;
-
- /* (non-Javadoc)
- * @see
org.objectweb.gotm.jts.benchmark.tools.SerieVisitor#accept(java.lang.Number)
- */
- public void accept(Number value) {
- sum += value.doubleValue();
- nb++;
- }
-
- /* (non-Javadoc)
- * @see org.objectweb.gotm.jts.benchmark.tools.SerieVisitor#compute()
- */
- public Serie compute() {
- Serie s = super.compute();
- s.collect(new Double(sum/nb));
- return s;
- }
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMax.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMax.java:1.1
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMax.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMax.java:1.1
Wed Feb 23 18:39:46 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMax.java
Tue Jun 28 10:02:31 2005
@@ -1,60 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: SerieMax.java,v 1.1 2005/02/23 17:39:46 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark.tools;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 21 janv. 2005
- * @modified $Date: 2005/02/23 17:39:46 $
- * @version $Revision: 1.1 $
- */
-public class SerieMax
- extends VisitorImpl {
- private Number max;
-
- /* (non-Javadoc)
- * @see
org.objectweb.gotm.jts.benchmark.tools.SerieVisitor#accept(java.lang.Number)
- */
- public void accept(Number value) {
- if (max == null)
- this.max = value ;
- else {
- if (value.longValue() > this.max.longValue())
- this.max = value ;
- }
- }
-
- /* (non-Javadoc)
- * @see org.objectweb.gotm.jts.benchmark.tools.SerieVisitor#compute()
- */
- public Serie compute() {
- Serie s = super.compute();
- s.collect(this.max);
- return s;
- }
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMin.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMin.java:1.2
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMin.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMin.java:1.2
Mon May 23 13:21:00 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieMin.java
Tue Jun 28 10:02:31 2005
@@ -1,62 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: SerieMin.java,v 1.2 2005/05/23 11:21:00 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark.tools;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 21 janv. 2005
- * @modified $Date: 2005/05/23 11:21:00 $
- * @version $Revision: 1.2 $
- */
-public class SerieMin
- extends VisitorImpl {
- private Number min;
-
- /* (non-Javadoc)
- * @see
org.objectweb.gotm.jts.benchmark.tools.SerieVisitor#accept(java.lang.Number)
- */
- public void accept(Number value) {
- if (min == null)
- this.min = value ;
- else {
- if (value.longValue() < this.min.longValue())
- this.min = value ;
- }
- }
-
- /* (non-Javadoc)
- * @see org.objectweb.gotm.jts.benchmark.tools.SerieVisitor#compute()
- */
- public Serie compute() {
- Serie s = super.compute();
- s.collect(this.min);
- return s;
- }
-
-
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieVisitor.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieVisitor.java:1.1
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieVisitor.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieVisitor.java:1.1
Wed Feb 23 18:39:46 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/SerieVisitor.java
Tue Jun 28 10:02:31 2005
@@ -1,52 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: SerieVisitor.java,v 1.1 2005/02/23 17:39:46 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark.tools;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 21 janv. 2005
- * @modified $Date: 2005/02/23 17:39:46 $
- * @version $Revision: 1.1 $
- */
-public interface SerieVisitor {
-
- /**
- * @param serie the name of the serie.
- */
- public void setName(String serie);
-
- /**
- * @param value the value to handle.
- */
- public void accept(Number value);
-
- /**
- * @return the computed visitor.
- */
- public Serie compute();
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Timer.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Timer.java:1.2
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Timer.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Timer.java:1.2
Mon May 23 13:21:00 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/Timer.java
Tue Jun 28 10:02:31 2005
@@ -1,74 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: Timer.java,v 1.2 2005/05/23 11:21:00 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark.tools;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 11 janv. 2005
- * @modified $Date: 2005/05/23 11:21:00 $
- * @version $Revision: 1.2 $
- */
-public class Timer {
-
- private long time = 0;
- private boolean progress = false;
-
-
- /**
- * Starts the timer.
- */
- public void start() {
- this.time = System.currentTimeMillis() ;
- this.progress = true ;
- }
-
- /**
- * Stops the timer.
- */
- public void stop() {
- this.time = System.currentTimeMillis() - this.time ;
- this.progress = false ;
- }
-
- /**
- * Display the value of the timer.
- * @return the elapsed time in milliseconds.
- */
- public Long display() {
- if (this.progress)
- throw new RuntimeException("Timer is in progress");
- return new Long(this.time);
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString() {
- return this.display() + " ms";
- }
-}
Index:
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/VisitorImpl.java
diff -u
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/VisitorImpl.java:1.1
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/VisitorImpl.java:removed
---
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/VisitorImpl.java:1.1
Wed Feb 23 18:39:46 2005
+++
gotm-jts/example/benchmark/src/java/org/objectweb/gotm/jts/benchmark/tools/VisitorImpl.java
Tue Jun 28 10:02:31 2005
@@ -1,62 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2003-2005 INRIA - Jacquard & USTL - LIFL - GOAL
-Contact: gotm-team@xxxxxxxxxxxxx
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY 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 along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
-
-Initial developer(s): Romain Rouvoy.
-Contributor(s): .
-
----------------------------------------------------------------------
-$Id: VisitorImpl.java,v 1.1 2005/02/23 17:39:46 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.jts.benchmark.tools;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 21 janv. 2005
- * @modified $Date: 2005/02/23 17:39:46 $
- * @version $Revision: 1.1 $
- */
-public abstract class VisitorImpl
- implements SerieVisitor {
- /** <code>name</code> . */
- private String name ;
- /** <code>result</code> . */
- private Serie result ;
-
- /**
- * @return the name of the vistor.
- */
- protected String getName() { return this.name; }
-
- /* (non-Javadoc)
- * @see
org.objectweb.gotm.jts.benchmark.tools.SerieVisitor#setName(java.lang.String)
- */
- public void setName(String serie) {
- this.name = serie;
- this.result = new Serie(serie);
- }
-
- /* (non-Javadoc)
- * @see org.objectweb.gotm.jts.benchmark.tools.SerieVisitor#compute()
- */
- public Serie compute() {
- return this.result;
- }
-}
Index: gotm-jts/example/local/.cvsignore
diff -u gotm-jts/example/local/.cvsignore:1.2
gotm-jts/example/local/.cvsignore:removed
--- gotm-jts/example/local/.cvsignore:1.2 Wed Mar 2 16:27:50 2005
+++ gotm-jts/example/local/.cvsignore Tue Jun 28 10:02:31 2005
@@ -1,2 +0,0 @@
-build
-output
Index: gotm-jts/example/local/build.xml
diff -u gotm-jts/example/local/build.xml:1.5
gotm-jts/example/local/build.xml:removed
--- gotm-jts/example/local/build.xml:1.5 Wed Mar 2 16:27:21 2005
+++ gotm-jts/example/local/build.xml Tue Jun 28 10:02:31 2005
@@ -1,91 +0,0 @@
-<!-- ==================================================================== -->
-
-<!-- ObjectWeb GoTM is an open Tx Monitor Project -->
-<!-- Contact: http://www.objectweb.org -->
-
-<!-- This library is free software; you can redistribute it and/or -->
-<!-- modify it under the terms of the GNU Lesser General Public -->
-<!-- License as published by the Free Software Foundation; either -->
-<!-- version 2.1 of the License, or any later version. -->
-
-<!-- This library is distributed in the hope that it will be useful, -->
-<!-- but WITHOUT ANY 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 along with this library; if not, write to the Free Software -->
-<!-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -->
-<!-- USA -->
-
-<!-- Initial developer(s): Romain Rouvoy. -->
-<!-- Contributor(s): ______________________________________. -->
-
-<!-- $Id: build.xml,v 1.5 2005/03/02 15:27:21 rouvoy Exp $ -->
-<!-- ==================================================================== -->
-
-<project name="JTS Example" default="all">
- <description>GoTM JTS Examples [gotm.objectweb.org] - GoTM is an open
Transaction Monitor</description>
-
- <!-- ==================== -->
- <!-- PROPERTY DEFINITIONS -->
- <!-- ==================== -->
- <import file="${basedir}/../../../fractal-import/build.xml"/>
- <property name="examples.jar" value="ow_gotm_jts_examples.jar"/>
- <property name="examples.version" value="0.1a"/>
- <property name="dist.name" value="GoTM-JTS-Examples"/>
-
- <!-- ================ -->
- <!-- PATH DEFINITIONS -->
- <!-- ================ -->
- <path id="classpath">
- <fileset dir="${build.dir}/${lib.dir}" includes="**/*.jar"/>
- </path>
-
- <!-- ================== -->
- <!-- TARGET DEFINITIONS -->
- <!-- ================== -->
- <target name="all" description="clean + execute">
- <antcall target="clean"/>
- <antcall target="execute"/>
- </target>
-
- <target name="local-compile" depends="-gotm.jts">
- <mkdir dir="${build.dir}/${class.dir}"/>
- <java.c srcdir="${basedir}/${src.dir}/${java.dir}"/>
- <copy todir="${build.dir}/${class.dir}">
- <fileset dir="${basedir}/${src.dir}/${cfg.dir}" includes="**/*.*"/>
- </copy>
- <copy todir="${build.dir}/${class.dir}">
- <fileset dir="${basedir}/${bu.dir}/${cfg.dir}" includes="**/*.*"/>
- </copy>
- </target>
-
- <target name="local-build" depends="local-compile,fractal-adl">
- <mkdir dir="${build.dir}/${lib.dir}"/>
- <jar destfile="${build.dir}/${lib.dir}/${examples.jar}">
- <fileset dir="${build.dir}/${class.dir}" includes="**/*.*"/>
- </jar>
- </target>
-
- <target name="import" depends="local-build,clear"/>
-
- <target name="execute" depends="import"
- description="run local JTS example">
- <property name="julia.cfg" value="${build.dir}/${cfg.dir}/julia.cfg"/>
- <property name="cache.cfg" value="${build.dir}/${cfg.dir}/cache.cfg"/>
- <java classname="org.objectweb.fractal.adl.Launcher"
- classpathref="classpath"
- fork="yes"
- failonerror="yes">
- <sysproperty key="fractal.provider"
- value="org.objectweb.fractal.julia.Julia"/>
- <sysproperty key="julia.loader"
- value="org.objectweb.fractal.julia.loader.DynamicLoader" />
- <sysproperty key="julia.config"
- value="${julia.cfg},${cache.cfg}" />
- <arg line="-fractal org.objectweb.gotm.jts.local.FcExplorer r"/>
-<!-- <arg line="-fractal org.objectweb.gotm.lib.xid.FcXidStateFctr r"/> -->
- </java>
- </target>
-</project>
\ No newline at end of file
Index: gotm-jts/example/local/src/cfg/local.xml
diff -u gotm-jts/example/local/src/cfg/local.xml:1.1
gotm-jts/example/local/src/cfg/local.xml:removed
--- gotm-jts/example/local/src/cfg/local.xml:1.1 Wed Mar 2 16:27:50
2005
+++ gotm-jts/example/local/src/cfg/local.xml Tue Jun 28 10:02:31 2005
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<browser>
-
- <include url="JTA.xml" />
-
- <!-- ================================================================= -->
- <!-- Main -->
- <!-- ================================================================= -->
- <node type-name="java.lang.Runnable">
- <menu>
- <item label="Run">
- <code>org.objectweb.gotm.jts.local.InvokeRunnableAction</code>
- </item>
- </menu>
- </node>
-
-</browser>
\ No newline at end of file
Index:
gotm-jts/example/local/src/fractal/org/objectweb/gotm/jts/local/FcApplication.fractal
diff -u
gotm-jts/example/local/src/fractal/org/objectweb/gotm/jts/local/FcApplication.fractal:1.1
gotm-jts/example/local/src/fractal/org/objectweb/gotm/jts/local/FcApplication.fractal:removed
---
gotm-jts/example/local/src/fractal/org/objectweb/gotm/jts/local/FcApplication.fractal:1.1
Fri Jul 30 18:46:11 2004
+++
gotm-jts/example/local/src/fractal/org/objectweb/gotm/jts/local/FcApplication.fractal
Tue Jun 28 10:02:31 2005
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE definition PUBLIC
- "-//objectweb.org//DTD Fractal ADL 2.0//EN"
- "classpath://org/objectweb/fractal/adl/xml/basic.dtd">
-
-<definition name="org.objectweb.gotm.jts.local.FcApplication">
-
- <interface name="runnable" role="server"
- signature="java.lang.Runnable"/>
-
- <component name="FcClient"
- definition="org.objectweb.gotm.jts.local.FcJtaClient"/>
- <component name="FcCounter"
- definition="org.objectweb.gotm.jts.local.FcCounterImpl"/>
- <component name="FcTransactionManager"
- definition="org.objectweb.gotm.lib.FcTransactionManagerImpl"/>
-
- <binding client="this.runnable"
- server="FcClient.runnable"/>
- <binding client="FcClient.transaction-manager"
- server="FcTransactionManager.transaction-manager"/>
- <binding client="FcClient.counter"
- server="FcCounter.component"/>
-</definition>
\ No newline at end of file
Index:
gotm-jts/example/local/src/fractal/org/objectweb/gotm/jts/local/FcExplorer.fractal
diff -u
gotm-jts/example/local/src/fractal/org/objectweb/gotm/jts/local/FcExplorer.fractal:1.1
gotm-jts/example/local/src/fractal/org/objectweb/gotm/jts/local/FcExplorer.fractal:removed
---
gotm-jts/example/local/src/fractal/org/objectweb/gotm/jts/local/FcExplorer.fractal:1.1
Fri Jul 30 18:46:11 2004
+++
gotm-jts/example/local/src/fractal/org/objectweb/gotm/jts/local/FcExplorer.fractal
Tue Jun 28 10:02:31 2005
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE definition PUBLIC
- "-//objectweb.org//DTD Fractal ADL 2.0//EN"
- "classpath://org/objectweb/fractal/adl/xml/basic.dtd">
-
-<definition name="org.objectweb.gotm.jts.local.FcExplorer">
- <component name="FcExplorer"
- definition="org.objectweb.gotm.lib.FcExplorerImpl"/>
- <component name="FcApplication"
- definition="org.objectweb.gotm.jts.local.FcApplication"/>
-
- <binding client="FcExplorer.fcAppl"
- server="FcApplication.component"/>
-</definition>
\ No newline at end of file
Index:
gotm-jts/example/local/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
diff -u
gotm-jts/example/local/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal:1.3
gotm-jts/example/local/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal:removed
---
gotm-jts/example/local/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal:1.3
Wed Mar 2 16:27:50 2005
+++
gotm-jts/example/local/src/fractal/org/objectweb/gotm/lib/FcExplorerImpl.fractal
Tue Jun 28 10:02:31 2005
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN"
"classpath://org/objectweb/fractal/adl/xml/standard.dtd">
-<!--<!DOCTYPE definition PUBLIC "-//objectweb.org//DTD Fractal ADL 2.0//EN"
"classpath://org/objectweb/fractal/adl/xml/basic.dtd">-->
-
-<definition name="org.objectweb.gotm.lib.FcExplorerImpl">
- <interface name="fcAppl" role="client"
- signature="org.objectweb.fractal.api.Component" />
-
- <content class="BrowserImpl"/>
-
- <attributes signature="BrowserAttributes">
- <attribute value="local.xml" name="ConfigFiles"/>
- </attributes>
-</definition>
Index:
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/Counter.java
diff -u
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/Counter.java:1.2
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/Counter.java:removed
---
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/Counter.java:1.2
Mon Jan 10 17:17:31 2005
+++ gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/Counter.java
Tue Jun 28 10:02:31 2005
@@ -1,55 +0,0 @@
-/*====================================================================
-
- ObjectWeb GoTM project - http://gotm.objectweb.org
- Contact: gotm@xxxxxxxxxxxxx
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY 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 along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA
-
- Initial developer(s): Romain Rouvoy.
- Contributor(s): ______________________________________.
-
- ---------------------------------------------------------------------
- $Id: Counter.java,v 1.2 2005/01/10 16:17:31 rouvoy Exp $
- ====================================================================*/
-
-package org.objectweb.gotm.jts.local;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 6 janv. 2005
- * @modified $Date: 2005/01/10 16:17:31 $
- * @version $Revision: 1.2 $
- * @fractal.itf name="counter"
- */
-public interface Counter {
- /** Comment for <code>COUNTER</code>. */
- public static final String COUNTER = "counter";
-
- /**
- * Initialize the counter value.
- */
- public void init();
-
- /**
- * Increment the value of the counter.
- */
- public void incr();
-
- /**
- * @return the value of the counter.
- */
- public int value();
-}
Index:
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/CounterAttributes.java
diff -u
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/CounterAttributes.java:1.2
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/CounterAttributes.java:removed
---
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/CounterAttributes.java:1.2
Mon Jan 10 17:17:31 2005
+++
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/CounterAttributes.java
Tue Jun 28 10:02:31 2005
@@ -1,53 +0,0 @@
-/*====================================================================
-
- ObjectWeb GoTM project - http://gotm.objectweb.org
- Contact: gotm@xxxxxxxxxxxxx
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY 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 along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA
-
- Initial developer(s): Romain Rouvoy.
- Contributor(s): ______________________________________.
-
- ---------------------------------------------------------------------
- $Id: CounterAttributes.java,v 1.2 2005/01/10 16:17:31 rouvoy Exp $
- ====================================================================*/
-
-package org.objectweb.gotm.jts.local;
-
-import org.objectweb.fractal.api.control.AttributeController;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 6 janv. 2005
- * @modified $Date: 2005/01/10 16:17:31 $
- * @version $Revision: 1.2 $
- * @fractal.controller name="attribute"
- */
-public interface CounterAttributes
- extends AttributeController
-{
- /**
- * @return the value of the counter.
- */
- public int getCounter() ;
-
-
- /**
- * Defines the value of the counter.
- * @param value the value to set
- */
- public void setCounter(int value) ;
-}
Index:
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/CounterImpl.java
diff -u
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/CounterImpl.java:1.5
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/CounterImpl.java:removed
---
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/CounterImpl.java:1.5
Mon May 23 13:21:00 2005
+++
gotm-jts/example/local/src/java/org/objectweb/gotm/jts/local/CounterImpl.java
Tue Jun 28 10:02:31 2005
@@ -1,201 +0,0 @@
-/*====================================================================
-
- ObjectWeb GoTM project - http://gotm.objectweb.org
- Contact: gotm@xxxxxxxxxxxxx
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY 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 along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA
-
- Initial developer(s): Romain Rouvoy.
- Contributor(s): ___________________