Mail Archive Home | gotm-commits List | November 2005 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Tuesday, November 22, 2005 @ 11:50:52
Author: rouvoy
Path: /cvsroot/gotm/gotm-jts
Modified: examples/explorer/build.xml
src/fractal/org/objectweb/gotm/lib/FcResourceManager.fractal
src/fractal/org/objectweb/gotm/lib/JtsTransaction.fractal
src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java
* new version of AoKell library,
* new version of JGraph, Explorer and Fractal Explorer libraries,
* refactoring composite components using collection interfaces,
* improving Timer component implementation.
----------------------------------------------------------------------+
examples/explorer/build.xml | 5 -
src/fractal/org/objectweb/gotm/lib/FcResourceManager.fractal | 6 -
src/fractal/org/objectweb/gotm/lib/JtsTransaction.fractal | 8
+-
src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java | 39
++++------
4 files changed, 29 insertions(+), 29 deletions(-)
Index: gotm-jts/examples/explorer/build.xml
diff -u gotm-jts/examples/explorer/build.xml:1.5
gotm-jts/examples/explorer/build.xml:1.6
--- gotm-jts/examples/explorer/build.xml:1.5 Thu Nov 17 18:13:35 2005
+++ gotm-jts/examples/explorer/build.xml Tue Nov 22 11:50:51 2005
@@ -21,7 +21,7 @@
<!-- Initial developer(s): Romain Rouvoy. -->
<!-- Contributor(s): ______________________________________. -->
-<!-- $Id: build.xml,v 1.5 2005/11/17 17:13:35 rouvoy Exp $ -->
+<!-- $Id: build.xml,v 1.6 2005/11/22 10:50:51 rouvoy Exp $ -->
<!-- ==================================================================== -->
<project name="JTS Explorer" default="all">
@@ -96,7 +96,8 @@
<propertyref prefix="gotm"/>
</syspropertyset>
<!-- <arg line="-fractal
org.objectweb.fractal.explorer.BasicFractalExplorer(bus,org.objectweb.gotm.lib.message.FcEventBusSimple)"/>-->
- <arg line="-fractal
org.objectweb.fractal.explorer.BasicFractalExplorer(manager,org.objectweb.gotm.lib.JtsTransactionManager(org.objectweb.gotm.lib.FcAdaptiveTransactionFactory))"/>
+ <arg line="-fractal
org.objectweb.fractal.explorer.BasicFractalExplorer(bus,org.objectweb.gotm.lib.FcTransaction)"/>
+<!-- <arg line="-fractal
org.objectweb.fractal.explorer.BasicFractalExplorer(manager,org.objectweb.gotm.lib.JtsTransactionManager(org.objectweb.gotm.lib.FcAdaptiveTransactionFactory))"/>-->
<!-- <sysproperty key="fractal.provider"
value="aokell.AspectjProvider"/>-->
</java>
</target>
Index: gotm-jts/src/fractal/org/objectweb/gotm/lib/FcResourceManager.fractal
diff -u
gotm-jts/src/fractal/org/objectweb/gotm/lib/FcResourceManager.fractal:1.4
gotm-jts/src/fractal/org/objectweb/gotm/lib/FcResourceManager.fractal:1.5
--- gotm-jts/src/fractal/org/objectweb/gotm/lib/FcResourceManager.fractal:1.4
Tue Nov 15 15:54:40 2005
+++ gotm-jts/src/fractal/org/objectweb/gotm/lib/FcResourceManager.fractal
Tue Nov 22 11:50:51 2005
@@ -50,9 +50,9 @@
<binding client="FcXAResourceManager.tx-state"
server="this.tx-state"/>
<binding client="FcXAResourceActions.reference-provider"
server="this.reference-provider"/>
- <binding client="FcXAResourceActions.vote-log"
server="Fc2PcProtocol.vote-log"/>
- <binding client="FcXAResourceActions.commit-ack-log"
server="Fc2PcProtocol.commit-ack-log"/>
- <binding client="FcXAResourceActions.abort-ack-log"
server="Fc2PcProtocol.abort-ack-log"/>
+ <binding client="FcXAResourceActions.log-vote"
server="Fc2PcProtocol.log-vote"/>
+ <binding client="FcXAResourceActions.log-commit-ack"
server="Fc2PcProtocol.log-commit-ack"/>
+ <binding client="FcXAResourceActions.log-abort-ack"
server="Fc2PcProtocol.log-abort-ack"/>
<binding client="Fc2PcProtocol.reference-provider"
server="this.reference-provider"/>
</definition>
\ No newline at end of file
Index: gotm-jts/src/fractal/org/objectweb/gotm/lib/JtsTransaction.fractal
diff -u
gotm-jts/src/fractal/org/objectweb/gotm/lib/JtsTransaction.fractal:1.7
gotm-jts/src/fractal/org/objectweb/gotm/lib/JtsTransaction.fractal:1.8
--- gotm-jts/src/fractal/org/objectweb/gotm/lib/JtsTransaction.fractal:1.7
Tue Nov 15 15:54:40 2005
+++ gotm-jts/src/fractal/org/objectweb/gotm/lib/JtsTransaction.fractal Tue
Nov 22 11:50:51 2005
@@ -31,13 +31,13 @@
<binding client="this.user-transaction"
server="JtsAdapter.user-transaction"/>
<binding client="this.suspend-feature"
server="JtsAdapter.suspend-feature"/>
<binding client="this.subscribe" server="Transaction.subscribe"/>
- <binding client="this.prepare" server="Transaction.prepare"/>
+ <binding client="this.prepare"
server="Transaction.execute-prepare"/>
<binding client="this.reference-provider"
server="Transaction.reference-provider"/>
<binding client="JtsAdapter.tx-state"
server="Transaction.tx-state"/>
- <binding client="JtsAdapter.commit-one" server="Transaction.one-pc"/>
- <binding client="JtsAdapter.commit" server="Transaction.two-pc"/>
- <binding client="JtsAdapter.rollback" server="Transaction.abort"/>
+ <binding client="JtsAdapter.commit-one"
server="Transaction.execute-one-pc"/>
+ <binding client="JtsAdapter.commit"
server="Transaction.execute-two-pc"/>
+ <binding client="JtsAdapter.rollback"
server="Transaction.execute-abort"/>
<binding client="JtsAdapter.timeout-attr"
server="Transaction.timeout-attr"/>
<binding client="JtsAdapter.synchronization"
server="ResourceManager.synchronization"/>
<binding client="JtsAdapter.xa-resource"
server="ResourceManager.xa-resource"/>
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.8
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java:1.9
---
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java:1.8
Thu Nov 17 14:04:15 2005
+++
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java
Tue Nov 22 11:50:52 2005
@@ -22,7 +22,7 @@
Contributor(s): ______________________________________.
---------------------------------------------------------------------
- $Id: XAResourceActionProvider.java,v 1.8 2005/11/17 13:04:15 rouvoy Exp $
+ $Id: XAResourceActionProvider.java,v 1.9 2005/11/22 10:50:52 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.jta.xa;
@@ -58,24 +58,23 @@
* Implementation of the XA Resource specification.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 3 janv. 2005
- * @modified $Date: 2005/11/17 13:04:15 $
- * @version $Revision: 1.8 $
+ * @modified $Date: 2005/11/22 10:50:52 $
+ * @version $Revision: 1.9 $
* @fractal.itf name="xa-action-provider"
* signature="org.objectweb.gotm.lib.action.ActionProvider"
* @fractal.itf name="reference-provider" role="client"
*
signature="org.objectweb.gotm.lib.reference.ReferenceProvider"
- * @fractal.itf name="vote-log" role="client"
signature="org.objectweb.transaction.api.logging.LoggerFeature"
- * @fractal.itf name="commit-ack-log" role="client"
signature="org.objectweb.transaction.api.logging.LoggerFeature"
- * @fractal.itf name="abort-ack-log" role="client"
signature="org.objectweb.transaction.api.logging.LoggerFeature"
+ * @fractal.itf name="log" role="client" cardinality="collection"
+ *
signature="org.objectweb.transaction.api.logging.LoggerFeature"
*/
public class XAResourceActionProvider
extends ActionProviderAbstract {
/** <code>VOTE_LOG</code> . */
- public static final String VOTE_LOG = "vote-log";
+ public static final String VOTE_LOG = "log-vote";
/** <code>COMMIT_ACK_LOG</code> . */
- public static final String COMMIT_ACK_LOG = "commit-ack-log";
+ public static final String COMMIT_ACK_LOG = "log-commit-ack";
/** <code>ABORT_ACK_LOG</code> . */
- public static final String ABORT_ACK_LOG = "abort-ack-log";
+ public static final String ABORT_ACK_LOG = "log-abort-ack";
/*
* (non-Javadoc)
@@ -83,7 +82,7 @@
* @see org.objectweb.fractal.lib.BindablePrimitive#clientFc()
*/
protected String[] clientFc() {
- return new String[] {
ReferenceProvider.REFERENCE_PROVIDER,VOTE_LOG,COMMIT_ACK_LOG,ABORT_ACK_LOG };
+ return new String[] { ReferenceProvider.REFERENCE_PROVIDER, "log" };
}
/**
@@ -143,8 +142,8 @@
* Implementation of the XA Start Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 1 aug. 2005
- * @modified $Date: 2005/11/17 13:04:15 $
- * @version $Revision: 1.8 $
+ * @modified $Date: 2005/11/22 10:50:52 $
+ * @version $Revision: 1.9 $
* @fractal.itf
*/
private final class StartAction
@@ -177,8 +176,8 @@
* Implementation of the XA End Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 1 aug. 2005
- * @modified $Date: 2005/11/17 13:04:15 $
- * @version $Revision: 1.8 $
+ * @modified $Date: 2005/11/22 10:50:52 $
+ * @version $Revision: 1.9 $
* @fractal.itf
*/
private final class EndAction
@@ -207,8 +206,8 @@
* Implementation of the XA Prepare Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 1 aug. 2005
- * @modified $Date: 2005/11/17 13:04:15 $
- * @version $Revision: 1.8 $
+ * @modified $Date: 2005/11/22 10:50:52 $
+ * @version $Revision: 1.9 $
* @fractal.itf
*/
private final class PrepareAction
@@ -249,8 +248,8 @@
* Implementation of the XA Commit Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 1 aug. 2005
- * @modified $Date: 2005/11/17 13:04:15 $
- * @version $Revision: 1.8 $
+ * @modified $Date: 2005/11/22 10:50:52 $
+ * @version $Revision: 1.9 $
* @fractal.itf
*/
private final class CommitAction
@@ -274,8 +273,8 @@
* Implementation of the XA Rollback Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 1 aug. 2005
- * @modified $Date: 2005/11/17 13:04:15 $
- * @version $Revision: 1.8 $
+ * @modified $Date: 2005/11/22 10:50:52 $
+ * @version $Revision: 1.9 $
* @fractal.itf
*/
private final class RollbackAction
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.