Mail Archive Home | gotm-commits List | November 2005 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Tuesday, November 22, 2005 @ 11:50:50
Author: rouvoy
Path: /cvsroot/gotm/gotm
Modified: .settings/org.eclipse.core.resources.prefs
src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal
src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal
src/fractal/org/objectweb/gotm/lib/logging/FcLogManagerHOWL.fractal
src/fractal/org/objectweb/gotm/lib/message/FcEventBusAbstract.fractal
src/fractal/org/objectweb/gotm/lib/message/FcEventBusPool.fractal
src/fractal/org/objectweb/gotm/lib/message/FcEventBusSimple.fractal
src/fractal/org/objectweb/gotm/lib/message/FcEventBusThread.fractal
src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal
src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal
src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal
src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal
src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal
src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal
src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal
src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal
src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal
src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal
src/java/org/objectweb/gotm/lib/coordination/AbortFeature.java
src/java/org/objectweb/gotm/lib/coordination/CommitFeature.java
src/java/org/objectweb/gotm/lib/coordination/CoordinationFeatureAbstract.java
src/java/org/objectweb/gotm/lib/coordination/PrepareFeature.java
src/java/org/objectweb/gotm/lib/coordination/TwoPCActionProvider.java
src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java
src/java/org/objectweb/gotm/lib/timer/TimerImpl.java
* new version of AoKell library,
* new version of JGraph, Explorer and Fractal Explorer libraries,
* refactoring composite components using collection interfaces,
* improving Timer component implementation.
-------------------------------------------------------------------------------+
.settings/org.eclipse.core.resources.prefs
| 6
src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal
| 38 ++----
src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal
| 62 +++-------
src/fractal/org/objectweb/gotm/lib/logging/FcLogManagerHOWL.fractal
| 12 -
src/fractal/org/objectweb/gotm/lib/message/FcEventBusAbstract.fractal
| 4
src/fractal/org/objectweb/gotm/lib/message/FcEventBusPool.fractal
| 4
src/fractal/org/objectweb/gotm/lib/message/FcEventBusSimple.fractal
| 4
src/fractal/org/objectweb/gotm/lib/message/FcEventBusThread.fractal
| 4
src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal
| 14 +-
src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal
| 22 ---
src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal
| 14 +-
src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal
| 14 +-
src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal
| 14 +-
src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal
| 6
src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal
| 6
src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal
| 6
src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal
| 6
src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal
| 6
src/java/org/objectweb/gotm/lib/coordination/AbortFeature.java
| 8 -
src/java/org/objectweb/gotm/lib/coordination/CommitFeature.java
| 9 -
src/java/org/objectweb/gotm/lib/coordination/CoordinationFeatureAbstract.java
| 33 +++--
src/java/org/objectweb/gotm/lib/coordination/PrepareFeature.java
| 12 -
src/java/org/objectweb/gotm/lib/coordination/TwoPCActionProvider.java
| 16 --
src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java
| 15 --
src/java/org/objectweb/gotm/lib/timer/TimerImpl.java
| 35 ++---
25 files changed, 159 insertions(+), 211 deletions(-)
Index: gotm/.settings/org.eclipse.core.resources.prefs
diff -u gotm/.settings/org.eclipse.core.resources.prefs:1.9
gotm/.settings/org.eclipse.core.resources.prefs:1.10
--- gotm/.settings/org.eclipse.core.resources.prefs:1.9 Tue Nov 15 15:54:43
2005
+++ gotm/.settings/org.eclipse.core.resources.prefs Tue Nov 22 11:50:49
2005
@@ -1,4 +1,4 @@
-#Mon Nov 07 13:23:13 CET 2005
+#Mon Nov 21 13:44:49 CET 2005
eclipse.preferences.version=1
encoding//src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal=ISO-8859-1
encoding//src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal=ISO-8859-1
@@ -7,8 +7,8 @@
encoding//src/fractal/org/objectweb/gotm/lib/message/FcEventBusPool.fractal=ISO-8859-1
encoding//src/fractal/org/objectweb/gotm/lib/message/FcEventBusSimple.fractal=ISO-8859-1
encoding//src/fractal/org/objectweb/gotm/lib/message/FcEventBusThread.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal=UTF-8
-encoding//src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal=UTF-8
+encoding//src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal=ISO-8859-1
+encoding//src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal=ISO-8859-1
encoding//src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal=ISO-8859-1
encoding//src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal=ISO-8859-1
encoding//src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal=ISO-8859-1
Index: gotm/src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal
diff -u gotm/src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal:1.2
--- gotm/src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal:1.1 Tue
Nov 15 15:54:43 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal Tue
Nov 22 11:50:49 2005
@@ -8,13 +8,7 @@
<interface name="tx-state" role="server"
signature="org.objectweb.transaction.api.transaction.TransactionState"/>
- <interface name="one-pc" role="server"
-
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
- <interface name="two-pc" role="server"
-
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
- <interface name="prepare" role="server"
-
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
- <interface name="abort" role="server"
+ <interface name="execute" role="server" cardinality="collection"
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
<interface name="subscribe" role="server"
signature="org.objectweb.transaction.api.message.SubscribeFeature"/>
@@ -35,28 +29,28 @@
definition="org.objectweb.gotm.lib.jta.xa.FcXidProvider"/>
<binding client="this.tx-state"
server="TransactionState.tx-state"/>
- <binding client="this.two-pc" server="CommitEngine.commit"/>
- <binding client="this.one-pc"
server="CommitEngine.commit-one"/>
- <binding client="this.prepare" server="CommitEngine.prepare"/>
- <binding client="this.abort" server="CommitEngine.abort"/>
+ <binding client="this.execute-two-pc"
server="CommitEngine.execute-commit"/>
+ <binding client="this.execute-one-pc"
server="CommitEngine.execute-commit-one"/>
+ <binding client="this.execute-prepare"
server="CommitEngine.execute-prepare"/>
+ <binding client="this.execute-abort"
server="CommitEngine.execute-abort"/>
<binding client="this.timeout-attr"
server="CommitEngine.timeout-attr"/>
<binding client="this.subscribe"
server="CommunicationManager.subscribe"/>
<binding client="this.reference-provider"
server="XidFactory.reference-provider"/>
- <binding client="TransactionState.publish"
server="CommunicationManager.sync-publish"/>
+ <binding client="TransactionState.publish"
server="CommunicationManager.publish-sync"/>
<binding client="CommitEngine.tx-state"
server="TransactionState.tx-state"/>
<binding client="CommitEngine.timeout-subscribe"
server="CommunicationManager.subscribe"/>
- <binding client="CommitEngine.prepare-decision"
server="CommitProtocol.prepare-decision"/>
- <binding client="CommitEngine.commit-decision"
server="CommitProtocol.commit-decision"/>
- <binding client="CommitEngine.abort-decision"
server="CommitProtocol.abort-decision"/>
- <binding client="CommitEngine.init-log"
server="CommitProtocol.init-log"/>
- <binding client="CommitEngine.commit-log"
server="CommitProtocol.commit-log"/>
- <binding client="CommitEngine.abort-log"
server="CommitProtocol.abort-log"/>
- <binding client="CommitEngine.commit-end-log"
server="CommitProtocol.commit-end-log"/>
- <binding client="CommitEngine.abort-end-log"
server="CommitProtocol.abort-end-log"/>
+ <binding client="CommitEngine.decision-prepare"
server="CommitProtocol.decision-prepare"/>
+ <binding client="CommitEngine.decision-commit"
server="CommitProtocol.decision-commit"/>
+ <binding client="CommitEngine.decision-abort"
server="CommitProtocol.decision-abort"/>
+ <binding client="CommitEngine.log-init"
server="CommitProtocol.log-init"/>
+ <binding client="CommitEngine.log-commit"
server="CommitProtocol.log-commit"/>
+ <binding client="CommitEngine.log-abort"
server="CommitProtocol.log-abort"/>
+ <binding client="CommitEngine.log-commit-end"
server="CommitProtocol.log-commit-end"/>
+ <binding client="CommitEngine.log-abort-end"
server="CommitProtocol.log-abort-end"/>
- <binding client="CommitProtocol.sync-publish"
server="CommunicationManager.sync-publish"/>
- <binding client="CommitProtocol.async-publish"
server="CommunicationManager.async-publish"/>
+ <binding client="CommitProtocol.publish-sync"
server="CommunicationManager.publish-sync"/>
+ <binding client="CommitProtocol.publish-async"
server="CommunicationManager.publish-async"/>
<binding client="CommitProtocol.reference-provider"
server="XidFactory.reference-provider"/>
</definition>
\ No newline at end of file
Index:
gotm/src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal:1.5
gotm/src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal:1.6
---
gotm/src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal:1.5
Fri Nov 18 14:49:48 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal
Tue Nov 22 11:50:50 2005
@@ -4,13 +4,7 @@
"classpath://org/objectweb/fractal/adl/xml/basic.dtd">
<definition name="org.objectweb.gotm.lib.coordination.FcCommitEngine">
- <interface name="commit" role="server"
-
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
- <interface name="prepare" role="server"
-
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
- <interface name="commit-one" role="server"
-
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
- <interface name="abort" role="server"
+ <interface name="execute" role="server" cardinality="collection"
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
<interface name="timeout-attr" role="server"
signature="org.objectweb.gotm.lib.coordination.TimeoutAttribute"/>
@@ -19,21 +13,9 @@
signature="org.objectweb.transaction.api.transaction.TransactionState"/>
<interface name="timeout-subscribe" role="client"
signature="org.objectweb.transaction.api.message.SubscribeFeature"/>
- <interface name="prepare-decision" role="client"
- signature="org.objectweb.transaction.api.message.PublishFeature"/>
- <interface name="commit-decision" role="client"
- signature="org.objectweb.transaction.api.message.PublishFeature"/>
- <interface name="abort-decision" role="client"
+ <interface name="decision" role="client" cardinality="collection"
signature="org.objectweb.transaction.api.message.PublishFeature"/>
- <interface name="init-log" role="client"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="commit-log" role="client"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="abort-log" role="client"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="commit-end-log" role="client"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="abort-end-log" role="client"
+ <interface name="log" role="client" cardinality="collection"
signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
<component name="Timeout"
@@ -51,37 +33,37 @@
<component name="FcAbort"
definition="org.objectweb.gotm.lib.coordination.FcAbortFeature"/>
- <binding client="this.commit" server="Fc2PC.coord-process"/>
- <binding client="this.prepare" server="FcPrepare.coord-process"/>
- <binding client="this.commit-one" server="FcCommit.coord-process"/>
- <binding client="this.abort" server="FcAbort.coord-process"/>
+ <binding client="this.execute-commit" server="Fc2PC.exec"/>
+ <binding client="this.execute-prepare" server="FcPrepare.exec"/>
+ <binding client="this.execute-commit-one" server="FcCommit.exec"/>
+ <binding client="this.execute-abort" server="FcAbort.exec"/>
<binding client="this.timeout-attr" server="Timeout.timeout-attr"/>
<binding client="Fc2PC.tx-state" server="this.tx-state"/>
<binding client="Fc2PC.action-provider"
server="Fc2PCActions.action-provider"/>
- <binding client="Fc2PCActions.prepare" server="FcPrepare.coord-process"/>
- <binding client="Fc2PCActions.commit" server="FcCommit.coord-process"/>
- <binding client="Fc2PCActions.abort" server="FcAbort.coord-process"/>
+ <binding client="Fc2PCActions.exec-prepare" server="FcPrepare.exec"/>
+ <binding client="Fc2PCActions.exec-commit" server="FcCommit.exec"/>
+ <binding client="Fc2PCActions.exec-abort" server="FcAbort.exec"/>
<binding client="FcPrepare.tx-state" server="this.tx-state"/>
- <binding client="FcPrepare.publish" server="this.prepare-decision"/>
- <binding client="FcPrepare.begin-log" server="this.init-log"/>
+ <binding client="FcPrepare.publish" server="this.decision-prepare"/>
+ <binding client="FcPrepare.log-begin" server="this.log-init"/>
<binding client="FcAbort.tx-state" server="this.tx-state"/>
- <binding client="FcAbort.publish" server="this.abort-decision"/>
- <binding client="FcAbort.begin-log" server="this.abort-log"/>
- <binding client="FcAbort.end-log" server="this.abort-end-log"/>
-
- <binding client="FcCommit.tx-state" server="this.tx-state"/>
- <binding client="FcCommit.publish" server="this.commit-decision"/>
- <binding client="FcCommit.begin-log" server="this.commit-log"/>
- <binding client="FcCommit.end-log" server="this.commit-end-log"/>
- <binding client="FcCommit.abort" server="FcAbort.coord-process"/>
+ <binding client="FcAbort.publish" server="this.decision-abort"/>
+ <binding client="FcAbort.log-begin" server="this.log-abort"/>
+ <binding client="FcAbort.log-end" server="this.log-abort-end"/>
+
+ <binding client="FcCommit.tx-state" server="this.tx-state"/>
+ <binding client="FcCommit.publish" server="this.decision-commit"/>
+ <binding client="FcCommit.log-begin" server="this.log-commit"/>
+ <binding client="FcCommit.log-end" server="this.log-commit-end"/>
+ <binding client="FcCommit.exec-abort" server="FcAbort.exec"/>
<binding client="Timeout.subscribe" server="this.timeout-subscribe"/>
<binding client="Timeout.timer" server="Timer.timer"/>
- <binding client="Timer.coord-process" server="FcAbort.coord-process"/>
+ <binding client="Timer.execute" server="FcAbort.run"/>
</definition>
\ No newline at end of file
Index:
gotm/src/fractal/org/objectweb/gotm/lib/logging/FcLogManagerHOWL.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/logging/FcLogManagerHOWL.fractal:1.2
gotm/src/fractal/org/objectweb/gotm/lib/logging/FcLogManagerHOWL.fractal:1.3
---
gotm/src/fractal/org/objectweb/gotm/lib/logging/FcLogManagerHOWL.fractal:1.2
Tue Sep 6 10:01:47 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/logging/FcLogManagerHOWL.fractal
Tue Nov 22 11:50:49 2005
@@ -4,11 +4,7 @@
"classpath://org/objectweb/fractal/adl/xml/standard.dtd">
<definition name="org.objectweb.gotm.lib.logging.FcLogManagerHOWL"
arguments="file,dir">
- <interface name="force" role="server"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="no-force" role="server"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="empty" role="server"
+ <interface name="write" role="server" cardinality="collection"
signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
<interface name="reference-provider" role="client"
@@ -23,13 +19,13 @@
<component name="FcEmptyLogger"
definition="org.objectweb.gotm.lib.logging.FcSimpleLogger"/>
- <binding client="this.force"
server="FcForceLogger.log"/>
+ <binding client="this.write-force"
server="FcForceLogger.log"/>
<binding client="FcForceLogger.logger-provider"
server="FcProvider.logger-provider"/>
<binding client="FcForceLogger.reference-provider"
server="this.reference-provider"/>
- <binding client="this.no-force"
server="FcNoForceLogger.log"/>
+ <binding client="this.write-no-force"
server="FcNoForceLogger.log"/>
<binding client="FcNoForceLogger.logger-provider"
server="FcProvider.logger-provider"/>
<binding client="FcNoForceLogger.reference-provider"
server="this.reference-provider"/>
- <binding client="this.empty" server="FcEmptyLogger.log"/>
+ <binding client="this.write-empty" server="FcEmptyLogger.log"/>
</definition>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusAbstract.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusAbstract.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusAbstract.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusAbstract.fractal:1.1
Mon Nov 7 09:50:33 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusAbstract.fractal
Tue Nov 22 11:50:49 2005
@@ -6,9 +6,7 @@
<definition name="org.objectweb.gotm.lib.message.FcEventBusAbstract">
<interface name="subscribe" role="server"
signature="org.objectweb.transaction.api.message.SubscribeFeature"/>
- <interface name="sync-publish" role="server"
- signature="org.objectweb.transaction.api.message.PublishFeature"/>
- <interface name="async-publish" role="server"
+ <interface name="publish" role="server" cardinality="collection"
signature="org.objectweb.transaction.api.message.PublishFeature"/>
<component name="FcSubscribers"
Index: gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusPool.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusPool.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusPool.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusPool.fractal:1.1
Mon Nov 7 09:50:33 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusPool.fractal
Tue Nov 22 11:50:49 2005
@@ -11,12 +11,12 @@
<component name="FcThreadPool"
definition="org.objectweb.util.thread.comp.FcThreadManager(10,100)"/>
- <binding client="this.sync-publish"
+ <binding client="this.publish-sync"
server="FcSyncPublish.publish"/>
<binding client="FcSyncPublish.subscriber-provider"
server="FcSubscribers.subscriber-provider"/>
- <binding client="this.async-publish"
+ <binding client="this.publish-async"
server="FcASyncPublish.publish"/>
<binding client="FcASyncPublish.subscriber-provider"
server="FcSubscribers.subscriber-provider"/>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusSimple.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusSimple.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusSimple.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusSimple.fractal:1.1
Mon Nov 7 09:50:33 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusSimple.fractal
Tue Nov 22 11:50:49 2005
@@ -7,9 +7,9 @@
<component name="FcSyncPublish"
definition="org.objectweb.gotm.lib.message.FcPublishSimple"/>
- <binding client="this.async-publish"
+ <binding client="this.publish-async"
server="FcSyncPublish.publish"/>
- <binding client="this.sync-publish"
+ <binding client="this.publish-sync"
server="FcSyncPublish.publish"/>
<binding client="FcSyncPublish.subscriber-provider"
server="FcSubscribers.subscriber-provider"/>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusThread.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusThread.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusThread.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusThread.fractal:1.1
Mon Nov 7 09:50:33 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/message/FcEventBusThread.fractal
Tue Nov 22 11:50:49 2005
@@ -9,12 +9,12 @@
<component name="FcASyncPublish"
definition="org.objectweb.gotm.lib.message.FcPublishASyncThread"/>
- <binding client="this.sync-publish"
+ <binding client="this.publish-sync"
server="FcSyncPublish.publish"/>
<binding client="FcSyncPublish.subscriber-provider"
server="FcSubscribers.subscriber-provider"/>
- <binding client="this.async-publish"
+ <binding client="this.publish-async"
server="FcASyncPublish.publish"/>
<binding client="FcASyncPublish.subscriber-provider"
server="FcSubscribers.subscriber-provider"/>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal:1.1
Tue Nov 15 15:54:43 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal
Tue Nov 22 11:50:49 2005
@@ -8,14 +8,14 @@
<component name="LogManager"
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PC,output)"/>
- <binding client="this.commit-decision" server="this.sync-publish"/>
- <binding client="this.abort-decision" server="this.sync-publish"/>
+ <binding client="this.decision-commit" server="this.publish-sync"/>
+ <binding client="this.decision-abort" server="this.publish-sync"/>
- <binding client="this.init-log" server="LogManager.empty"/>
- <binding client="this.commit-log" server="LogManager.force"/>
- <binding client="this.commit-end-log" server="LogManager.no-force"/>
- <binding client="this.abort-log" server="LogManager.force"/>
- <binding client="this.abort-end-log" server="LogManager.no-force"/>
+ <binding client="this.log-init" server="LogManager.write-empty"/>
+ <binding client="this.log-commit" server="LogManager.write-force"/>
+ <binding client="this.log-commit-end" server="LogManager.write-no-force"/>
+ <binding client="this.log-abort" server="LogManager.write-force"/>
+ <binding client="this.log-abort-end" server="LogManager.write-no-force"/>
<binding client="LogManager.reference-provider"
server="this.reference-provider"/>
</definition>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal:1.1
Tue Nov 15 15:54:43 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal
Tue Nov 22 11:50:49 2005
@@ -4,29 +4,15 @@
"classpath://org/objectweb/fractal/adl/xml/basic.dtd">
<definition name="org.objectweb.gotm.lib.protocol.coordinator.Fc2PCAbstract">
- <interface name="prepare-decision" role="server"
+ <interface name="decision" role="server" cardinality="collection"
signature="org.objectweb.transaction.api.message.PublishFeature"/>
- <interface name="commit-decision" role="server"
- signature="org.objectweb.transaction.api.message.PublishFeature"/>
- <interface name="abort-decision" role="server"
- signature="org.objectweb.transaction.api.message.PublishFeature"/>
- <interface name="init-log" role="server"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="commit-log" role="server"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="abort-log" role="server"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="commit-end-log" role="server"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="abort-end-log" role="server"
+ <interface name="log" role="server" cardinality="collection"
signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="sync-publish" role="client"
- signature="org.objectweb.transaction.api.message.PublishFeature"/>
- <interface name="async-publish" role="client"
+ <interface name="publish" role="client" cardinality="collection"
signature="org.objectweb.transaction.api.message.PublishFeature"/>
<interface name="reference-provider" role="client"
signature="org.objectweb.gotm.lib.reference.ReferenceProvider"/>
- <binding client="this.prepare-decision" server="this.sync-publish"/>
+ <binding client="this.decision-prepare" server="this.publish-sync"/>
</definition>
\ No newline at end of file
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal:1.1
Tue Nov 15 15:54:43 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal
Tue Nov 22 11:50:49 2005
@@ -8,12 +8,12 @@
<component name="LogManager"
definition="org.objectweb.gotm.lib.logging.FcSimpleLogger"/>
- <binding client="this.commit-decision" server="this.sync-publish"/>
- <binding client="this.abort-decision" server="this.sync-publish"/>
+ <binding client="this.decision-commit" server="this.publish-sync"/>
+ <binding client="this.decision-abort" server="this.publish-sync"/>
- <binding client="this.init-log" server="LogManager.log"/>
- <binding client="this.commit-log" server="LogManager.log"/>
- <binding client="this.abort-log" server="LogManager.log"/>
- <binding client="this.commit-end-log" server="LogManager.log"/>
- <binding client="this.abort-end-log" server="LogManager.log"/>
+ <binding client="this.log-init" server="LogManager.write-log"/>
+ <binding client="this.log-commit" server="LogManager.write-log"/>
+ <binding client="this.log-abort" server="LogManager.write-log"/>
+ <binding client="this.log-commit-end" server="LogManager.write-log"/>
+ <binding client="this.log-abort-end" server="LogManager.write-log"/>
</definition>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal:1.1
Tue Nov 15 15:54:43 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal
Tue Nov 22 11:50:49 2005
@@ -8,14 +8,14 @@
<component name="LogManager"
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PCPA,output)"/>
- <binding client="this.commit-decision" server="this.sync-publish"/>
- <binding client="this.abort-decision" server="this.async-publish"/>
+ <binding client="this.decision-commit" server="this.publish-sync"/>
+ <binding client="this.decision-abort" server="this.publish-async"/>
- <binding client="this.init-log" server="LogManager.empty"/>
- <binding client="this.commit-log" server="LogManager.force"/>
- <binding client="this.commit-end-log" server="LogManager.no-force"/>
- <binding client="this.abort-log" server="LogManager.empty"/>
- <binding client="this.abort-end-log" server="LogManager.empty"/>
+ <binding client="this.log-init" server="LogManager.write-empty"/>
+ <binding client="this.log-commit" server="LogManager.write-force"/>
+ <binding client="this.log-commit-end" server="LogManager.write-no-force"/>
+ <binding client="this.log-abort" server="LogManager.write-empty"/>
+ <binding client="this.log-abort-end" server="LogManager.write-empty"/>
<binding client="LogManager.reference-provider"
server="this.reference-provider"/>
</definition>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal:1.1
Tue Nov 15 15:54:43 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal
Tue Nov 22 11:50:49 2005
@@ -8,14 +8,14 @@
<component name="LogManager"
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PCPC,output)"/>
- <binding client="this.commit-decision" server="this.async-publish"/>
- <binding client="this.abort-decision" server="this.sync-publish"/>
+ <binding client="this.decision-commit" server="this.publish-async"/>
+ <binding client="this.decision-abort" server="this.publish-sync"/>
- <binding client="this.init-log" server="LogManager.force"/>
- <binding client="this.commit-log" server="LogManager.force"/>
- <binding client="this.commit-end-log" server="LogManager.empty"/>
- <binding client="this.abort-log" server="LogManager.empty"/>
- <binding client="this.abort-end-log" server="LogManager.no-force"/>
+ <binding client="this.log-init" server="LogManager.write-force"/>
+ <binding client="this.log-commit" server="LogManager.write-force"/>
+ <binding client="this.log-commit-end" server="LogManager.write-empty"/>
+ <binding client="this.log-abort" server="LogManager.write-empty"/>
+ <binding client="this.log-abort-end" server="LogManager.write-no-force"/>
<binding client="LogManager.reference-provider"
server="this.reference-provider"/>
</definition>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal:1.1
Tue Nov 15 15:54:43 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal
Tue Nov 22 11:50:49 2005
@@ -8,9 +8,9 @@
<component name="LogManager"
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PC,output)"/>
- <binding client="this.vote-log" server="LogManager.force"/>
- <binding client="this.commit-ack-log" server="LogManager.force"/>
- <binding client="this.abort-ack-log" server="LogManager.force"/>
+ <binding client="this.log-vote" server="LogManager.write-force"/>
+ <binding client="this.log-commit-ack" server="LogManager.write-force"/>
+ <binding client="this.log-abort-ack" server="LogManager.write-force"/>
<binding client="LogManager.reference-provider"
server="this.reference-provider"/>
</definition>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal:1.1
Tue Nov 15 15:54:43 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal
Tue Nov 22 11:50:49 2005
@@ -4,11 +4,7 @@
"classpath://org/objectweb/fractal/adl/xml/basic.dtd">
<definition name="org.objectweb.gotm.lib.protocol.participant.Fc2PCAbstract">
- <interface name="vote-log" role="server"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="commit-ack-log" role="server"
- signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
- <interface name="abort-ack-log" role="server"
+ <interface name="log" role="server" cardinality="collection"
signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
<interface name="reference-provider" role="client"
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal:1.1
Tue Nov 15 15:54:43 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal
Tue Nov 22 11:50:49 2005
@@ -8,7 +8,7 @@
<component name="LogManager"
definition="org.objectweb.gotm.lib.logging.FcSimpleLogger"/>
- <binding client="this.vote-log" server="LogManager.log"/>
- <binding client="this.commit-ack-log" server="LogManager.log"/>
- <binding client="this.abort-ack-log" server="LogManager.log"/>
+ <binding client="this.log-vote" server="LogManager.write-log"/>
+ <binding client="this.log-commit-ack" server="LogManager.write-log"/>
+ <binding client="this.log-abort-ack" server="LogManager.write-log"/>
</definition>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal:1.1
Tue Nov 15 15:54:43 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal
Tue Nov 22 11:50:49 2005
@@ -8,9 +8,9 @@
<component name="LogManager"
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PCPA,output)"/>
- <binding client="this.vote-log" server="LogManager.force"/>
- <binding client="this.commit-ack-log" server="LogManager.force"/>
- <binding client="this.abort-ack-log" server="LogManager.no-force"/>
+ <binding client="this.log-vote" server="LogManager.write-force"/>
+ <binding client="this.log-commit-ack" server="LogManager.write-force"/>
+ <binding client="this.log-abort-ack" server="LogManager.write-no-force"/>
<binding client="LogManager.reference-provider"
server="this.reference-provider"/>
</definition>
Index:
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal
diff -u
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal:1.1
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal:1.2
---
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal:1.1
Tue Nov 15 15:54:43 2005
+++
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal
Tue Nov 22 11:50:49 2005
@@ -8,9 +8,9 @@
<component name="LogManager"
definition="org.objectweb.gotm.lib.logging.FcLogManagerHOWL(log-2PCPC,output)"/>
- <binding client="this.vote-log" server="LogManager.force"/>
- <binding client="this.commit-ack-log" server="LogManager.no-force"/>
- <binding client="this.abort-ack-log" server="LogManager.force"/>
+ <binding client="this.log-vote" server="LogManager.write-force"/>
+ <binding client="this.log-commit-ack" server="LogManager.write-no-force"/>
+ <binding client="this.log-abort-ack" server="LogManager.write-force"/>
<binding client="LogManager.reference-provider"
server="this.reference-provider"/>
</definition>
Index: gotm/src/java/org/objectweb/gotm/lib/coordination/AbortFeature.java
diff -u
gotm/src/java/org/objectweb/gotm/lib/coordination/AbortFeature.java:1.8
gotm/src/java/org/objectweb/gotm/lib/coordination/AbortFeature.java:1.9
--- gotm/src/java/org/objectweb/gotm/lib/coordination/AbortFeature.java:1.8
Thu Nov 17 14:04:23 2005
+++ gotm/src/java/org/objectweb/gotm/lib/coordination/AbortFeature.java Tue
Nov 22 11:50:49 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: AbortFeature.java,v 1.8 2005/11/17 13:04:23 rouvoy Exp $
+$Id: AbortFeature.java,v 1.9 2005/11/22 10:50:49 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.coordination;
@@ -37,14 +37,14 @@
/**
* Implementation of the cancel process.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.8 $
- * @fractal.itf name="abort"
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
+ * @version $Revision: 1.9 $
+ * @fractal.itf name="exec-abort"
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
*/
public class AbortFeature
extends CoordinationFeatureAbstract
{
/** Fractal ADL Identifier for the <code>Prepare</code> interface. */
- public static final String ABORT = "abort";
+ public static final String ABORT = "exec-abort";
/* (non-Javadoc)
* @see
org.objectweb.transaction.api.coordination.CoordinationFeature#process(java.util.Map)
Index: gotm/src/java/org/objectweb/gotm/lib/coordination/CommitFeature.java
diff -u
gotm/src/java/org/objectweb/gotm/lib/coordination/CommitFeature.java:1.11
gotm/src/java/org/objectweb/gotm/lib/coordination/CommitFeature.java:1.12
--- gotm/src/java/org/objectweb/gotm/lib/coordination/CommitFeature.java:1.11
Thu Nov 17 14:04:22 2005
+++ gotm/src/java/org/objectweb/gotm/lib/coordination/CommitFeature.java
Tue Nov 22 11:50:49 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
- $Id: CommitFeature.java,v 1.11 2005/11/17 13:04:22 rouvoy Exp $
+ $Id: CommitFeature.java,v 1.12 2005/11/22 10:50:49 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.coordination;
@@ -42,14 +42,15 @@
/**
* One phase validation process.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.11 $
- * @fractal.itf name="abort" role="client"
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
+ * @version $Revision: 1.12 $
+ * @fractal.itf name="exec-commit"
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
+ * @fractal.itf name="exec-abort" role="client"
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
*/
public class CommitFeature
extends CoordinationFeatureAbstract
{
/** Fractal ADL Identifier for the <code>Prepare</code> interface. */
- public static final String COMMIT = "commit";
+ public static final String COMMIT = "exec-commit";
/* (non-Javadoc)
* @see org.objectweb.gotm.lib.BindingFeature#clientFc()
Index:
gotm/src/java/org/objectweb/gotm/lib/coordination/CoordinationFeatureAbstract.java
diff -u
gotm/src/java/org/objectweb/gotm/lib/coordination/CoordinationFeatureAbstract.java:1.1
gotm/src/java/org/objectweb/gotm/lib/coordination/CoordinationFeatureAbstract.java:1.2
---
gotm/src/java/org/objectweb/gotm/lib/coordination/CoordinationFeatureAbstract.java:1.1
Thu Nov 17 14:04:23 2005
+++
gotm/src/java/org/objectweb/gotm/lib/coordination/CoordinationFeatureAbstract.java
Tue Nov 22 11:50:49 2005
@@ -23,11 +23,14 @@
Contributor(s): .
---------------------------------------------------------------------
- $Id: CoordinationFeatureAbstract.java,v 1.1 2005/11/17 13:04:23 rouvoy Exp $
+ $Id: CoordinationFeatureAbstract.java,v 1.2 2005/11/22 10:50:49 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.coordination;
+import java.util.Collections;
+import java.util.HashMap;
+
import org.objectweb.transaction.api.coordination.CoordinationFeature;
import org.objectweb.transaction.api.logging.LoggerFeature;
import org.objectweb.transaction.api.message.PublishFeature;
@@ -39,21 +42,21 @@
* Abstract implementation of a validation engine.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 5 janv. 2005
- * @modified $Date: 2005/11/17 13:04:23 $
- * @version $Revision: 1.1 $
+ * @modified $Date: 2005/11/22 10:50:49 $
+ * @version $Revision: 1.2 $
+ * @fractal.itf name="run" signature="java.lang.Runnable"
* @fractal.itf name="publish" role="client"
signature="org.objectweb.transaction.api.message.PublishFeature"
* @fractal.itf name="tx-state" role="client"
signature="org.objectweb.transaction.api.transaction.TransactionState"
- * @fractal.itf name="begin-log" role="client"
signature="org.objectweb.transaction.api.logging.LoggerFeature"
contingency="optional"
- * @fractal.itf name="end-log" role="client"
signature="org.objectweb.transaction.api.logging.LoggerFeature"
contingency="optional"
+ * @fractal.itf name="log" role="client" cardinality="collection"
signature="org.objectweb.transaction.api.logging.LoggerFeature"
contingency="optional"
*/
public abstract class CoordinationFeatureAbstract
extends BindablePrimitive
- implements CoordinationFeature
+ implements CoordinationFeature, Runnable
{
/** Fractal ADL Identifier for the <code>LoggerFeature</code> interface.
*/
- public static final String BEGIN_LOG = "begin-log" ;
+ public static final String BEGIN_LOG = "log-begin" ;
/** Fractal ADL Identifier for the <code>LoggerFeature</code> interface.
*/
- public static final String END_LOG = "end-log" ;
+ public static final String END_LOG = "log-end" ;
/* (non-Javadoc)
* @see org.objectweb.gotm.lib.BindingFeature#clientFc()
@@ -62,7 +65,7 @@
return new String[] {
PublishFeature.PUBLISH_FEATURE,
TransactionState.TRANSACTION_STATE,
- BEGIN_LOG, END_LOG
+ "log"
};
}
@@ -93,4 +96,16 @@
protected final LoggerFeature endLog() {
return (LoggerFeature) singletonFc(END_LOG);
}
+
+ /* (non-Javadoc)
+ * @see java.lang.Runnable#run()
+ */
+ public void run() {
+ try {
+ execute(Collections.emptyMap());
+ } catch (Exception e) {
+ if (getLogger().isLoggable(ERROR))
+ getLogger().log(ERROR, "Error during Coordination: ", e);
+ }
+ }
}
\ No newline at end of file
Index: gotm/src/java/org/objectweb/gotm/lib/coordination/PrepareFeature.java
diff -u
gotm/src/java/org/objectweb/gotm/lib/coordination/PrepareFeature.java:1.2
gotm/src/java/org/objectweb/gotm/lib/coordination/PrepareFeature.java:1.3
--- gotm/src/java/org/objectweb/gotm/lib/coordination/PrepareFeature.java:1.2
Thu Nov 17 14:04:23 2005
+++ gotm/src/java/org/objectweb/gotm/lib/coordination/PrepareFeature.java
Tue Nov 22 11:50:49 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
- $Id: PrepareFeature.java,v 1.2 2005/11/17 13:04:23 rouvoy Exp $
+ $Id: PrepareFeature.java,v 1.3 2005/11/22 10:50:49 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.coordination;
@@ -36,15 +36,15 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 30 aug. 2005
- * @modified $Date: 2005/11/17 13:04:23 $
- * @version $Revision: 1.2 $
- * @fractal.itf name="prepare"
+ * @modified $Date: 2005/11/22 10:50:49 $
+ * @version $Revision: 1.3 $
+ * @fractal.itf name="exec-prepare"
*
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
*/
public class PrepareFeature
extends CoordinationFeatureAbstract {
/** Fractal ADL Identifier for the <code>Prepare</code> interface. */
- public static final String PREPARE = "prepare";
+ public static final String PREPARE = "exec-prepare";
/*
* (non-Javadoc)
@@ -59,4 +59,4 @@
txState().setStatus(TransactionStatusPrepared.status);
//endLog().log(TransactionStatusPrepared.status.label().getBytes());
}
-}
+}
\ No newline at end of file
Index:
gotm/src/java/org/objectweb/gotm/lib/coordination/TwoPCActionProvider.java
diff -u
gotm/src/java/org/objectweb/gotm/lib/coordination/TwoPCActionProvider.java:1.1
gotm/src/java/org/objectweb/gotm/lib/coordination/TwoPCActionProvider.java:1.2
---
gotm/src/java/org/objectweb/gotm/lib/coordination/TwoPCActionProvider.java:1.1
Thu Nov 17 14:04:23 2005
+++
gotm/src/java/org/objectweb/gotm/lib/coordination/TwoPCActionProvider.java
Tue Nov 22 11:50:49 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: TwoPCActionProvider.java,v 1.1 2005/11/17 13:04:23 rouvoy Exp $
+$Id: TwoPCActionProvider.java,v 1.2 2005/11/22 10:50:49 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.coordination;
@@ -45,11 +45,9 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 17 nov. 2005
- * @modified $Date: 2005/11/17 13:04:23 $
- * @version $Revision: 1.1 $
- * @fractal.itf name="prepare" role="client"
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
- * @fractal.itf name="commit" role="client"
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
- * @fractal.itf name="abort" role="client"
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
+ * @modified $Date: 2005/11/22 10:50:49 $
+ * @version $Revision: 1.2 $
+ * @fractal.itf name="exec" role="client" cardinality="collection"
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
*/
public class TwoPCActionProvider
extends ActionProviderAbstract {
@@ -69,11 +67,7 @@
* @see org.objectweb.fractal.lib.BindablePrimitive#clientFc()
*/
protected String[] clientFc() {
- return new String[] {
- PrepareFeature.PREPARE,
- CommitFeature.COMMIT,
- AbortFeature.ABORT
- };
+ return new String[] { CoordinationFeature.PROCESS_FEATURE };
}
/**
Index: gotm/src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java
diff -u
gotm/src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java:1.5
gotm/src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java:1.6
--- gotm/src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java:1.5
Thu Nov 17 14:04:23 2005
+++ gotm/src/java/org/objectweb/gotm/lib/logging/HOWLoggerProvider.java Tue
Nov 22 11:50:50 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: HOWLoggerProvider.java,v 1.5 2005/11/17 13:04:23 rouvoy Exp $
+$Id: HOWLoggerProvider.java,v 1.6 2005/11/22 10:50:50 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.logging;
@@ -43,15 +43,15 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 7 juil. 2005
- * @modified $Date: 2005/11/17 13:04:23 $
- * @version $Revision: 1.5 $
+ * @modified $Date: 2005/11/22 10:50:50 $
+ * @version $Revision: 1.6 $
* @fractal.itf
*/
public class HOWLoggerProvider
extends LoggablePrimitive
implements
LoggerManager,LoggerProvider,LoggerProviderAttributeController,LifeCycleController
{
- /** <code>cache</code> to store existing logger. */
+ /** <code>cache</code> to store existing loggers. */
protected static final Map cache = new HashMap();
/**
@@ -128,12 +128,7 @@
* @see org.objectweb.fractal.api.control.LifeCycleController#stopFc()
*/
public void stopFc() {
-// try {
-// logger.close() ;
-// } catch (Exception e) {
-// throw new GoTMException(e);
-// }
- logger = null;
+ // Nothing to do.
}
/* (non-Javadoc)
Index: gotm/src/java/org/objectweb/gotm/lib/timer/TimerImpl.java
diff -u gotm/src/java/org/objectweb/gotm/lib/timer/TimerImpl.java:1.3
gotm/src/java/org/objectweb/gotm/lib/timer/TimerImpl.java:1.4
--- gotm/src/java/org/objectweb/gotm/lib/timer/TimerImpl.java:1.3 Mon
Nov 21 12:07:58 2005
+++ gotm/src/java/org/objectweb/gotm/lib/timer/TimerImpl.java Tue Nov 22
11:50:49 2005
@@ -23,56 +23,47 @@
Contributor(s): .
---------------------------------------------------------------------
- $Id: TimerImpl.java,v 1.3 2005/11/21 11:07:58 rouvoy Exp $
+ $Id: TimerImpl.java,v 1.4 2005/11/22 10:50:49 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.timer;
-import java.util.HashMap;
import java.util.Timer;
import java.util.TimerTask;
import org.objectweb.fractal.lib.BindablePrimitive;
-import org.objectweb.transaction.api.coordination.CoordinationFeature;
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 18 nov. 2005
- * @modified $Date: 2005/11/21 11:07:58 $
- * @version $Revision: 1.3 $
- * @fractal.itf name="coord-process" role="client"
- *
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
+ * @modified $Date: 2005/11/22 10:50:49 $
+ * @version $Revision: 1.4 $
+ * @fractal.itf name="execute" role="client" signature="java.lang.Runnable"
*/
public class TimerImpl
extends BindablePrimitive
implements org.objectweb.gotm.lib.timer.Timer {
-
+ static final String EXECUTE = "execute";
+
private long remaining = 0;
private Timer timer = new Timer();
- private TimerTask task ;
+ private TimerTask task = new TerminateTask();
private class TerminateTask extends TimerTask {
- public void run() {
- try {
- getTerminator().execute(new HashMap());
- } catch (Exception e) {
- if (getLogger().isLoggable(ERROR))
- getLogger().log(ERROR, "Terminate Task failed:",e);
- }
- }
+ public void run() { getTerminator().run(); }
}
/* (non-Javadoc)
* @see org.objectweb.fractal.lib.BindablePrimitive#clientFc()
*/
protected String[] clientFc() {
- return new String[] { CoordinationFeature.PROCESS_FEATURE };
+ return new String[] { EXECUTE };
}
/**
* @return the coordination object to call when time elapses.
*/
- protected final CoordinationFeature getTerminator() {
- return (CoordinationFeature)
singletonFc(CoordinationFeature.PROCESS_FEATURE);
+ protected final Runnable getTerminator() {
+ return (Runnable) singletonFc(EXECUTE);
}
/* (non-Javadoc)
@@ -89,8 +80,7 @@
public void restart() {
if (getLogger().isLoggable(DEBUG))
getLogger().log(DEBUG, "Timer started (rem.="+this.remaining+"
ms)");
- if (this.remaining < 0) return;
- this.task = new TerminateTask();
+ if (this.remaining <= 0) return;
this.timer.schedule(this.task, this.remaining);
}
@@ -103,5 +93,6 @@
getLogger().log(DEBUG, "Timer stopped (rem.="+this.remaining+"
ms)");
this.task.cancel();
this.timer.purge();
+ this.task = new TerminateTask();
}
}
\ No newline at end of file
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.