OW2 Consortium
Search OW2 Mail Archive: 

Advanced Search - Powered by Google


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

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

CVS update of gotm (66 files)


    Date: Friday, August 12, 2005 @ 14:31:23
  Author: rouvoy
    Path: /cvsroot/gotm/gotm

   Added: 
src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal
          
          src/fractal/org/objectweb/gotm/lib/event/FcEventBusAbstract.fractal
           src/fractal/org/objectweb/gotm/lib/event/FcEventBusPool.fractal
          src/fractal/org/objectweb/gotm/lib/event/FcEventBusSimple.fractal
          
          src/fractal/org/objectweb/gotm/lib/event/FcEventBusThread.fractal
           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
          src/java/org/objectweb/gotm/api/TransactionService.java
          
src/java/org/objectweb/gotm/lib/coordination/ProbeCommitProtocol.java
           src/java/org/objectweb/gotm/lib/current/CurrentManager.java
          src/java/org/objectweb/gotm/lib/current/CurrentManagerImpl.java
          src/java/org/objectweb/gotm/lib/factory/Configurable.java
          src/java/org/objectweb/gotm/lib/factory/TransactionFactory.java
          
src/java/org/objectweb/gotm/lib/factory/TransactionFactoryAdaptive.java
          
          
src/java/org/objectweb/gotm/lib/factory/TransactionFactoryAttributeController.java
          
          src/java/org/objectweb/gotm/lib/factory/TransactionFactoryCache.java
          
          src/java/org/objectweb/gotm/lib/factory/TransactionFactoryImpl.java
           src/java/org/objectweb/gotm/lib/probe/ProbeAbstract.java
Modified: .settings/org.eclipse.core.resources.prefs
          src/fractal/org/objectweb/gotm/lib/logging/TpLogManagerHOWL.fractal
           src/java/org/objectweb/gotm/GotmFactory.java
          src/java/org/objectweb/gotm/lib/coordination/TimeoutImpl.java
          src/java/org/objectweb/gotm/lib/event/PublishASyncPool.java
          src/java/org/objectweb/gotm/lib/event/PublishSimple.java
          src/java/org/objectweb/gotm/lib/event/PublishSyncThread.java
          src/java/org/objectweb/gotm/lib/event/SubscribablePrimitive.java
          src/java/org/objectweb/gotm/lib/event/SubscriberPool.java
          src/java/org/objectweb/gotm/lib/event/SubscriberProvider.java
          
src/java/org/objectweb/gotm/lib/resource/ResourceManagerAbstract.java
 Removed: 
src/fractal/org/objectweb/gotm/lib/coordination/TpCommitEngine.fractal
          
          src/fractal/org/objectweb/gotm/lib/event/TpEventBusAbstract.fractal
           src/fractal/org/objectweb/gotm/lib/event/TpEventBusPool.fractal
          src/fractal/org/objectweb/gotm/lib/event/TpEventBusSimple.fractal
          
          src/fractal/org/objectweb/gotm/lib/event/TpEventBusThread.fractal
           src/fractal/org/objectweb/gotm/lib/protocol/Tp2PC.fractal
          src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCAbstract.fractal
           src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCNoLog.fractal
          src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPA.fractal
          src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPC.fractal
          src/java/org/objectweb/gotm/Gotm.java
          src/java/org/objectweb/gotm/GotmFactoryAttributes.java
          src/java/org/objectweb/gotm/GotmFactoryImpl.java
          src/java/org/objectweb/gotm/api/utils/ComponentMap.java
          src/java/org/objectweb/gotm/api/utils/ComponentPool.java
          src/java/org/objectweb/gotm/api/utils/ComponentTreatment.java
          src/java/org/objectweb/gotm/api/utils/FactoryFeature.java
          src/java/org/objectweb/gotm/api/utils/Map.java
          src/java/org/objectweb/gotm/api/utils/Pool.java
          src/java/org/objectweb/gotm/api/utils/StringFactoryFeature.java
          src/java/org/objectweb/gotm/lib/CurrentManager.java
          src/java/org/objectweb/gotm/lib/CurrentManagerAbstract.java
          src/java/org/objectweb/gotm/lib/StaticCurrentManager.java
          src/java/org/objectweb/gotm/lib/context/CommitProtocolAwareness.java
           src/java/org/objectweb/gotm/lib/context/Configurable.java
          
src/java/org/objectweb/gotm/lib/context/ConfigurableCurrentManager.java
           src/java/org/objectweb/gotm/lib/context/ContextAwareness.java
          src/java/org/objectweb/gotm/lib/context/ContextAwarenessImpl.java
           src/java/org/objectweb/gotm/lib/utils/ComponentMapImpl.java
          src/java/org/objectweb/gotm/lib/utils/ComponentPoolImpl.java
          
src/java/org/objectweb/gotm/lib/utils/StateFullFactoryFeatureImpl.java
          
          
src/java/org/objectweb/gotm/lib/utils/StateFullStringFactoryFeatureImpl.java
          
          
src/java/org/objectweb/gotm/lib/utils/StateLessFactoryFeatureImpl.java
          
          
src/java/org/objectweb/gotm/lib/utils/StateLessStringFactoryFeatureImpl.java

* Replacing template ADL declaration by classic Fractal ADL declaration.
* Implicit support of template components.
* Support of UserTransaction as current.
* Support for dynamic adaptability.
* Updating performance benchmark.
* Removing unused utils components.


------------------------------------------------------------------------------------+
 .settings/org.eclipse.core.resources.prefs                                   
      |   22 -
 src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal       
      |   70 +++
 src/fractal/org/objectweb/gotm/lib/coordination/TpCommitEngine.fractal       
      |   72 ---
 src/fractal/org/objectweb/gotm/lib/event/FcEventBusAbstract.fractal          
      |   19 +
 src/fractal/org/objectweb/gotm/lib/event/FcEventBusPool.fractal              
      |   25 +
 src/fractal/org/objectweb/gotm/lib/event/FcEventBusSimple.fractal            
      |   16 
 src/fractal/org/objectweb/gotm/lib/event/FcEventBusThread.fractal            
      |   21 +
 src/fractal/org/objectweb/gotm/lib/event/TpEventBusAbstract.fractal          
      |   21 -
 src/fractal/org/objectweb/gotm/lib/event/TpEventBusPool.fractal              
      |   27 -
 src/fractal/org/objectweb/gotm/lib/event/TpEventBusSimple.fractal            
      |   18 
 src/fractal/org/objectweb/gotm/lib/event/TpEventBusThread.fractal            
      |   23 -
 src/fractal/org/objectweb/gotm/lib/logging/TpLogManagerHOWL.fractal          
      |   12 
 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/Tp2PC.fractal                    
      |   19 -
 src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCAbstract.fractal            
      |   45 --
 src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCNoLog.fractal               
      |   18 
 src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPA.fractal                  
      |   19 -
 src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPC.fractal                  
      |   19 -
 src/java/org/objectweb/gotm/Gotm.java                                        
      |  111 ------
 src/java/org/objectweb/gotm/GotmFactory.java                                 
      |  100 +++++
 src/java/org/objectweb/gotm/GotmFactoryAttributes.java                       
      |   63 ---
 src/java/org/objectweb/gotm/GotmFactoryImpl.java                             
      |  139 -------
 src/java/org/objectweb/gotm/api/TransactionService.java                      
      |   50 ++
 src/java/org/objectweb/gotm/api/utils/ComponentMap.java                      
      |   57 ---
 src/java/org/objectweb/gotm/api/utils/ComponentPool.java                     
      |   62 ---
 src/java/org/objectweb/gotm/api/utils/ComponentTreatment.java                
      |   50 --
 src/java/org/objectweb/gotm/api/utils/FactoryFeature.java                    
      |   49 --
 src/java/org/objectweb/gotm/api/utils/Map.java                               
      |   45 --
 src/java/org/objectweb/gotm/api/utils/Pool.java                              
      |   44 --
 src/java/org/objectweb/gotm/api/utils/StringFactoryFeature.java              
      |   52 --
 src/java/org/objectweb/gotm/lib/CurrentManager.java                          
      |   70 ---
 src/java/org/objectweb/gotm/lib/CurrentManagerAbstract.java                  
      |  185 ----------
 src/java/org/objectweb/gotm/lib/StaticCurrentManager.java                    
      |   99 -----
 src/java/org/objectweb/gotm/lib/context/CommitProtocolAwareness.java         
      |  112 ------
 src/java/org/objectweb/gotm/lib/context/Configurable.java                    
      |   52 --
 src/java/org/objectweb/gotm/lib/context/ConfigurableCurrentManager.java      
      |  162 --------
 src/java/org/objectweb/gotm/lib/context/ContextAwareness.java                
      |   55 --
 src/java/org/objectweb/gotm/lib/context/ContextAwarenessImpl.java            
      |   92 ----
 src/java/org/objectweb/gotm/lib/coordination/ProbeCommitProtocol.java        
      |   95 +++++
 src/java/org/objectweb/gotm/lib/coordination/TimeoutImpl.java                
      |    6 
 src/java/org/objectweb/gotm/lib/current/CurrentManager.java                  
      |   70 +++
 src/java/org/objectweb/gotm/lib/current/CurrentManagerImpl.java              
      |  122 ++++++
 src/java/org/objectweb/gotm/lib/event/PublishASyncPool.java                  
      |   13 
 src/java/org/objectweb/gotm/lib/event/PublishSimple.java                     
      |   13 
 src/java/org/objectweb/gotm/lib/event/PublishSyncThread.java                 
      |   19 -
 src/java/org/objectweb/gotm/lib/event/SubscribablePrimitive.java             
      |   15 
 src/java/org/objectweb/gotm/lib/event/SubscriberPool.java                    
      |   27 +
 src/java/org/objectweb/gotm/lib/event/SubscriberProvider.java                
      |   11 
 src/java/org/objectweb/gotm/lib/factory/Configurable.java                    
      |   58 +++
 src/java/org/objectweb/gotm/lib/factory/TransactionFactory.java              
      |   55 ++
 src/java/org/objectweb/gotm/lib/factory/TransactionFactoryAdaptive.java      
      |  139 +++++++
 
src/java/org/objectweb/gotm/lib/factory/TransactionFactoryAttributeController.java
 |   49 ++
 src/java/org/objectweb/gotm/lib/factory/TransactionFactoryCache.java         
      |   84 ++++
 src/java/org/objectweb/gotm/lib/factory/TransactionFactoryImpl.java          
      |  146 +++++++
 src/java/org/objectweb/gotm/lib/probe/ProbeAbstract.java                     
      |   85 ++++
 src/java/org/objectweb/gotm/lib/resource/ResourceManagerAbstract.java        
      |    8 
 src/java/org/objectweb/gotm/lib/utils/ComponentMapImpl.java                  
      |  118 ------
 src/java/org/objectweb/gotm/lib/utils/ComponentPoolImpl.java                 
      |  106 -----
 src/java/org/objectweb/gotm/lib/utils/StateFullFactoryFeatureImpl.java       
      |   69 ---
 src/java/org/objectweb/gotm/lib/utils/StateFullStringFactoryFeatureImpl.java 
      |   68 ---
 src/java/org/objectweb/gotm/lib/utils/StateLessFactoryFeatureImpl.java       
      |   80 ----
 src/java/org/objectweb/gotm/lib/utils/StateLessStringFactoryFeatureImpl.java 
      |   61 ---
 66 files changed, 1422 insertions(+), 2338 deletions(-)


Index: gotm/.settings/org.eclipse.core.resources.prefs
diff -u gotm/.settings/org.eclipse.core.resources.prefs:1.5 
gotm/.settings/org.eclipse.core.resources.prefs:1.6
--- gotm/.settings/org.eclipse.core.resources.prefs:1.5 Fri Aug  5 17:06:29 
2005
+++ gotm/.settings/org.eclipse.core.resources.prefs     Fri Aug 12 14:31:23 
2005
@@ -1,13 +1,13 @@
-#Mon Aug 01 16:01:41 CEST 2005
+#Fri Aug 12 13:15:47 CEST 2005
 eclipse.preferences.version=1
-encoding//src/fractal/org/objectweb/gotm/lib/coordination/TpCommitEngine.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/event/TpEventBusAbstract.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/event/TpEventBusPool.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/event/TpEventBusSimple.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/event/TpEventBusThread.fractal=ISO-8859-1
+encoding//src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal=ISO-8859-1
+encoding//src/fractal/org/objectweb/gotm/lib/event/FcEventBusAbstract.fractal=ISO-8859-1
+encoding//src/fractal/org/objectweb/gotm/lib/event/FcEventBusPool.fractal=ISO-8859-1
+encoding//src/fractal/org/objectweb/gotm/lib/event/FcEventBusSimple.fractal=ISO-8859-1
+encoding//src/fractal/org/objectweb/gotm/lib/event/FcEventBusThread.fractal=ISO-8859-1
 
encoding//src/fractal/org/objectweb/gotm/lib/logging/TpLogManagerHOWL.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/protocol/Tp2PC.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCAbstract.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCNoLog.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPA.fractal=ISO-8859-1
-encoding//src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPC.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
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal:1.1
--- /dev/null   Fri Aug 12 14:31:24 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/coordination/FcCommitEngine.fractal 
Fri Aug 12 14:31:23 2005
@@ -0,0 +1,70 @@
+<?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.coordination.FcCommitEngine">
+  <interface name="commit-one" role="server"
+        
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
+  <interface name="commit" role="server"
+        
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
+  <interface name="abort" role="server"
+        
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
+  <interface name="timeout-attr" role="server"
+        signature="org.objectweb.gotm.lib.coordination.TimeoutAttribute"/>
+
+  <interface name="tx-state" role="client"
+        
signature="org.objectweb.transaction.api.transaction.TransactionState"/>
+  <interface name="timeout-subscribe" role="client"
+        signature="org.objectweb.transaction.api.event.SubscribeFeature"/>
+  <interface name="prepare-decision" role="client"
+        signature="org.objectweb.transaction.api.event.PublishFeature"/>
+  <interface name="commit-decision" role="client"
+        signature="org.objectweb.transaction.api.event.PublishFeature"/>
+  <interface name="abort-decision" role="client"
+        signature="org.objectweb.transaction.api.event.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"
+        signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
+
+  <component name="Timeout"
+       definition="org.objectweb.gotm.lib.coordination.FcTimeoutImpl"/>
+  <component name="Fc2PC" 
+       definition="org.objectweb.gotm.lib.coordination.FcTwoPCFeature"/>
+  <component name="FcCommit"
+       definition="org.objectweb.gotm.lib.coordination.FcCommitFeature"/>
+  <component name="FcAbort"
+       definition="org.objectweb.gotm.lib.coordination.FcAbortFeature"/>
+
+  <binding client="this.commit-one"   server="FcCommit.coord-process"/>
+  <binding client="this.commit"       server="Fc2PC.coord-process"/>
+  <binding client="this.abort"        server="FcAbort.coord-process"/>
+  <binding client="this.timeout-attr" server="Timeout.timeout-attr"/>
+
+  <binding client="Fc2PC.commit"    server="FcCommit.coord-process"/>
+  <binding client="Fc2PC.tx-state"  server="this.tx-state"/>
+  <binding client="Fc2PC.abort"     server="FcAbort.coord-process"/>
+  <binding client="Fc2PC.publish"   server="this.prepare-decision"/>
+  <binding client="Fc2PC.begin-log" server="this.init-log"/>
+
+  <binding client="FcCommit.tx-state"  server="this.tx-state"/>
+  <binding client="FcCommit.abort"     server="FcAbort.coord-process"/>
+  <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="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="Timeout.subscribe"     server="this.timeout-subscribe"/>
+  <binding client="Timeout.coord-process" server="FcAbort.coord-process"/>
+</definition>
\ No newline at end of file
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/coordination/TpCommitEngine.fractal
diff -u 
gotm/src/fractal/org/objectweb/gotm/lib/coordination/TpCommitEngine.fractal:1.3
 
gotm/src/fractal/org/objectweb/gotm/lib/coordination/TpCommitEngine.fractal:removed
--- 
gotm/src/fractal/org/objectweb/gotm/lib/coordination/TpCommitEngine.fractal:1.3
     Fri Aug  5 17:06:29 2005
+++ 
gotm/src/fractal/org/objectweb/gotm/lib/coordination/TpCommitEngine.fractal 
Fri Aug 12 14:31:24 2005
@@ -1,72 +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.coordination.TpCommitEngine">
-  <interface name="commit-one" role="server"
-        
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
-  <interface name="commit" role="server"
-        
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
-  <interface name="abort" role="server"
-        
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"/>
-  <interface name="timeout-attr" role="server"
-        signature="org.objectweb.gotm.lib.coordination.TimeoutAttribute"/>
-
-  <interface name="tx-state" role="client"
-        
signature="org.objectweb.transaction.api.transaction.TransactionState"/>
-  <interface name="timeout-subscribe" role="client"
-        signature="org.objectweb.transaction.api.event.SubscribeFeature"/>
-  <interface name="prepare-decision" role="client"
-        signature="org.objectweb.transaction.api.event.PublishFeature"/>
-  <interface name="commit-decision" role="client"
-        signature="org.objectweb.transaction.api.event.PublishFeature"/>
-  <interface name="abort-decision" role="client"
-        signature="org.objectweb.transaction.api.event.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"
-        signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
-
-  <component name="Timeout"
-       definition="org.objectweb.gotm.lib.coordination.TpTimeoutImpl"/>
-  <component name="Fc2PC" 
-       definition="org.objectweb.gotm.lib.coordination.TpTwoPCFeature"/>
-  <component name="FcCommit"
-       definition="org.objectweb.gotm.lib.coordination.TpCommitFeature"/>
-  <component name="FcAbort"
-       definition="org.objectweb.gotm.lib.coordination.TpAbortFeature"/>
-
-  <binding client="this.commit-one"   server="FcCommit.coord-process"/>
-  <binding client="this.commit"       server="Fc2PC.coord-process"/>
-  <binding client="this.abort"        server="FcAbort.coord-process"/>
-  <binding client="this.timeout-attr" server="Timeout.timeout-attr"/>
-
-  <binding client="Fc2PC.commit"    server="FcCommit.coord-process"/>
-  <binding client="Fc2PC.tx-state"  server="this.tx-state"/>
-  <binding client="Fc2PC.abort"     server="FcAbort.coord-process"/>
-  <binding client="Fc2PC.publish"   server="this.prepare-decision"/>
-  <binding client="Fc2PC.begin-log" server="this.init-log"/>
-
-  <binding client="FcCommit.tx-state"  server="this.tx-state"/>
-  <binding client="FcCommit.abort"     server="FcAbort.coord-process"/>
-  <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="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="Timeout.subscribe"     server="this.timeout-subscribe"/>
-  <binding client="Timeout.coord-process" server="FcAbort.coord-process"/>
-
-  <template-controller desc="compositeTemplate" />
-</definition>
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusAbstract.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusAbstract.fractal:1.1
--- /dev/null   Fri Aug 12 14:31:24 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusAbstract.fractal  
  Fri Aug 12 14:31:22 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.event.FcEventBusAbstract">
+  <interface name="subscribe" role="server"
+        signature="org.objectweb.transaction.api.event.SubscribeFeature"/>
+  <interface name="sync-publish" role="server"
+        signature="org.objectweb.transaction.api.event.PublishFeature"/>
+  <interface name="async-publish" role="server"
+        signature="org.objectweb.transaction.api.event.PublishFeature"/>
+
+  <component name="FcSubscribers"
+       definition="org.objectweb.gotm.lib.event.FcSubscriberPool"/>
+  
+  <binding client="this.subscribe" 
+           server="FcSubscribers.subscribe"/>
+</definition>
\ No newline at end of file
Index: gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusPool.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusPool.fractal:1.1
--- /dev/null   Fri Aug 12 14:31:24 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusPool.fractal      
  Fri Aug 12 14:31:22 2005
@@ -0,0 +1,25 @@
+<?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.event.FcEventBusThread" 
extends="org.objectweb.gotm.lib.event.FcEventBusAbstract">
+  <component name="FcSyncPublish"
+       definition="org.objectweb.gotm.lib.event.FcPublishSyncThread"/>
+  <component name="FcASyncPublish"
+       definition="org.objectweb.gotm.lib.event.FcPublishASyncPool"/>
+  <component name="FcThreadPool"
+       definition="org.objectweb.util.thread.comp.FcThreadManager(10,100)"/>
+  
+  <binding client="this.sync-publish" 
+           server="FcSyncPublish.publish"/>
+  <binding client="FcSyncPublish.subscriber-provider" 
+           server="FcSubscribers.subscriber-provider"/>
+
+  <binding client="this.async-publish" 
+           server="FcASyncPublish.publish"/>
+  <binding client="FcASyncPublish.subscriber-provider" 
+           server="FcSubscribers.subscriber-provider"/>
+  <binding client="FcASyncPublish.runnable-manager"
+           server="FcThreadPool.runnable-manager"/>
+</definition>
\ No newline at end of file
Index: gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusSimple.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusSimple.fractal:1.1
--- /dev/null   Fri Aug 12 14:31:24 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusSimple.fractal    
  Fri Aug 12 14:31:22 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.event.FcEventBusSimple" 
extends="org.objectweb.gotm.lib.event.FcEventBusAbstract">
+  <component name="FcSyncPublish"
+       definition="org.objectweb.gotm.lib.event.FcPublishSimple"/>
+  
+  <binding client="this.async-publish" 
+           server="FcSyncPublish.publish"/>
+  <binding client="this.sync-publish" 
+           server="FcSyncPublish.publish"/>
+  <binding client="FcSyncPublish.subscriber-provider" 
+           server="FcSubscribers.subscriber-provider"/>
+</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusThread.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusThread.fractal:1.1
--- /dev/null   Fri Aug 12 14:31:24 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/event/FcEventBusThread.fractal    
  Fri Aug 12 14:31:22 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.event.FcEventBusThread" 
extends="org.objectweb.gotm.lib.event.FcEventBusAbstract">
+  <component name="FcSyncPublish"
+       definition="org.objectweb.gotm.lib.event.FcPublishSyncThread"/>
+  <component name="FcASyncPublish"
+       definition="org.objectweb.gotm.lib.event.FcPublishASyncThread"/>
+  
+  <binding client="this.sync-publish" 
+           server="FcSyncPublish.publish"/>
+  <binding client="FcSyncPublish.subscriber-provider" 
+           server="FcSubscribers.subscriber-provider"/>
+
+  <binding client="this.async-publish" 
+           server="FcASyncPublish.publish"/>
+  <binding client="FcASyncPublish.subscriber-provider" 
+           server="FcSubscribers.subscriber-provider"/>
+</definition>
\ No newline at end of file
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusAbstract.fractal
diff -u 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusAbstract.fractal:1.1 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusAbstract.fractal:removed
--- 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusAbstract.fractal:1.1  
      Fri Aug  5 17:06:28 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusAbstract.fractal  
  Fri Aug 12 14:31:24 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.event.TpEventBusAbstract">
-  <interface name="subscribe" role="server"
-        signature="org.objectweb.transaction.api.event.SubscribeFeature"/>
-  <interface name="sync-publish" role="server"
-        signature="org.objectweb.transaction.api.event.PublishFeature"/>
-  <interface name="async-publish" role="server"
-        signature="org.objectweb.transaction.api.event.PublishFeature"/>
-
-  <component name="FcSubscribers"
-       definition="org.objectweb.gotm.lib.event.TpSubscriberPool"/>
-  
-  <binding client="this.subscribe" 
-           server="FcSubscribers.subscribe"/>
-
-  <template-controller desc="compositeTemplate" />
-</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusPool.fractal
diff -u 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusPool.fractal:1.1 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusPool.fractal:removed
--- gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusPool.fractal:1.1  
  Fri Aug  5 17:06:28 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusPool.fractal      
  Fri Aug 12 14:31:24 2005
@@ -1,27 +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.event.TpEventBusThread" 
extends="org.objectweb.gotm.lib.event.TpEventBusAbstract">
-  <component name="FcSyncPublish"
-       definition="org.objectweb.gotm.lib.event.TpPublishSyncThread"/>
-  <component name="FcASyncPublish"
-       definition="org.objectweb.gotm.lib.event.TpPublishASyncPool"/>
-  <component name="FcThreadPool"
-       definition="org.objectweb.util.thread.comp.TpThreadManager(10,100)"/>
-  
-  <binding client="this.sync-publish" 
-           server="FcSyncPublish.publish"/>
-  <binding client="FcSyncPublish.subscriber-provider" 
-           server="FcSubscribers.subscriber-provider"/>
-
-  <binding client="this.async-publish" 
-           server="FcASyncPublish.publish"/>
-  <binding client="FcASyncPublish.subscriber-provider" 
-           server="FcSubscribers.subscriber-provider"/>
-  <binding client="FcASyncPublish.runnable-manager"
-           server="FcThreadPool.runnable-manager"/>
-         
-  <template-controller desc="compositeTemplate" />
-</definition>
\ No newline at end of file
Index: gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusSimple.fractal
diff -u 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusSimple.fractal:1.1 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusSimple.fractal:removed
--- 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusSimple.fractal:1.1  
Fri Aug  5 17:06:28 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusSimple.fractal    
  Fri Aug 12 14:31:24 2005
@@ -1,18 +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.event.TpEventBusSimple" 
extends="org.objectweb.gotm.lib.event.TpEventBusAbstract">
-  <component name="FcSyncPublish"
-       definition="org.objectweb.gotm.lib.event.TpPublishSimple"/>
-  
-  <binding client="this.async-publish" 
-           server="FcSyncPublish.publish"/>
-  <binding client="this.sync-publish" 
-           server="FcSyncPublish.publish"/>
-  <binding client="FcSyncPublish.subscriber-provider" 
-           server="FcSubscribers.subscriber-provider"/>
-
-  <template-controller desc="compositeTemplate" />
-</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusThread.fractal
diff -u 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusThread.fractal:1.1 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusThread.fractal:removed
--- 
gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusThread.fractal:1.1  
Fri Aug  5 17:06:28 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/event/TpEventBusThread.fractal    
  Fri Aug 12 14:31:24 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.event.TpEventBusThread" 
extends="org.objectweb.gotm.lib.event.TpEventBusAbstract">
-  <component name="FcSyncPublish"
-       definition="org.objectweb.gotm.lib.event.TpPublishSyncThread"/>
-  <component name="FcASyncPublish"
-       definition="org.objectweb.gotm.lib.event.TpPublishASyncThread"/>
-  
-  <binding client="this.sync-publish" 
-           server="FcSyncPublish.publish"/>
-  <binding client="FcSyncPublish.subscriber-provider" 
-           server="FcSubscribers.subscriber-provider"/>
-
-  <binding client="this.async-publish" 
-           server="FcASyncPublish.publish"/>
-  <binding client="FcASyncPublish.subscriber-provider" 
-           server="FcSubscribers.subscriber-provider"/>
-         
-  <template-controller desc="compositeTemplate" />
-</definition>
Index: 
gotm/src/fractal/org/objectweb/gotm/lib/logging/TpLogManagerHOWL.fractal
diff -u 
gotm/src/fractal/org/objectweb/gotm/lib/logging/TpLogManagerHOWL.fractal:1.1 
gotm/src/fractal/org/objectweb/gotm/lib/logging/TpLogManagerHOWL.fractal:1.2
--- 
gotm/src/fractal/org/objectweb/gotm/lib/logging/TpLogManagerHOWL.fractal:1.1  
      Fri Aug  5 17:06:28 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/logging/TpLogManagerHOWL.fractal  
  Fri Aug 12 14:31:23 2005
@@ -3,7 +3,7 @@
           "-//objectweb.org//DTD Fractal ADL 2.0//EN" 
           "classpath://org/objectweb/fractal/adl/xml/standard.dtd">
 
-<definition name="org.objectweb.gotm.lib.logging.TpLogManagerHOWL" 
arguments="file,dir">
+<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"
@@ -15,13 +15,13 @@
         signature="org.objectweb.gotm.lib.xid.XidFeature"/>
   
   <component name="FcProvider"
-       
definition="org.objectweb.gotm.lib.logging.TpHOWLoggerProvider(${file},${dir})"/>
+       
definition="org.objectweb.gotm.lib.logging.FcHOWLoggerProvider(${file},${dir})"/>
   <component name="FcForceLogger"
-       definition="org.objectweb.gotm.lib.logging.TpGenericLogger(true)"/>
+       definition="org.objectweb.gotm.lib.logging.FcGenericLogger(true)"/>
   <component name="FcNoForceLogger"
-       definition="org.objectweb.gotm.lib.logging.TpGenericLogger(false)"/>
+       definition="org.objectweb.gotm.lib.logging.FcGenericLogger(false)"/>
   <component name="FcEmptyLogger"
-       definition="org.objectweb.gotm.lib.logging.TpSimpleLogger"/>
+       definition="org.objectweb.gotm.lib.logging.FcSimpleLogger"/>
 
   <binding client="this.force"                    
server="FcForceLogger.log"/>
   <binding client="FcForceLogger.logger-provider" 
server="FcProvider.logger-provider"/>
@@ -32,6 +32,4 @@
   <binding client="FcNoForceLogger.xid-provider"    
server="this.xid-provider"/>
 
   <binding client="this.empty" server="FcEmptyLogger.log"/>
-  
-  <template-controller desc="compositeTemplate" />
 </definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PC.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PC.fractal:1.1
--- /dev/null   Fri Aug 12 14:31:24 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PC.fractal      Fri 
Aug 12 14:31:22 2005
@@ -0,0 +1,23 @@
+<?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.xid-provider" server="this.xid-provider"/>
+</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCAbstract.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCAbstract.fractal:1.1
--- /dev/null   Fri Aug 12 14:31:24 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCAbstract.fractal    
  Fri Aug 12 14:31:22 2005
@@ -0,0 +1,38 @@
+<?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.event.PublishFeature"/>
+  <interface name="commit-decision" role="server"
+        signature="org.objectweb.transaction.api.event.PublishFeature"/>
+  <interface name="abort-decision" role="server"
+        signature="org.objectweb.transaction.api.event.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.event.PublishFeature"/>
+  <interface name="async-publish" role="client"
+        signature="org.objectweb.transaction.api.event.PublishFeature"/>
+  <interface name="xid-provider" role="client"
+        signature="org.objectweb.gotm.lib.xid.XidFeature"/>
+  
+  <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 /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCNoLog.fractal:1.1
--- /dev/null   Fri Aug 12 14:31:24 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCNoLog.fractal Fri 
Aug 12 14:31:22 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.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 /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPA.fractal:1.1
--- /dev/null   Fri Aug 12 14:31:24 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPA.fractal    Fri 
Aug 12 14:31:22 2005
@@ -0,0 +1,23 @@
+<?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.xid-provider" server="this.xid-provider"/>
+</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPC.fractal
diff -u /dev/null 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPC.fractal:1.1
--- /dev/null   Fri Aug 12 14:31:24 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Fc2PCPC.fractal    Fri 
Aug 12 14:31:22 2005
@@ -0,0 +1,23 @@
+<?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.xid-provider" server="this.xid-provider"/>
+</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PC.fractal
diff -u gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PC.fractal:1.1 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PC.fractal:removed
--- gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PC.fractal:1.1  Fri 
Aug  5 17:06:28 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PC.fractal      Fri 
Aug 12 14:31:24 2005
@@ -1,19 +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.Tp2PC" 
extends="org.objectweb.gotm.lib.protocol.Tp2PCAbstract">
-
-  <binding client="this.commit-decision" server="this.sync-publish"/>
-  <binding client="this.abort-decision"  server="this.sync-publish"/>
-  
-  <binding client="this.init-log"       server="this.empty"/>
-  <binding client="this.vote-log"       server="this.force"/>
-  <binding client="this.commit-log"     server="this.force"/>
-  <binding client="this.commit-ack-log" server="this.force"/>
-  <binding client="this.commit-end-log" server="this.no-force"/>
-  <binding client="this.abort-log"      server="this.force"/>
-  <binding client="this.abort-ack-log"  server="this.force"/>
-  <binding client="this.abort-end-log"  server="this.no-force"/>
-</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCAbstract.fractal
diff -u 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCAbstract.fractal:1.1 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCAbstract.fractal:removed
--- 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCAbstract.fractal:1.1  
Fri Aug  5 17:06:28 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCAbstract.fractal    
  Fri Aug 12 14:31:24 2005
@@ -1,45 +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.Tp2PCAbstract">
-  <interface name="prepare-decision" role="server"
-        signature="org.objectweb.transaction.api.event.PublishFeature"/>
-  <interface name="commit-decision" role="server"
-        signature="org.objectweb.transaction.api.event.PublishFeature"/>
-  <interface name="abort-decision" role="server"
-        signature="org.objectweb.transaction.api.event.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.event.PublishFeature"/>
-  <interface name="async-publish" role="client"
-        signature="org.objectweb.transaction.api.event.PublishFeature"/>
-  <interface name="force" role="client"
-        signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
-  <interface name="no-force" role="client"
-        signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
-  <interface name="empty" role="client"
-        signature="org.objectweb.transaction.api.logging.LoggerFeature"/>
-
-  
-  <binding client="this.prepare-decision" server="this.sync-publish"/>
-
-  <template-controller desc="compositeTemplate" />
-</definition>
\ No newline at end of file
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCNoLog.fractal
diff -u 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCNoLog.fractal:1.1 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCNoLog.fractal:removed
--- gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCNoLog.fractal:1.1   
  Fri Aug  5 17:06:28 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCNoLog.fractal Fri 
Aug 12 14:31:24 2005
@@ -1,18 +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.Tp2PCNoLog" 
extends="org.objectweb.gotm.lib.protocol.Tp2PCAbstract">
-  <binding client="this.commit-decision" server="this.sync-publish"/>
-  <binding client="this.abort-decision"  server="this.sync-publish"/>
-
-  <binding client="this.init-log"       server="this.empty"/>
-  <binding client="this.commit-log"     server="this.empty"/>
-  <binding client="this.abort-log"      server="this.empty"/>
-  <binding client="this.commit-end-log" server="this.empty"/>
-  <binding client="this.abort-end-log"  server="this.empty"/>
-  <binding client="this.vote-log"       server="this.empty"/>
-  <binding client="this.commit-ack-log" server="this.empty"/>
-  <binding client="this.abort-ack-log"  server="this.empty"/>
-</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPA.fractal
diff -u gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPA.fractal:1.1 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPA.fractal:removed
--- gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPA.fractal:1.1      
  Fri Aug  5 17:06:28 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPA.fractal    Fri 
Aug 12 14:31:24 2005
@@ -1,19 +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.Tp2PCPA" 
extends="org.objectweb.gotm.lib.protocol.Tp2PCAbstract">
-
-  <binding client="this.commit-decision" server="this.sync-publish"/>
-  <binding client="this.abort-decision"  server="this.async-publish"/>
-  
-  <binding client="this.init-log"       server="this.empty"/>
-  <binding client="this.vote-log"       server="this.force"/>
-  <binding client="this.commit-log"     server="this.force"/>
-  <binding client="this.commit-ack-log" server="this.force"/>
-  <binding client="this.commit-end-log" server="this.no-force"/>
-  <binding client="this.abort-log"      server="this.empty"/>
-  <binding client="this.abort-ack-log"  server="this.no-force"/>
-  <binding client="this.abort-end-log"  server="this.empty"/>
-</definition>
Index: gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPC.fractal
diff -u gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPC.fractal:1.1 
gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPC.fractal:removed
--- gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPC.fractal:1.1      
  Fri Aug  5 17:06:28 2005
+++ gotm/src/fractal/org/objectweb/gotm/lib/protocol/Tp2PCPC.fractal    Fri 
Aug 12 14:31:24 2005
@@ -1,19 +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.Tp2PCPC" 
extends="org.objectweb.gotm.lib.protocol.Tp2PCAbstract">
-
-  <binding client="this.commit-decision" server="this.async-publish"/>
-  <binding client="this.abort-decision"  server="this.sync-publish"/>
-  
-  <binding client="this.init-log"       server="this.force"/>
-  <binding client="this.vote-log"       server="this.force"/>
-  <binding client="this.commit-log"     server="this.force"/>
-  <binding client="this.commit-ack-log" server="this.no-force"/>
-  <binding client="this.commit-end-log" server="this.empty"/>
-  <binding client="this.abort-log"      server="this.empty"/>
-  <binding client="this.abort-ack-log"  server="this.force"/>
-  <binding client="this.abort-end-log"  server="this.no-force"/>
-</definition>
Index: gotm/src/java/org/objectweb/gotm/Gotm.java
diff -u gotm/src/java/org/objectweb/gotm/Gotm.java:1.6 
gotm/src/java/org/objectweb/gotm/Gotm.java:removed
--- gotm/src/java/org/objectweb/gotm/Gotm.java:1.6      Fri Aug  5 17:06:29 
2005
+++ gotm/src/java/org/objectweb/gotm/Gotm.java  Fri Aug 12 14:31:24 2005
@@ -1,111 +0,0 @@
-/*====================================================================
-
- GoTM: GoTM is an open Transaction Monitor
- Copyright (C) 2000-2004 INRIA & 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: Gotm.java,v 1.6 2005/08/05 15:06:29 rouvoy Exp $
- ====================================================================*/
-
-package org.objectweb.gotm;
-
-import java.util.Map;
-import java.util.logging.Logger;
-
-import org.objectweb.fractal.adl.Factory;
-import org.objectweb.fractal.adl.FactoryFactory;
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.api.Interface;
-import org.objectweb.fractal.api.NoSuchInterfaceException;
-import org.objectweb.fractal.api.control.IllegalLifeCycleException;
-import org.objectweb.fractal.util.Fractal;
-
-/**
- * Constructor class
- * 
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.6 $
- */
-public class Gotm {
-
-    /**
-     * @param desc
-     * @param context
-     * @return instance of component created.
-     */
-    public static final Component create(String desc, Map context) {
-        Component component ;
-        try {
-            Factory f = 
FactoryFactory.getFactory(FactoryFactory.FRACTAL_BACKEND);
-            component = (Component) f.newComponent(desc, context);
-        } catch (Exception e) {
-            Logger.getLogger("GoTM-Factory").severe("Failure when creating 
component");
-            throw new GoTMException(e);
-        }
-        try {
-            Fractal.getLifeCycleController(component).startFc();
-        } catch (Exception e) {
-            Logger.getLogger("GoTM-Factory").fine("No LifeCycle controller 
available");
-        }
-        return component;
-    }
-    
-    /**
-     * @param desc
-     * @param context
-     * @param itf
-     * @return interface named itf of the created component.
-     */
-    public static final Interface create(String desc, Map context, String 
itf) {
-        Component c = create(desc,context);
-        try {
-            return (Interface) c.getFcInterface(itf);
-        } catch (NoSuchInterfaceException e) {
-            Logger.getLogger("GoTM-Factory").severe("Failure when when 
retrieving "+itf+" interface");
-            throw new GoTMException(e);
-        }
-    }
-    
-    /**
-     * @param i
-     *            the service to stop.
-     */
-    public static final void stop(Interface i) {
-        stop(i.getFcItfOwner());
-    }
-    
-    /**
-     * @param c
-     *            the component to stop.
-     */
-    public static final void stop(Component c) {
-        try {
-            Fractal.getLifeCycleController(c).stopFc();
-        } catch (IllegalLifeCycleException e) {
-            System.err.println(e);
-            throw new GoTMException(e);
-        } catch (NoSuchInterfaceException e) {
-            System.err.println(e);
-            throw new GoTMException(e);
-        }
-    }
-}
\ No newline at end of file
Index: gotm/src/java/org/objectweb/gotm/GotmFactory.java
diff -u gotm/src/java/org/objectweb/gotm/GotmFactory.java:1.3 
gotm/src/java/org/objectweb/gotm/GotmFactory.java:1.4
--- gotm/src/java/org/objectweb/gotm/GotmFactory.java:1.3       Mon Jan 10 
17:16:06 2005
+++ gotm/src/java/org/objectweb/gotm/GotmFactory.java   Fri Aug 12 14:31:23 
2005
@@ -23,19 +23,109 @@
  Contributor(s): .
 
  ---------------------------------------------------------------------
- $Id: GotmFactory.java,v 1.3 2005/01/10 16:16:06 rouvoy Exp $
+ $Id: GotmFactory.java,v 1.4 2005/08/12 12:31:23 rouvoy Exp $
  ====================================================================*/
 
 package org.objectweb.gotm;
 
+import java.util.Map;
+import java.util.logging.Logger;
+
+import org.objectweb.fractal.adl.ADLException;
+import org.objectweb.fractal.adl.Factory;
+import org.objectweb.fractal.adl.FactoryFactory;
+import org.objectweb.fractal.api.Component;
+import org.objectweb.fractal.api.Interface;
+import org.objectweb.fractal.api.NoSuchInterfaceException;
+import org.objectweb.fractal.api.control.IllegalLifeCycleException;
+import org.objectweb.fractal.util.Fractal;
+
 /**
+ * Constructor class
+ * 
  * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  */
-public interface GotmFactory {
+public class GotmFactory {
+    /** <code>GOTM_BACKEND</code> default backend to use. */
+    public static final String GOTM_BACKEND = FactoryFactory.FRACTAL_BACKEND;
+    
+    private static Factory factory ; 
 
     /**
-     * @return create a new GoTM instance.
+     * @return the instance of the Factal factory backend to use.
+     */
+    protected static Factory factory() {
+        if (factory == null)
+            try {
+                factory = FactoryFactory.getFactory(GOTM_BACKEND);
+            } catch (ADLException e) {
+                Logger.getLogger("GoTM-Factory").severe("Failure when 
retrieving Fractal factory.");
+                throw new GoTMException(e);
+            }
+        if (factory== null)
+            Logger.getLogger("GoTM-Factory").severe("Failed to create 
Backend Factory");
+        return factory;
+    }
+    
+    /**
+     * @param desc
+     * @param context
+     * @return instance of component created.
+     */
+    public static final Component create(String desc, Map context) {
+        Component component ;
+        try {
+            component = (Component) factory().newComponent(desc, context);
+        } catch (Exception e) {
+            Logger.getLogger("GoTM-Factory").severe("Failure when creating 
the component");
+            throw new GoTMException(e);
+        }
+        try {
+            Fractal.getLifeCycleController(component).startFc();
+        } catch (Exception e) {
+            Logger.getLogger("GoTM-Factory").fine("No LifeCycle controller 
available");
+        }
+        return component;
+    }
+    
+    /**
+     * @param desc
+     * @param context
+     * @param itf
+     * @return interface named itf of the created component.
+     */
+    public static final Interface create(String desc, Map context, String 
itf) {
+        Component c = create(desc,context);
+        try {
+            return (Interface) c.getFcInterface(itf);
+        } catch (NoSuchInterfaceException e) {
+            Logger.getLogger("GoTM-Factory").severe("Failure when when 
retrieving "+itf+" interface");
+            throw new GoTMException(e);
+        }
+    }
+    
+    /**
+     * @param i
+     *            the service to stop.
+     */
+    public static final void stop(Interface i) {
+        stop(i.getFcItfOwner());
+    }
+    
+    /**
+     * @param c
+     *            the component to stop.
      */
-    public Object create( );
+    public static final void stop(Component c) {
+        try {
+            Fractal.getLifeCycleController(c).stopFc();
+        } catch (IllegalLifeCycleException e) {
+            System.err.println(e);
+            throw new GoTMException(e);
+        } catch (NoSuchInterfaceException e) {
+            System.err.println(e);
+            throw new GoTMException(e);
+        }
+    }
 }
\ No newline at end of file
Index: gotm/src/java/org/objectweb/gotm/GotmFactoryAttributes.java
diff -u gotm/src/java/org/objectweb/gotm/GotmFactoryAttributes.java:1.3 
gotm/src/java/org/objectweb/gotm/GotmFactoryAttributes.java:removed
--- gotm/src/java/org/objectweb/gotm/GotmFactoryAttributes.java:1.3     Mon 
Jan 10 17:16:06 2005
+++ gotm/src/java/org/objectweb/gotm/GotmFactoryAttributes.java Fri Aug 12 
14:31:24 2005
@@ -1,63 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2000-2004 INRIA & 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: GotmFactoryAttributes.java,v 1.3 2005/01/10 16:16:06 rouvoy Exp $
-====================================================================*/
-
-package org.objectweb.gotm;
-
-import org.objectweb.fractal.api.control.AttributeController;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.3 $
- */
-public interface GotmFactoryAttributes 
-         extends AttributeController
-{
-    /**
-     * Defines the ADL Backend to use.
-     * @param backend name of ADL Backend to use.
-     */
-    public void setBackend(String backend);
-    
-    /**
-     * Provides the ADL backend used.
-     * @return name of the ADL Backend used.
-     */
-    public String getBackend();
-    
-    /**
-     * Defines the Component description to use.
-     * @param component the description of the GoTM instance to create.
-     */
-    public void setDescription(String component);
-    
-    /**
-     * Provides the Component description used.
-     * @return the description of the GoTM instance to create.
-     */
-    public String getDescription();
-}
Index: gotm/src/java/org/objectweb/gotm/GotmFactoryImpl.java
diff -u gotm/src/java/org/objectweb/gotm/GotmFactoryImpl.java:1.4 
gotm/src/java/org/objectweb/gotm/GotmFactoryImpl.java:removed
--- gotm/src/java/org/objectweb/gotm/GotmFactoryImpl.java:1.4   Mon May 23 
13:20:55 2005
+++ gotm/src/java/org/objectweb/gotm/GotmFactoryImpl.java       Fri Aug 12 
14:31:24 2005
@@ -1,139 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2000-2004 INRIA & 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: GotmFactoryImpl.java,v 1.4 2005/05/23 11:20:55 rouvoy Exp $
-====================================================================*/
-
-package org.objectweb.gotm;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.objectweb.fractal.adl.ADLException;
-import org.objectweb.fractal.adl.Factory;
-import org.objectweb.fractal.adl.FactoryFactory;
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.api.NoSuchInterfaceException;
-import org.objectweb.fractal.api.control.IllegalLifeCycleException;
-import org.objectweb.fractal.api.control.LifeCycleController;
-import org.objectweb.fractal.api.factory.InstantiationException;
-import org.objectweb.fractal.lib.LoggablePrimitive;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.4 $
- * @fractal
- */
-public class GotmFactoryImpl 
-     extends LoggablePrimitive
-  implements GotmFactory,
-             GotmFactoryAttributes,
-             LifeCycleController
-{
-    /** 
-     * @fractal argument="backend" 
-     */
-    private String default_backend = null;
-    /**
-     * @fractal argument="description"
-     */
-    private String default_component = null;
-    private org.objectweb.fractal.api.factory.Factory template = null;
-    private String state = STOPPED;
-    
-     /* (non-Javadoc)
-      * @see 
org.objectweb.gotm.GotmFactoryAttributes#setBackend(java.lang.String)
-      */
-     public void setBackend(String backend) {
-         this.default_backend = backend ;
-     }
-
-     /* (non-Javadoc)
-      * @see org.objectweb.gotm.GotmFactoryAttributes#getBackend()
-      */
-     public String getBackend() {
-         return this.default_backend;
-     }
-        
-     /* (non-Javadoc)
-      * @see 
org.objectweb.gotm.GotmFactoryAttributes#setComponent(java.lang.String)
-      */
-     public void setDescription(String component) {
-         this.default_component = component ;
-     }
-
-     /* (non-Javadoc)
-      * @see org.objectweb.gotm.GotmFactoryAttributes#getComponent()
-      */
-     public String getDescription() {
-         return this.default_component;
-     }
-     
-    /* (non-Javadoc)
-     * @see 
org.objectweb.fractal.api.control.LifeCycleController#getFcState()
-     */
-    public String getFcState() {
-        return this.state;
-    }
-
-    /* (non-Javadoc)
-     * @see org.objectweb.fractal.api.control.LifeCycleController#startFc()
-     */
-    public void startFc() throws IllegalLifeCycleException {
-        try {
-            Factory f = FactoryFactory.getFactory(this.default_backend);
-            Map context = new HashMap();
-            context.put("template","true");
-            Component cpt = (Component) 
f.newComponent(this.default_component, context);
-            this.template = (org.objectweb.fractal.api.factory.Factory) 
cpt.getFcInterface("factory");
-        } catch (ADLException e) {
-            getLogger().log(DEBUG,e.getMessage());
-            throw new IllegalLifeCycleException(e.getMessage());
-        } catch (NoSuchInterfaceException e) {
-            getLogger().log(DEBUG,e.getMessage());
-            throw new IllegalLifeCycleException(e.getMessage());            
-        }
-        this.state = STARTED;
-    }
-
-    /* (non-Javadoc)
-     * @see org.objectweb.fractal.api.control.LifeCycleController#stopFc()
-     */
-    public void stopFc() {
-        this.state = STOPPED;
-    }
-
-    /* (non-Javadoc)
-     * @see org.objectweb.gotm.GotmFactory#create()
-     */
-    public Object create() {
-        try {
-            return this.template.newFcInstance();
-        } catch (InstantiationException e) {
-            getLogger().log(DEBUG,e.getMessage());
-            return null;
-        }
-    }
-}
Index: gotm/src/java/org/objectweb/gotm/api/TransactionService.java
diff -u /dev/null 
gotm/src/java/org/objectweb/gotm/api/TransactionService.java:1.1
--- /dev/null   Fri Aug 12 14:31:24 2005
+++ gotm/src/java/org/objectweb/gotm/api/TransactionService.java        Fri 
Aug 12 14:31:22 2005
@@ -0,0 +1,50 @@
+/*====================================================================
+
+ 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: TransactionService.java,v 1.1 2005/08/12 12:31:22 rouvoy Exp $
+ ====================================================================*/
+package org.objectweb.gotm.api;
+
+import org.objectweb.transaction.api.Feature;
+
+/**
+ * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
+ * @created 9 août 2005
+ * @modified $Date: 2005/08/12 12:31:22 $
+ * @version $Revision: 1.1 $
+ * @fractal.itf
+ */
+public interface TransactionService
+        extends Feature {
+    /**
+     * @return the port number of the transaction service.
+     */
+    int getPortNumber();
+
+    /**
+     * @return the host name of the transaction service.
+     */
+    String getHostName();
+}
\ No newline at end of file
Index: gotm/src/java/org/objectweb/gotm/api/utils/ComponentMap.java
diff -u gotm/src/java/org/objectweb/gotm/api/utils/ComponentMap.java:1.4 
gotm/src/java/org/objectweb/gotm/api/utils/ComponentMap.java:removed
--- gotm/src/java/org/objectweb/gotm/api/utils/ComponentMap.java:1.4    Mon 
Jan 10 17:16:05 2005
+++ gotm/src/java/org/objectweb/gotm/api/utils/ComponentMap.java        Fri 
Aug 12 14:31:24 2005
@@ -1,57 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2000-2004 INRIA & 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: ComponentMap.java,v 1.4 2005/01/10 16:16:05 rouvoy Exp $
-====================================================================*/
-
-package org.objectweb.gotm.api.utils;
-
-/**
- * Generic Identity Map Access Interface.
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.4 $
- * @fractal.itf name="cpt-map"
- */
-public interface ComponentMap 
-         extends Map, 
-                 ComponentPool
-{
-    /** Identifier for the ADL. */
-    public static final String COMPONENT_MAP = "cpt-map" ;
- 
-    /**
-     * Register tne component value in the map with the given key
-     * @param key - the identifier of the component
-     * @param value - the reference to the component
-     */
-    public void putComponent(String key, Object value);
-
-    /**
-     * Provides the reference of the component associated to the given key
-     * @param key - the identifier of the component
-     * @return the reference of the component
-     */
-    public Object getComponent(String key); 
-}
Index: gotm/src/java/org/objectweb/gotm/api/utils/ComponentPool.java
diff -u gotm/src/java/org/objectweb/gotm/api/utils/ComponentPool.java:1.4 
gotm/src/java/org/objectweb/gotm/api/utils/ComponentPool.java:removed
--- gotm/src/java/org/objectweb/gotm/api/utils/ComponentPool.java:1.4   Mon 
Jan 10 17:16:05 2005
+++ gotm/src/java/org/objectweb/gotm/api/utils/ComponentPool.java       Fri 
Aug 12 14:31:24 2005
@@ -1,62 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2000-2004 INRIA & 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: ComponentPool.java,v 1.4 2005/01/10 16:16:05 rouvoy Exp $
-====================================================================*/
-
-package org.objectweb.gotm.api.utils;
-
-/**
- * Generic Identity Pool Access Interface.
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.4 $
- * @fractal.itf name="cpt-pool"
- */
-public interface ComponentPool 
-         extends Pool 
-{
-    /**
-     * Identifier for the ADL
-     */
-    public static final String COMPONENT_POOL = "cpt-pool" ;
-    
-    /**
-     * Provides the list of the components managed by the pool
-     * @return the content of the pool
-     */
-    public Object[] getComponents();
-    
-    /**
-     * Add a new component in the pool
-     * @param cmp - the component to add
-     */
-    public void addComponent(Object cmp);
-    
-    /**
-     * Remove an existing component from the pool
-     * @param cmp - the component to remove
-     */
-    public void removeComponent(Object cmp);
-}
\ No newline at end of file
Index: gotm/src/java/org/objectweb/gotm/api/utils/ComponentTreatment.java
diff -u 
gotm/src/java/org/objectweb/gotm/api/utils/ComponentTreatment.java:1.3 
gotm/src/java/org/objectweb/gotm/api/utils/ComponentTreatment.java:removed
--- gotm/src/java/org/objectweb/gotm/api/utils/ComponentTreatment.java:1.3    
  Mon Jan 10 17:16:05 2005
+++ gotm/src/java/org/objectweb/gotm/api/utils/ComponentTreatment.java  Fri 
Aug 12 14:31:24 2005
@@ -1,50 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2000-2004 INRIA & 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: ComponentTreatment.java,v 1.3 2005/01/10 16:16:05 rouvoy Exp $
-====================================================================*/
-
-package org.objectweb.gotm.api.utils;
-
-import org.objectweb.transaction.api.Identity;
-
-/**
- * Particular Interface for Applying Specific Treatments to a Set of 
Components.
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.3 $
- * @fractal server="component-treatment"
- */
-public interface ComponentTreatment 
-{
-    /** Identifier for the ADL. */
-    public static final String COMPONENT_TREATMENT = "component-treatment" ;
-
-    /**
-     * Apply a specific treatment.
-     * @param toTreat - the component which receive the treatement
-     * @return return statement
-     */
-    public Object apply(Identity toTreat) ;
-}
Index: gotm/src/java/org/objectweb/gotm/api/utils/FactoryFeature.java
diff -u gotm/src/java/org/objectweb/gotm/api/utils/FactoryFeature.java:1.4 
gotm/src/java/org/objectweb/gotm/api/utils/FactoryFeature.java:removed
--- gotm/src/java/org/objectweb/gotm/api/utils/FactoryFeature.java:1.4  Mon 
Jan 10 17:16:05 2005
+++ gotm/src/java/org/objectweb/gotm/api/utils/FactoryFeature.java      Fri 
Aug 12 14:31:24 2005
@@ -1,49 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2000-2004 INRIA & 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: FactoryFeature.java,v 1.4 2005/01/10 16:16:05 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.api.utils;
-
-import org.objectweb.transaction.api.Feature;
-
-/**
- * Basic Stateless Factory Feature.
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.4 $
- * @fractal.itf name="cpt-factory"
- */
-public interface FactoryFeature 
-         extends Feature 
-{
-    /** Identifier for the ADL. */
-    public static final String FACTORY_FEATURE = "cpt-factory" ;
-
-    /**
-     * Create an instance of a fractal component.
-     * @return the new instance of the component.
-     */
-    public Object create();
-}
Index: gotm/src/java/org/objectweb/gotm/api/utils/Map.java
diff -u gotm/src/java/org/objectweb/gotm/api/utils/Map.java:1.3 
gotm/src/java/org/objectweb/gotm/api/utils/Map.java:removed
--- gotm/src/java/org/objectweb/gotm/api/utils/Map.java:1.3     Mon Jan 10 
17:16:05 2005
+++ gotm/src/java/org/objectweb/gotm/api/utils/Map.java Fri Aug 12 14:31:24 
2005
@@ -1,45 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2000-2004 INRIA & 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: Map.java,v 1.3 2005/01/10 16:16:05 rouvoy Exp $
-====================================================================*/
-
-package org.objectweb.gotm.api.utils;
-
-
-/**
- * Root Interface for Derived Map Entities.
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.3 $
- * @fractal.itf name="map"
- */
-public interface Map 
-         extends Pool 
-{
-    /**
-     * Identifier for the ADL
-     */
-    public static final String MAP = "map" ;
-}
Index: gotm/src/java/org/objectweb/gotm/api/utils/Pool.java
diff -u gotm/src/java/org/objectweb/gotm/api/utils/Pool.java:1.3 
gotm/src/java/org/objectweb/gotm/api/utils/Pool.java:removed
--- gotm/src/java/org/objectweb/gotm/api/utils/Pool.java:1.3    Mon Jan 10 
17:16:05 2005
+++ gotm/src/java/org/objectweb/gotm/api/utils/Pool.java        Fri Aug 12 
14:31:24 2005
@@ -1,44 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2000-2004 INRIA & 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: Pool.java,v 1.3 2005/01/10 16:16:05 rouvoy Exp $
-====================================================================*/
-
-package org.objectweb.gotm.api.utils;
-
-import org.objectweb.transaction.api.State;
-
-/**
- * Root Interface for Derived Pool Entities.
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.3 $
- * @fractal.itf name="pool"
- */
-public interface Pool 
-         extends State 
-{
-    /** Identifier for the ADL. */
-    public static final String POOL = "pool" ;
-}
Index: gotm/src/java/org/objectweb/gotm/api/utils/StringFactoryFeature.java
diff -u 
gotm/src/java/org/objectweb/gotm/api/utils/StringFactoryFeature.java:1.4 
gotm/src/java/org/objectweb/gotm/api/utils/StringFactoryFeature.java:removed
--- gotm/src/java/org/objectweb/gotm/api/utils/StringFactoryFeature.java:1.4  
  Mon Jan 10 17:16:05 2005
+++ gotm/src/java/org/objectweb/gotm/api/utils/StringFactoryFeature.java      
  Fri Aug 12 14:31:24 2005
@@ -1,52 +0,0 @@
-/*====================================================================
-
-GoTM: GoTM is an open Transaction Monitor
-Copyright (C) 2000-2004 INRIA & 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: StringFactoryFeature.java,v 1.4 2005/01/10 16:16:05 rouvoy Exp $
-====================================================================*/
-
-package org.objectweb.gotm.api.utils;
-
-
-import org.objectweb.transaction.api.Feature;
-
-/**
- * 
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @version $Revision: 1.4 $
- * @fractal.itf name="string-factory"
- */
-public interface StringFactoryFeature 
-         extends Feature 
-{
-    /** Identifier for the ADL. */
-    public static final String STRING_FACTORY_FEATURE = "string-factory" ;
-
-    /**
-     * Create an instance of a fractal component.
-     * @param key the key for creating the component.
-     * @return the new instance of the component.
-     */
-    public Object create(String key);
-}
Index: gotm/src/java/org/objectweb/gotm/lib/CurrentManager.java
diff -u gotm/src/java/org/objectweb/gotm/lib/CurrentManager.java:1.3 
gotm/src/java/org/objectweb/gotm/lib/CurrentManager.java:removed
--- gotm/src/java/org/objectweb/gotm/lib/CurrentManager.java:1.3        Fri 
Aug  5 17:06:29 2005
+++ gotm/src/java/org/objectweb/gotm/lib/CurrentManager.java    Fri Aug 12 
14:31:24 2005
@@ -1,70 +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: CurrentManager.java,v 1.3 2005/08/05 15:06:29 rouvoy Exp $
- ====================================================================*/
-package org.objectweb.gotm.lib;
-
-import org.objectweb.fractal.api.Component;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 1 févr. 2005
- * @modified $Date: 2005/08/05 15:06:29 $
- * @version $Revision: 1.3 $
- * @fractal.itf name="current-manager"
- */
-public interface CurrentManager {
-    /** Fractal ADL Identifier for the <code>CurrentManager</code> 
interface. */
-    static final String CURRENT_MANAGER = "current-manager";
-    
-    /**
-     * Loads a current object.
-     */
-    void loadCurrent();
-    
-    /**
-     * Checks if a current is allocated.
-     * @return true if a current is available.
-     */
-    boolean checkCurrent();
-    
-    /**
-     * Provides the instance of the current component handled.
-     * @return the current component (null if no current).
-     */
-    Component getCurrentFc();
-
-    /**
-     * Defines the current instance of the current component.
-     * @param current the instance to set.
-     */
-    void setCurrentFc(Component current);
-    
-    /**
-     * Clear the instance of the current component. 
-     */
-    void clearCurrentFc();
-}
\ No newline at end of file
Index: gotm/src/java/org/objectweb/gotm/lib/CurrentManagerAbstract.java
diff -u gotm/src/java/org/objectweb/gotm/lib/CurrentManagerAbstract.java:1.1 
gotm/src/java/org/objectweb/gotm/lib/CurrentManagerAbstract.java:removed
--- gotm/src/java/org/objectweb/gotm/lib/CurrentManagerAbstract.java:1.1      
  Fri Aug  5 17:06:29 2005
+++ gotm/src/java/org/objectweb/gotm/lib/CurrentManagerAbstract.java    Fri 
Aug 12 14:31:24 2005
@@ -1,185 +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: CurrentManagerAbstract.java,v 1.1 2005/08/05 15:06:29 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.lib;
-
-import java.util.Stack;
-
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.api.NoSuchInterfaceException;
-import org.objectweb.fractal.api.control.IllegalCacheException;
-import org.objectweb.fractal.api.control.IllegalLifeCycleException;
-import org.objectweb.fractal.api.control.LifeCycleController;
-import org.objectweb.fractal.lib.BindablePrimitive;
-import org.objectweb.fractal.pool.util.FcCache;
-import org.objectweb.fractal.util.Fractal;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 4 août 2005
- * @modified $Date: 2005/08/05 15:06:29 $
- * @version $Revision: 1.1 $
- * @fractal.itf 
- */
-public abstract class CurrentManagerAbstract
-        extends BindablePrimitive
-        implements CurrentManager, LifeCycleController {
-
-    /** <code>current</code> . */
-    private Component current = null;
-
-    /**
-     * @return the stack to store recyclable transactions.
-     */
-    protected abstract Stack stack() ;
-
-    /**
-     * @return the transaction factory.
-     */
-    protected abstract Component create() ;
-
-        /**
-     * @param c
-     */
-    private void backToStack(Component c) {
-        try {
-            FcCache.getCacheController(c).clearFc();
-        } catch (IllegalCacheException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e);
-        } catch (NoSuchInterfaceException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e);
-        }
-        if (getLogger().isLoggable(DEBUG))
-            getLogger().log(DEBUG,"Storing the component instance into the 
stack.");
-        stack().push(c);
-    }
-    
-    /**
-     * @return a component coming from the stack.
-     */
-    private Component loadFromStack() {
-        Component loaded = null;
-        if (stack().isEmpty()) {
-            if (getLogger().isLoggable(DEBUG))
-                getLogger().log(DEBUG, "Creating a new instance of cached 
component.");
-                loaded = create();
-        } else {
-            if (getLogger().isLoggable(DEBUG))
-                getLogger().log(DEBUG, "Loading an existing instance of 
cached component.");
-            loaded = (Component) stack().pop();
-            try {
-                FcCache.getCacheController(loaded).initFc();
-            } catch (IllegalCacheException e) {
-                if (getLogger().isLoggable(ERROR))
-                    getLogger().log(ERROR, e);
-            } catch (NoSuchInterfaceException e) {
-                if (getLogger().isLoggable(ERROR))
-                    getLogger().log(ERROR, e);
-            }
-        }
-        return loaded;
-    }
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see 
org.objectweb.fractal.api.control.LifeCycleController#getFcState()
-     */
-    public String getFcState() { return null; }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.objectweb.fractal.api.control.LifeCycleController#startFc()
-     */
-    public void startFc() {
-        backToStack(loadFromStack());
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.objectweb.fractal.api.control.LifeCycleController#stopFc()
-     */
-    public void stopFc() {
-        try {
-            if (this.current != null)
-                Fractal.getLifeCycleController(this.current).stopFc();
-        } catch (IllegalLifeCycleException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e.getMessage());
-        } catch (NoSuchInterfaceException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e.getMessage());
-        }
-        stack().clear();
-    }
-
-    /* (non-Javadoc)
-     * @see org.objectweb.gotm.lib.CurrentManager#loadCurrent()
-     */
-    public void loadCurrent() {
-        this.current = loadFromStack();
-    }
-    
-    /* (non-Javadoc)
-     * @see org.objectweb.gotm.lib.CurrentManager#checkCurrent()
-     */
-    public boolean checkCurrent() {
-        return this.current != null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.objectweb.gotm.lib.CurrentManager#getCurrentFc()
-     */
-    public Component getCurrentFc() {
-        return this.current;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see 
org.objectweb.gotm.lib.CurrentManager#setCurrentFc(org.objectweb.fractal.api.Component)
-     */
-    public void setCurrentFc(Component c) {
-        this.current = c;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.objectweb.gotm.lib.CurrentManager#clearCurrentFc()
-     */
-    public void clearCurrentFc() {
-        backToStack(this.current);
-        this.current = null;
-    }
-}
\ No newline at end of file
Index: gotm/src/java/org/objectweb/gotm/lib/StaticCurrentManager.java
diff -u gotm/src/java/org/objectweb/gotm/lib/StaticCurrentManager.java:1.1 
gotm/src/java/org/objectweb/gotm/lib/StaticCurrentManager.java:removed
--- gotm/src/java/org/objectweb/gotm/lib/StaticCurrentManager.java:1.1  Fri 
Aug  5 17:06:29 2005
+++ gotm/src/java/org/objectweb/gotm/lib/StaticCurrentManager.java      Fri 
Aug 12 14:31:24 2005
@@ -1,99 +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: StaticCurrentManager.java,v 1.1 2005/08/05 15:06:29 rouvoy Exp $
- ====================================================================*/
-package org.objectweb.gotm.lib;
-
-import java.util.Stack;
-
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.api.NoSuchInterfaceException;
-import org.objectweb.fractal.api.control.IllegalLifeCycleException;
-import org.objectweb.fractal.api.factory.Factory;
-import org.objectweb.fractal.api.factory.InstantiationException;
-import org.objectweb.fractal.util.Fractal;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 1 févr. 2005
- * @modified $Date: 2005/08/05 15:06:29 $
- * @version $Revision: 1.1 $
- * @fractal.itf name="factory" role="client"
- *              signature="org.objectweb.fractal.api.Component"
- */
-public class StaticCurrentManager
-        extends CurrentManagerAbstract {
-    /** Fractal ADL Identifier for the <code>FACTORY</code> interface. */
-    public static final String FACTORY = "factory";
-
-    private Stack stack = new Stack();
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.objectweb.fractal.lib.BindablePrimitive#clientFc()
-     */
-    protected String[] clientFc() {
-        return new String[] { FACTORY };
-    }
-
-    /**
-     * @return the transaction factory.
-     */
-    protected Component create() {
-        Factory factory = null;
-        try {
-            Component cpt = (Component) fcBindings.get(FACTORY);
-            factory = (Factory) cpt.getFcInterface("factory");
-        } catch (NoSuchInterfaceException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e.getMessage());
-            return null;
-        }
-        Component component = null;
-        try {
-            component = factory.newFcInstance();
-            Fractal.getLifeCycleController(component).startFc();
-        } catch (InstantiationException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e);
-        } catch (IllegalLifeCycleException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e);
-        } catch (NoSuchInterfaceException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e);
-        }
-        return component;
-    }
-
-    /**
-     * @return the stack used to store components.
-     */
-    protected Stack stack() {
-        return this.stack;
-    }
-}
\ No newline at end of file
Index: 
gotm/src/java/org/objectweb/gotm/lib/context/CommitProtocolAwareness.java
diff -u 
gotm/src/java/org/objectweb/gotm/lib/context/CommitProtocolAwareness.java:1.2 
gotm/src/java/org/objectweb/gotm/lib/context/CommitProtocolAwareness.java:removed
--- 
gotm/src/java/org/objectweb/gotm/lib/context/CommitProtocolAwareness.java:1.2 
      Mon Aug  8 15:38:16 2005
+++ gotm/src/java/org/objectweb/gotm/lib/context/CommitProtocolAwareness.java 
  Fri Aug 12 14:31:24 2005
@@ -1,112 +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: CommitProtocolAwareness.java,v 1.2 2005/08/08 13:38:16 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.lib.context;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.objectweb.transaction.api.event.Event;
-import org.objectweb.transaction.lib.transaction.TransactionStatusCommitted;
-import org.objectweb.transaction.lib.transaction.TransactionStatusRolledBack;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 3 août 2005
- * @modified $Date: 2005/08/08 13:38:16 $
- * @version $Revision: 1.2 $
- * @fractal.itf 
- */
-public class CommitProtocolAwareness
-        extends ContextAwarenessImpl {
-    /** <code>WINDOW</code> size of the window of visibility. */
-    public static final int WINDOW = 25;
-    
-    private final Map conf2pc = new HashMap();
-    private final Map conf2pcpc = new HashMap();
-    private final Map conf2pcpa = new HashMap();
-    private Map current = conf2pc;
-    /**
-     * 
-     */
-    public CommitProtocolAwareness() {
-        conf2pc.put("communication", 
"org.objectweb.gotm.lib.event.TpEventBusThread");
-        conf2pc.put("protocol","org.objectweb.gotm.lib.protocol.Tp2PC");
-        conf2pcpc.put("communication", 
"org.objectweb.gotm.lib.event.TpEventBusThread");
-        conf2pcpc.put("protocol","org.objectweb.gotm.lib.protocol.Tp2PCPC");
-        conf2pcpa.put("communication", 
"org.objectweb.gotm.lib.event.TpEventBusThread");
-        conf2pcpa.put("protocol","org.objectweb.gotm.lib.protocol.Tp2PCPA");
-    }
-    
-    /* (non-Javadoc)
-     * @see org.objectweb.gotm.lib.event.SubscribablePrimitive#getEvents()
-     */
-    public Event[] getEvents() {
-        return new Event[] {
-                TransactionStatusCommitted.status,
-                TransactionStatusRolledBack.status
-        };
-    }
-
-    private int count(List l, Event e) {
-        int count = 0;
-        int stop=0;
-        for (Iterator i = l.iterator() ; i.hasNext() ;) {
-            if (i.next()==e) count++;
-            if (++stop>=WINDOW) break;
-        }
-        return count;
-    }
-    
-    /* (non-Javadoc)
-     * @see 
org.objectweb.gotm.lib.context.ContextAwarenessImpl#getConfiguration(java.util.LinkedList)
-     */
-    protected Map getConfiguration(LinkedList topics) {
-        if (topics.size()<WINDOW) {
-            System.out.println("[T="+topics.size()+"]==> No adaptatation 
during warm up!");
-            return null;
-        }
-        int commit = count(topics,TransactionStatusCommitted.status);
-        int abort = count(topics,TransactionStatusRolledBack.status);
-        int dec = (100*commit)/(commit+abort);
-        if (dec <= 55 && current!=conf2pcpa) {
-            System.out.println("[T="+topics.size()+"]==> Switching to the 
2PCPA commit protocol 
(commit="+dec+"%<=55%)("+(commit)+"|"+(commit+abort)+")...");
-            this.current = conf2pcpa;
-            return conf2pcpa;
-        }
-        if (dec > 55 && current!=conf2pcpc) {
-            System.out.println("[T="+topics.size()+"]==> Switching to the 
2PCPC commit protocol 
(commit="+dec+"%>=55%)("+(commit)+"|"+(commit+abort)+")...");
-            this.current = conf2pcpc;
-            return conf2pcpc;
-        }
-        System.out.println("[T="+topics.size()+"]==> No adaptation is 
required (commit="+dec+"%)("+(commit)+"|"+(commit+abort)+")");
-        return null;
-    }
-}
Index: gotm/src/java/org/objectweb/gotm/lib/context/Configurable.java
diff -u gotm/src/java/org/objectweb/gotm/lib/context/Configurable.java:1.1 
gotm/src/java/org/objectweb/gotm/lib/context/Configurable.java:removed
--- gotm/src/java/org/objectweb/gotm/lib/context/Configurable.java:1.1  Fri 
Aug  5 17:06:29 2005
+++ gotm/src/java/org/objectweb/gotm/lib/context/Configurable.java      Fri 
Aug 12 14:31:24 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: Configurable.java,v 1.1 2005/08/05 15:06:29 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.lib.context;
-
-import java.util.Map;
-
-import org.objectweb.transaction.api.Feature;
-
-/**
- * Interface to apply dynamic reconfigurable.
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 3 août 2005
- * @modified $Date: 2005/08/05 15:06:29 $
- * @version $Revision: 1.1 $
- * @fractal.itf name="configurable"
- */
-public interface Configurable
-        extends Feature {
-    /** Fractal ADL Identifier for the <code>Configurable</code> interface. 
*/
-    static final String CONFIGURABLE ="configurable";
-    
-    /**
-     * Apply a new configuration
-     * @param configuration the new configuration.
-     */
-    void reconfigure(Map configuration);
-}
Index: 
gotm/src/java/org/objectweb/gotm/lib/context/ConfigurableCurrentManager.java
diff -u 
gotm/src/java/org/objectweb/gotm/lib/context/ConfigurableCurrentManager.java:1.1
 
gotm/src/java/org/objectweb/gotm/lib/context/ConfigurableCurrentManager.java:removed
--- 
gotm/src/java/org/objectweb/gotm/lib/context/ConfigurableCurrentManager.java:1.1
    Fri Aug  5 17:06:29 2005
+++ 
gotm/src/java/org/objectweb/gotm/lib/context/ConfigurableCurrentManager.java  
      Fri Aug 12 14:31:24 2005
@@ -1,162 +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: ConfigurableCurrentManager.java,v 1.1 2005/08/05 15:06:29 rouvoy Exp $
-====================================================================*/
-package org.objectweb.gotm.lib.context;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Stack;
-
-import org.objectweb.fractal.api.Component;
-import org.objectweb.fractal.api.NoSuchInterfaceException;
-import org.objectweb.fractal.api.control.IllegalLifeCycleException;
-import org.objectweb.fractal.api.factory.Factory;
-import org.objectweb.fractal.api.factory.InstantiationException;
-import org.objectweb.fractal.util.Fractal;
-import org.objectweb.gotm.Gotm;
-import org.objectweb.gotm.lib.CurrentManagerAbstract;
-import org.objectweb.transaction.api.event.SubscribeFeature;
-
-/**
- * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
- * @created 3 août 2005
- * @modified $Date: 2005/08/05 15:06:29 $
- * @version $Revision: 1.1 $
- * @fractal.itf name="context-awareness" role="client" 
signature="org.objectweb.gotm.lib.context.ContextAwareness"
- */
-public class ConfigurableCurrentManager
-extends CurrentManagerAbstract
-        implements Configurable {
-
-    /** <code>TX_DESC</code> . */
-    public static final String TX_DESC = 
"org.objectweb.gotm.lib.JtsTransaction";
-    protected Map stacks = new HashMap();
-    protected Map tx_factories = new HashMap();
-    protected Map pending = new HashMap();
-    protected Map configuration ;
-    
-    /**
-     * Constructor.
-     */
-    public ConfigurableCurrentManager() {
-        this.pending.put("communication", 
"org.objectweb.gotm.lib.event.TpEventBusThread");
-        this.pending.put("protocol","org.objectweb.gotm.lib.protocol.Tp2PC");
-        this.configuration = this.pending;
-    }
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.objectweb.fractal.lib.BindablePrimitive#clientFc()
-     */
-    protected String[] clientFc() {
-        return new String[] { ContextAwareness.CONTEXT_AWARENESS };
-    }
-    
-    protected final ContextAwareness getContext() {
-        return (ContextAwareness) 
fcBindings.get(ContextAwareness.CONTEXT_AWARENESS);
-    }
-
-    /**
-     * @return the transaction factory.
-     */
-    protected Component create() {
-        Factory factory = (Factory) 
this.tx_factories.get(this.configuration);
-        if (factory == null) {
-            System.out.println("[Current] Creating factory for configuration 
"+this.configuration);
-            factory = (Factory) Gotm.create(TX_DESC, this.configuration, 
"factory");
-            this.tx_factories.put(this.configuration, factory);
-        }
-        Component component = null;
-        try {
-            System.out.println("[Current] Creating a new transaction 
instance...");
-            component = factory.newFcInstance();
-            Fractal.getLifeCycleController(component).startFc();
-        } catch (InstantiationException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e);
-        } catch (IllegalLifeCycleException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e);
-        } catch (NoSuchInterfaceException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e);
-        }
-        return component;
-    }
-
-    /* (non-Javadoc)
-     * @see org.objectweb.gotm.lib.CurrentManagerAbstract#loadFromStack()
-     */
-    public void loadCurrent() {
-        this.configuration = this.pending;
-        super.loadCurrent();
-        try {
-            SubscribeFeature sub = (SubscribeFeature) 
getCurrentFc().getFcInterface(SubscribeFeature.SUBSCRIBE_FEATURE);
-            sub.subscribe(getContext().getEvents(), 
getContext().getPublish());
-        } catch (NoSuchInterfaceException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e);
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see 
org.objectweb.gotm.lib.CurrentManagerAbstract#backToStack(org.objectweb.fractal.api.Component)
-     */
-    public void clearCurrentFc() {
-        try {
-            SubscribeFeature sub = (SubscribeFeature) 
getCurrentFc().getFcInterface(SubscribeFeature.SUBSCRIBE_FEATURE);
-            sub.unsubscribe(getContext().getEvents(), 
getContext().getPublish());
-        } catch (NoSuchInterfaceException e) {
-            if (getLogger().isLoggable(ERROR))
-                getLogger().log(ERROR, e);
-        }
-        super.clearCurrentFc();
-    }
-    
-    /**
-     * @return the stack used to store components.
-     */
-    protected Stack stack() {
-        Stack stack = (Stack) this.stacks.get(this.configuration);
-        if (stack == null) {
-            System.out.println("[Current] Creating new stack for 
configuration "+this.configuration);
-            stack = new Stack();
-            this.stacks.put(this.configuration, stack);
-        }
-        return stack;
-    }
-    
-    /* (non-Javadoc)
-     * @see 
org.objectweb.gotm.lib.context.Configurable#reconfigure(java.util.Map)
-     */
-    public void reconfigure(Map configuration1) {
-        if (configuration1 != null) {
-            this.pending = configuration1; 
-        }
-    }
-}
Index: gotm/src/java/org/objectweb/gotm/lib/context/ContextAwareness.java
diff -u 
gotm/src/java/org/objectweb/gotm/lib/context/ContextAwareness.java:1.1 
gotm/src/java/org/objectweb/gotm/lib/context/ContextAwareness.java:removed
--- gotm/src/java/org/objectweb/gotm/lib/context/ContextAwareness.java:1.1    
  Fri Aug  5 17:06:29 2005
+++ gotm/src/java/org/objectweb/gotm/lib/context/ContextAwareness.java  Fri 
Aug 12 14:31:24 2005
@@ -1,55 +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: ContextAwareness.java,v 1.1 2005/08/05 15:06:29 rouvoy Exp $
-=======