CVS update of gotm-jts (6 files)

[Romain Rouvoy <rouvoy@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Monday, July 18, 2005 @ 16:33:37
  Author: rouvoy
    Path: /cvsroot/gotm/gotm-jts

Modified: examples/junit/.cvsignore
          examples/junit/src/java/org/objectweb/jts/tck/xa/XAObject.java
          src/fractal/org/objectweb/gotm/lib/TpTransaction.fractal
          
src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java
           src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java
          src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java

* Correcting a bug in resource event propagations,
* Renaming leaving events.


------------------------------------------------------------------------+
 examples/junit/.cvsignore                                              |    
1 
 examples/junit/src/java/org/objectweb/jts/tck/xa/XAObject.java         |    
6 ++---
 src/fractal/org/objectweb/gotm/lib/TpTransaction.fractal               |   
12 +++++++---
 src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java |    
7 ++---
 src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java               |    
7 ++---
 src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java   |    
9 ++-----
 6 files changed, 22 insertions(+), 20 deletions(-)


Index: gotm-jts/examples/junit/.cvsignore
diff -u gotm-jts/examples/junit/.cvsignore:1.1 
gotm-jts/examples/junit/.cvsignore:1.2
--- gotm-jts/examples/junit/.cvsignore:1.1      Mon Jul 18 09:30:04 2005
+++ gotm-jts/examples/junit/.cvsignore  Mon Jul 18 16:33:37 2005
@@ -1 +1,2 @@
 output
+junit*.properties
Index: gotm-jts/examples/junit/src/java/org/objectweb/jts/tck/xa/XAObject.java
diff -u 
gotm-jts/examples/junit/src/java/org/objectweb/jts/tck/xa/XAObject.java:1.1 
gotm-jts/examples/junit/src/java/org/objectweb/jts/tck/xa/XAObject.java:1.2
--- 
gotm-jts/examples/junit/src/java/org/objectweb/jts/tck/xa/XAObject.java:1.1 
Mon Jul 18 09:30:05 2005
+++ gotm-jts/examples/junit/src/java/org/objectweb/jts/tck/xa/XAObject.java   
  Mon Jul 18 16:33:37 2005
@@ -22,7 +22,7 @@
 Contributor(s): ______________________________________.
 
 ---------------------------------------------------------------------
-$Id: XAObject.java,v 1.1 2005/07/18 07:30:05 rouvoy Exp $
+$Id: XAObject.java,v 1.2 2005/07/18 14:33:37 rouvoy Exp $
 ====================================================================*/
 
 package org.objectweb.jts.tck.xa;
@@ -105,7 +105,7 @@
      * @throws XAException
      */
     public void commit(Xid xid, boolean onePhase) throws XAException {
-//        System.err.println("commit("+xid+", "+onePhase+")");
+        System.err.println("commit("+xid+", "+onePhase+")");
 //             log.debug("xares="+ this);
 //             log.debug("xid=" + xid + ", onePhase="+ onePhase);
         if (xid == null) {
@@ -216,7 +216,7 @@
      * @throws XAException
      */
     public void end(Xid xid, int flags) throws XAException {
-//        System.err.println("end("+xid+", "+flags+")");
+        System.err.println("end("+xid+", "+flags+")");
 //             log.debug("xares="+ this);
 //             log.debug("xid="+ xid +", flags="+ flags);
         if (!this.isStarted) {
Index: gotm-jts/src/fractal/org/objectweb/gotm/lib/TpTransaction.fractal
diff -u gotm-jts/src/fractal/org/objectweb/gotm/lib/TpTransaction.fractal:1.1 
gotm-jts/src/fractal/org/objectweb/gotm/lib/TpTransaction.fractal:1.2
--- gotm-jts/src/fractal/org/objectweb/gotm/lib/TpTransaction.fractal:1.1     
  Mon Jul 11 10:27:08 2005
+++ gotm-jts/src/fractal/org/objectweb/gotm/lib/TpTransaction.fractal   Mon 
Jul 18 16:33:37 2005
@@ -23,9 +23,11 @@
        definition="org.objectweb.gotm.lib.event.TpEventBus"/>
   <component name="ValidationProcotol"
        definition="${validation}"/>
+  <component name="Logging"
+       definition="org.objectweb.gotm.lib.logging.TpLoggingHOWL"/>
   <component name="Timeout"
        definition="org.objectweb.gotm.lib.coordination.TpTimeoutImpl"/>
-  <component name="FcXidProvider"
+  <component name="Xid"
        definition="org.objectweb.gotm.lib.jta.xa.TpXidProvider"/>
 
   <binding client="this.tx-state"         
server="TransactionState.tx-state"/>
@@ -37,11 +39,15 @@
 
   <binding client="TransactionState.publish" server="EventBus.sync-publish"/>
 
+  <binding client="ValidationProcotol.tx-state"      
server="TransactionState.tx-state"/>
   <binding client="ValidationProcotol.sync-publish"  
server="EventBus.sync-publish"/>
   <binding client="ValidationProcotol.async-publish" 
server="EventBus.async-publish"/>
-  <binding client="ValidationProcotol.tx-state"      
server="TransactionState.tx-state"/>
-  <binding client="ValidationProcotol.xid-provider"  
server="FcXidProvider.xid-provider"/>
+  <binding client="ValidationProcotol.force"         server="Logging.force"/>
+  <binding client="ValidationProcotol.no-force"      
server="Logging.no-force"/>
+  <binding client="ValidationProcotol.empty"         server="Logging.empty"/>
 
+  <binding client="Logging.xid-provider" server="Xid.xid-provider"/>
+    
   <binding client="Timeout.subscribe"     server="EventBus.subscribe"/>
   <binding client="Timeout.coord-process" server="ValidationProcotol.abort"/>
 
Index: 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java
diff -u 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java:1.3
 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java:1.4
--- 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java:1.3
 Mon Jul 18 09:30:04 2005
+++ 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/SynchronizationActionProvider.java
     Mon Jul 18 16:33:37 2005
@@ -22,7 +22,7 @@
  Contributor(s): ______________________________________.
 
  ---------------------------------------------------------------------
- $Id: SynchronizationActionProvider.java,v 1.3 2005/07/18 07:30:04 rouvoy 
Exp $
+ $Id: SynchronizationActionProvider.java,v 1.4 2005/07/18 14:33:37 rouvoy 
Exp $
  ====================================================================*/
 package org.objectweb.gotm.lib.jta;
 
@@ -36,7 +36,6 @@
 import org.objectweb.gotm.lib.resource.Action;
 import org.objectweb.transaction.lib.transaction.TransactionStatusCommitted;
 import org.objectweb.transaction.lib.transaction.TransactionStatusCommitting;
-import org.objectweb.transaction.lib.transaction.TransactionStatusPrepared;
 import org.objectweb.transaction.lib.transaction.TransactionStatusRolledBack;
 import 
org.objectweb.transaction.lib.transaction.TransactionStatusRollingBack;
 
@@ -45,8 +44,8 @@
  * <code>Synchronization</code> object.
  * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
  * @created 22 déc. 2004
- * @modified $Date: 2005/07/18 07:30:04 $
- * @version $Revision: 1.3 $
+ * @modified $Date: 2005/07/18 14:33:37 $
+ * @version $Revision: 1.4 $
  * @fractal.itf name="sync-action-provider" 
signature="org.objectweb.gotm.lib.resource.ActionProvider"
  */
 public class SynchronizationActionProvider 
Index: gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java
diff -u 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java:1.10 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java:1.11
--- gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java:1.10    
  Mon Jul 18 09:30:04 2005
+++ gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java   Mon 
Jul 18 16:33:37 2005
@@ -22,7 +22,7 @@
  Contributor(s): ______________________________________.
  
  ---------------------------------------------------------------------
- $Id: TransactionImpl.java,v 1.10 2005/07/18 07:30:04 rouvoy Exp $
+ $Id: TransactionImpl.java,v 1.11 2005/07/18 14:33:37 rouvoy Exp $
  ====================================================================*/
 
 package org.objectweb.gotm.lib.jta;
@@ -48,7 +48,6 @@
 import org.objectweb.transaction.api.transaction.TransactionState;
 import org.objectweb.transaction.api.transaction.TransactionStatus;
 import 
org.objectweb.transaction.lib.transaction.TransactionStatusMarkedRollback;
-import 
org.objectweb.transaction.lib.transaction.TransactionStatusNoTransaction;
 import org.objectweb.transaction.lib.transaction.TransactionStatusRolledBack;
 import 
org.objectweb.transaction.lib.transaction.TransactionStatusRollingBack;
 import 
org.objectweb.transaction.lib.transaction.TransactionStatusTransactionActive;
@@ -58,8 +57,8 @@
  * Adapter for the Java Transaction API (JTA).
  * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
  * @created 24 déc. 2004
- * @modified $Date: 2005/07/18 07:30:04 $
- * @version $Revision: 1.10 $
+ * @modified $Date: 2005/07/18 14:33:37 $
+ * @version $Revision: 1.11 $
  * @fractal.itf name="transaction" signature="javax.transaction.Transaction"
  * @fractal.itf name="user-transaction" 
signature="javax.transaction.UserTransaction"
  * @fractal.itf name="commit" role="client" 
signature="org.objectweb.transaction.api.coordination.CoordinationFeature"
Index: 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java
diff -u 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java:1.2
 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java:1.3
--- 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java:1.2
   Mon Jul 18 09:30:04 2005
+++ 
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java 
      Mon Jul 18 16:33:37 2005
@@ -22,7 +22,7 @@
  Contributor(s): ______________________________________.
 
  ---------------------------------------------------------------------
- $Id: XAResourceActionProvider.java,v 1.2 2005/07/18 07:30:04 rouvoy Exp $
+ $Id: XAResourceActionProvider.java,v 1.3 2005/07/18 14:33:37 rouvoy Exp $
  ====================================================================*/
 package org.objectweb.gotm.lib.jta.xa;
 
@@ -46,19 +46,16 @@
 import org.objectweb.transaction.lib.resource.ResourceVoteCommit;
 import org.objectweb.transaction.lib.resource.ResourceVoteReadOnly;
 import org.objectweb.transaction.lib.resource.ResourceVoteRollback;
-import org.objectweb.transaction.lib.transaction.TransactionStatusCommitted;
 import org.objectweb.transaction.lib.transaction.TransactionStatusCommitting;
 import 
org.objectweb.transaction.lib.transaction.TransactionStatusNoTransaction;
-import org.objectweb.transaction.lib.transaction.TransactionStatusRolledBack;
 import 
org.objectweb.transaction.lib.transaction.TransactionStatusRollingBack;
-import 
org.objectweb.transaction.lib.transaction.TransactionStatusTransactionActive;
 import 
org.objectweb.transaction.lib.transaction.TransactionStatusTransactionInactive;
 
 /**
  * @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
  * @created 3 janv. 2005
- * @modified $Date: 2005/07/18 07:30:04 $
- * @version $Revision: 1.2 $
+ * @modified $Date: 2005/07/18 14:33:37 $
+ * @version $Revision: 1.3 $
  * @fractal.itf name="xa-action-provider"
  *              signature="org.objectweb.gotm.lib.resource.ActionProvider"
  * @fractal.itf name="xid-provider" role="client"