OW2 Consortium
Search OW2 Mail Archive: 

Advanced Search - Powered by Google


Mail Archive Home | gotm-commits List | November 2005 Index

<--  Date Index  --> <--  Thread Index  -->

CVS update of gotm (18 files)


    Date: Tuesday, November 15, 2005 @ 15:54:43
  Author: rouvoy
    Path: /cvsroot/gotm/gotm

   Added: src/fractal/org/objectweb/gotm/lib/FcTransaction.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
Modified: .settings/org.eclipse.core.resources.prefs
          
src/java/org/objectweb/gotm/lib/current/CurrentManagerWithReference.java
 Removed: src/fractal/org/objectweb/gotm/lib/protocol/Fc2PC.fractal
          src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCAbstract.fractal
           src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCNoLog.fractal
          src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPA.fractal
          src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPC.fractal

* Now using Object-oriented version of AoKell,
* Updating the version of Fractal ADL to load system properties as 
instanciation parameters and stopping the component after executing the 
method run(),
* Splitting the 2PC protocol implementation into coordinator and participant 
parts,
* Extracting the FcTransaction definition from gotm-jts module.


-------------------------------------------------------------------------------+
 .settings/org.eclipse.core.resources.prefs                                   
 |   18 +-
 src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal                     
 |   62 ++++++++++
 src/fractal/org/objectweb/gotm/lib/protocol/Fc2PC.fractal                    
 |   23 ---
 src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCAbstract.fractal            
 |   38 ------
 src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCNoLog.fractal               
 |   21 ---
 src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPA.fractal                  
 |   23 ---
 src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPC.fractal                  
 |   23 ---
 src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal        
 |   21 +++
 
src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal 
|   32 +++++
 src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal   
 |   19 +++
 src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal      
 |   21 +++
 src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal      
 |   21 +++
 src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal        
 |   16 ++
 
src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal 
|   16 ++
 src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal   
 |   14 ++
 src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal      
 |   16 ++
 src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal      
 |   16 ++
 src/java/org/objectweb/gotm/lib/current/CurrentManagerWithReference.java     
 |    7 -
 18 files changed, 270 insertions(+), 137 deletions(-)


Index: gotm/.settings/org.eclipse.core.resources.prefs
diff -u gotm/.settings/org.eclipse.core.resources.prefs:1.8 
gotm/.settings/org.eclipse.core.resources.prefs:1.9
--- gotm/.settings/org.eclipse.core.resources.prefs:1.8 Mon Nov  7 09:50:33 
2005
+++ gotm/.settings/org.eclipse.core.resources.prefs     Tue Nov 15 15:54:43 
2005
@@ -1,13 +1,19 @@
-#Fri Nov 04 15:03:51 CET 2005
+#Mon Nov 07 13:23:13 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
 
encoding//src/fractal/org/objectweb/gotm/lib/logging/FcLogManagerHOWL.fractal=ISO-8859-1
 
encoding//src/fractal/org/objectweb/gotm/lib/message/FcEventBusAbstract.fractal=ISO-8859-1
 
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/Fc2PC.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCAbstract.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCNoLog.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPA.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPC.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/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
+encoding//src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal=ISO-8859-1
+encoding//src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal=ISO-8859-1
+encoding//src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal=ISO-8859-1
+encoding//src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal=ISO-8859-1
+encoding//src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal=ISO-8859-1
Index: gotm/src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal:1.1
--- /dev/null   Tue Nov 15 15:54:43 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/FcTransaction.fractal       Tue 
Nov 15 15:54:43 2005
@@ -0,0 +1,62 @@
+<?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">
+
+<definition name="org.objectweb.gotm.lib.FcTransaction" 
+       arguments="gotm-protocol,gotm-communication">
+
+  <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"
+        
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
+  <interface name="subscribe" role="server"
+        signature="org.objectweb.transaction.api.message.SubscribeFeature"/>
+  <interface name="reference-provider" role="server"
+        signature="org.objectweb.gotm.lib.reference.ReferenceProvider"/>
+  <interface name="timeout-attr" role="server"
+        signature="org.objectweb.gotm.lib.coordination.TimeoutAttribute"/>
+
+  <component name="TransactionState"
+       
definition="org.objectweb.gotm.lib.transaction.FcTransactionStateAuto"/>
+  <component name="CommitEngine"
+       definition="org.objectweb.gotm.lib.coordination.FcCommitEngine"/>
+  <component name="CommitProtocol"
+       definition="${gotm-protocol}"/>
+  <component name="CommunicationManager"
+       definition="${gotm-communication}"/>
+  <component name="XidFactory"
+       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.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="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="CommitProtocol.sync-publish"       
server="CommunicationManager.sync-publish"/>
+  <binding client="CommitProtocol.async-publish"      
server="CommunicationManager.async-publish"/>
+  <binding client="CommitProtocol.reference-provider" 
server="XidFactory.reference-provider"/>
+</definition>
\ No newline at end of file
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PC.fractal
diff -u gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PC.fractal:1.2 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PC.fractal:removed
--- gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PC.fractal:1.2  Tue 
Sep  6 10:01:46 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PC.fractal      Tue 
Nov 15 15:54:43 2005
@@ -1,23 +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.lib.protocol.Fc2PC" 
extends="org.objectweb.gotm.lib.protocol.Fc2PCAbstract">
-  <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.init-log"       server="LogManager.empty"/>
-  <binding client="this.vote-log"       server="LogManager.force"/>
-  <binding client="this.commit-log"     server="LogManager.force"/>
-  <binding client="this.commit-ack-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-ack-log"  server="LogManager.force"/>
-  <binding client="this.abort-end-log"  server="LogManager.no-force"/>
-
-  <binding client="LogManager.reference-provider" 
server="this.reference-provider"/>
-</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCAbstract.fractal
diff -u 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCAbstract.fractal:1.3 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCAbstract.fractal:removed
--- 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCAbstract.fractal:1.3  
Mon Nov  7 09:50:32 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCAbstract.fractal    
  Tue Nov 15 15:54:43 2005
@@ -1,38 +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.lib.protocol.Fc2PCAbstract">
-  <interface name="prepare-decision" role="server"
-        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"
-        signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
-  <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"
-        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"
-        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"/>
-</definition>
\ No newline at end of file
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCNoLog.fractal
diff -u 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCNoLog.fractal:1.1 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCNoLog.fractal:removed
--- gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCNoLog.fractal:1.1   
  Fri Aug 12 14:31:22 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCNoLog.fractal Tue 
Nov 15 15:54:43 2005
@@ -1,21 +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.lib.protocol.Fc2PCNoLog" 
extends="org.objectweb.gotm.lib.protocol.Fc2PCAbstract">
-  <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.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.vote-log"       server="LogManager.log"/>
-  <binding client="this.commit-ack-log" server="LogManager.log"/>
-  <binding client="this.abort-ack-log"  server="LogManager.log"/>
-</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPA.fractal
diff -u gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPA.fractal:1.2 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPA.fractal:removed
--- gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPA.fractal:1.2      
  Tue Sep  6 10:01:46 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPA.fractal    Tue 
Nov 15 15:54:43 2005
@@ -1,23 +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.lib.protocol.Fc2PCPA" 
extends="org.objectweb.gotm.lib.protocol.Fc2PCAbstract">
-  <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.init-log"       server="LogManager.empty"/>
-  <binding client="this.vote-log"       server="LogManager.force"/>
-  <binding client="this.commit-log"     server="LogManager.force"/>
-  <binding client="this.commit-ack-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-ack-log"  server="LogManager.no-force"/>
-  <binding client="this.abort-end-log"  server="LogManager.empty"/>
-  
-  <binding client="LogManager.reference-provider" 
server="this.reference-provider"/>
-</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPC.fractal
diff -u gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPC.fractal:1.2 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPC.fractal:removed
--- gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPC.fractal:1.2      
  Tue Sep  6 10:01:46 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPC.fractal    Tue 
Nov 15 15:54:43 2005
@@ -1,23 +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.lib.protocol.Fc2PCPC" 
extends="org.objectweb.gotm.lib.protocol.Fc2PCAbstract">
-  <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.init-log"       server="LogManager.force"/>
-  <binding client="this.vote-log"       server="LogManager.force"/>
-  <binding client="this.commit-log"     server="LogManager.force"/>
-  <binding client="this.commit-ack-log" server="LogManager.no-force"/>
-  <binding client="this.commit-end-log" server="LogManager.empty"/>
-  <binding client="this.abort-log"      server="LogManager.empty"/>
-  <binding client="this.abort-ack-log"  server="LogManager.force"/>
-  <binding client="this.abort-end-log"  server="LogManager.no-force"/>
-
-  <binding client="LogManager.reference-provider" 
server="this.reference-provider"/>
-</definition>
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal:1.1
--- /dev/null   Tue Nov 15 15:54:43 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PC.fractal  
Tue Nov 15 15:54:43 2005
@@ -0,0 +1,21 @@
+<?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.lib.protocol.coordinator.Fc2PC" 
+         extends="org.objectweb.gotm.lib.protocol.coordinator.Fc2PCAbstract">
+  <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.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="LogManager.reference-provider" 
server="this.reference-provider"/>
+</definition>
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal:1.1
--- /dev/null   Tue Nov 15 15:54:43 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCAbstract.fractal
  Tue Nov 15 15:54:43 2005
@@ -0,0 +1,32 @@
+<?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.lib.protocol.coordinator.Fc2PCAbstract">
+  <interface name="prepare-decision" role="server"
+        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"
+        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"
+        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"/>
+</definition>
\ No newline at end of file
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal:1.1
--- /dev/null   Tue Nov 15 15:54:43 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCNoLog.fractal
     Tue Nov 15 15:54:43 2005
@@ -0,0 +1,19 @@
+<?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.lib.protocol.coordinator.Fc2PCNoLog" 
+         extends="org.objectweb.gotm.lib.protocol.coordinator.Fc2PCAbstract">
+  <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.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"/>
+</definition>
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal:1.1
--- /dev/null   Tue Nov 15 15:54:43 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPA.fractal  
      Tue Nov 15 15:54:43 2005
@@ -0,0 +1,21 @@
+<?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.lib.protocol.coordinator.Fc2PCPA" 
+         extends="org.objectweb.gotm.lib.protocol.coordinator.Fc2PCAbstract">
+  <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.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="LogManager.reference-provider" 
server="this.reference-provider"/>
+</definition>
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal:1.1
--- /dev/null   Tue Nov 15 15:54:43 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/coordinator/Fc2PCPC.fractal  
      Tue Nov 15 15:54:43 2005
@@ -0,0 +1,21 @@
+<?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.lib.protocol.coordinator.Fc2PCPC" 
+         extends="org.objectweb.gotm.lib.protocol.coordinator.Fc2PCAbstract">
+  <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.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="LogManager.reference-provider" 
server="this.reference-provider"/>
+</definition>
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal:1.1
--- /dev/null   Tue Nov 15 15:54:43 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PC.fractal  
Tue Nov 15 15:54:43 2005
@@ -0,0 +1,16 @@
+<?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.lib.protocol.participant.Fc2PC" 
+         extends="org.objectweb.gotm.lib.protocol.participant.Fc2PCAbstract">
+  <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="LogManager.reference-provider" 
server="this.reference-provider"/>
+</definition>
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal:1.1
--- /dev/null   Tue Nov 15 15:54:43 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCAbstract.fractal
  Tue Nov 15 15:54:43 2005
@@ -0,0 +1,16 @@
+<?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.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"
+        signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
+
+  <interface name="reference-provider" role="client"
+        signature="org.objectweb.gotm.lib.reference.ReferenceProvider"/>
+</definition>
\ No newline at end of file
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal:1.1
--- /dev/null   Tue Nov 15 15:54:43 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCNoLog.fractal
     Tue Nov 15 15:54:43 2005
@@ -0,0 +1,14 @@
+<?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.lib.protocol.participant.Fc2PCNoLog" 
+         extends="org.objectweb.gotm.lib.protocol.participant.Fc2PCAbstract">
+  <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"/>
+</definition>
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal:1.1
--- /dev/null   Tue Nov 15 15:54:43 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPA.fractal  
      Tue Nov 15 15:54:43 2005
@@ -0,0 +1,16 @@
+<?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.lib.protocol.participant.Fc2PCPA" 
+         extends="org.objectweb.gotm.lib.protocol.participant.Fc2PCAbstract">
+  <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="LogManager.reference-provider" 
server="this.reference-provider"/>
+</definition>
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal:1.1
--- /dev/null   Tue Nov 15 15:54:43 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/participant/Fc2PCPC.fractal  
      Tue Nov 15 15:54:43 2005
@@ -0,0 +1,16 @@
+<?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.lib.protocol.participant.Fc2PCPC" 
+         extends="org.objectweb.gotm.lib.protocol.participant.Fc2PCAbstract">
+  <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="LogManager.reference-provider" 
server="this.reference-provider"/>
+</definition>
Index: 
gotm/src/java/org/objectweb/gotm/lib/current/CurrentManagerWithReference.java
diff -u 
gotm/src/java/org/objectweb/gotm/lib/current/CurrentManagerWithReference.java:1.2
 
gotm/src/java/org/objectweb/gotm/lib/current/CurrentManagerWithReference.java:1.3
--- 
gotm/src/java/org/objectweb/gotm/lib/current/CurrentManagerWithReference.java:1.2
   Fri Oct 14 13:43:54 2005
+++ 
gotm/src/java/org/objectweb/gotm/lib/current/CurrentManagerWithReference.java 
      Tue Nov 15 15:54:43 2005
@@ -23,7 +23,7 @@
 Contributor(s): .
 
 ---------------------------------------------------------------------
-$Id: CurrentManagerWithReference.java,v 1.2 2005/10/14 11:43:54 rouvoy Exp $
+$Id: CurrentManagerWithReference.java,v 1.3 2005/11/15 14:54:43 rouvoy Exp $
 ====================================================================*/
 package org.objectweb.gotm.lib.current;
 
@@ -41,8 +41,8 @@
 /**
  * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
  * @created 31 août 2005
- * @modified $Date: 2005/10/14 11:43:54 $
- * @version $Revision: 1.2 $
+ * @modified $Date: 2005/11/15 14:54:43 $
+ * @version $Revision: 1.3 $
  * @fractal.itf 
  */
 public class CurrentManagerWithReference
@@ -69,6 +69,7 @@
      */
     private ReferenceFeature getReference() {
         Component c = getCurrent();
+        if (c==null) return null;
         try {
             return 
((ReferenceProvider)c.getFcInterface(ReferenceProvider.REFERENCE_PROVIDER)).getReference();
         } catch (NoSuchInterfaceException e) {



<--  Date Index  --> <--  Thread Index  -->

Reply via email to:

Powered by MHonArc.

Copyright © 2006-2007, OW2 Consortium | contact | webmaster.