Mail Archive Home | gotm-commits List | October 2005 Index
| <-- Date Index --> | <-- Thread Index --> |
Date: Friday, October 14, 2005 @ 13:43:58
Author: rouvoy
Path: /cvsroot/gotm/gotm-jts
Added: lib/otdf/ow-gotm-otdf.jar
Modified: .classpath
examples/explorer/src/java/org/objectweb/gotm/jts/local/JtaClient.java
src/fractal/org/objectweb/gotm/lib/JtsTransactionManager.fractal
src/java/org/objectweb/gotm/lib/connector/XATerminatorImpl.java
src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java
src/java/org/objectweb/gotm/lib/jta/UserTransactionImpl.java
src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java
* updating the BindingComponent class with a 'singletonFc(String)' method.
This method provides the instance of interface associated with the parameter.
* updating other projects code.
* changing default optimization level to
'mergeContentControllerAndInterceptors'
* updating explorer framework libraries.
------------------------------------------------------------------------+
.classpath |
2
examples/explorer/src/java/org/objectweb/gotm/jts/local/JtaClient.java |
14 ++--
src/fractal/org/objectweb/gotm/lib/JtsTransactionManager.fractal |
21 +++++-
src/java/org/objectweb/gotm/lib/connector/XATerminatorImpl.java |
8 +-
src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java |
24 +++----
src/java/org/objectweb/gotm/lib/jta/UserTransactionImpl.java |
8 +-
src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java |
34 +++++-----
7 files changed, 64 insertions(+), 47 deletions(-)
Index: gotm-jts/.classpath
diff -u gotm-jts/.classpath:1.12 gotm-jts/.classpath:1.13
--- gotm-jts/.classpath:1.12 Tue Sep 6 15:40:10 2005
+++ gotm-jts/.classpath Fri Oct 14 13:43:58 2005
@@ -12,7 +12,6 @@
<classpathentry kind="src" path="/gotm-explorer"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/fractal-pool"/>
- <classpathentry kind="lib" path="lib/jta/jta-1_01.jar"/>
<classpathentry kind="lib"
path="/fractal-import/lib/fractal/fractal.jar"/>
<classpathentry kind="lib"
path="/fractal-import/lib/utils/ow_util_trace.jar"/>
<classpathentry
sourcepath="D:/rouvoy/Mes-workspaces/gotm-workspace/julia/src" kind="lib"
path="/fractal-import/lib/fractal-adl/fractal-adl.jar"/>
@@ -24,5 +23,6 @@
<classpathentry kind="lib" path="lib/connector/connector-1_5.jar"/>
<classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/ow_util_explorer.jar"/>
<classpathentry kind="lib"
path="/fractal-import/lib/fractal-explorer/fractal-explorer.jar"/>
+ <classpathentry kind="lib" path="lib/jta/jta-1_01.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Index:
gotm-jts/examples/explorer/src/java/org/objectweb/gotm/jts/local/JtaClient.java
diff -u
gotm-jts/examples/explorer/src/java/org/objectweb/gotm/jts/local/JtaClient.java:1.1
gotm-jts/examples/explorer/src/java/org/objectweb/gotm/jts/local/JtaClient.java:1.2
---
gotm-jts/examples/explorer/src/java/org/objectweb/gotm/jts/local/JtaClient.java:1.1
Tue Sep 6 10:01:49 2005
+++
gotm-jts/examples/explorer/src/java/org/objectweb/gotm/jts/local/JtaClient.java
Fri Oct 14 13:43:58 2005
@@ -22,7 +22,7 @@
Contributor(s): ______________________________________.
---------------------------------------------------------------------
- $Id: JtaClient.java,v 1.1 2005/09/06 08:01:49 rouvoy Exp $
+ $Id: JtaClient.java,v 1.2 2005/10/14 11:43:58 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.jts.local;
@@ -44,8 +44,8 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 3 janv. 2005
- * @modified $Date: 2005/09/06 08:01:49 $
- * @version $Revision: 1.1 $
+ * @modified $Date: 2005/10/14 11:43:58 $
+ * @version $Revision: 1.2 $
* @fractal.itf name="runnable" signature="java.lang.Runnable"
* @fractal.itf name="transaction-manager" role="client"
signature="javax.transaction.TransactionManager"
* @fractal.itf name="counter" role="client"
signature="org.objectweb.fractal.api.Component"
@@ -68,7 +68,7 @@
* @return the associated transaction manager.
*/
protected TransactionManager getTransactionManager() {
- return (TransactionManager) fcBindings.get(TX_MANAGER);
+ return (TransactionManager) singletonFc(TX_MANAGER);
}
/**
@@ -76,7 +76,7 @@
*/
protected Counter getCounter() {
try {
- return (Counter)
((Component)fcBindings.get(Counter.COUNTER)).getFcInterface(Counter.COUNTER);
+ return (Counter)
((Component)singletonFc(Counter.COUNTER)).getFcInterface(Counter.COUNTER);
} catch (NoSuchInterfaceException e) {
return null ;
}
@@ -87,7 +87,7 @@
*/
protected Synchronization getSynchronization() {
try {
- return (Synchronization)
((Component)fcBindings.get(Counter.COUNTER)).getFcInterface("synchronization");
+ return (Synchronization)
((Component)singletonFc(Counter.COUNTER)).getFcInterface("synchronization");
} catch (NoSuchInterfaceException e) {
return null ;
}
@@ -98,7 +98,7 @@
*/
protected XAResource getXAResource() {
try {
- return (XAResource)
((Component)fcBindings.get(Counter.COUNTER)).getFcInterface("xa-resource");
+ return (XAResource)
((Component)singletonFc(Counter.COUNTER)).getFcInterface("xa-resource");
} catch (NoSuchInterfaceException e) {
return null ;
}
Index: gotm-jts/lib/otdf/ow-gotm-otdf.jar
cvs rdiff: failed to read diff file header /tmp/cvsTrPa4h for
ow-gotm-otdf.jar,v: end of file
Index:
gotm-jts/src/fractal/org/objectweb/gotm/lib/JtsTransactionManager.fractal
diff -u
gotm-jts/src/fractal/org/objectweb/gotm/lib/JtsTransactionManager.fractal:1.4
gotm-jts/src/fractal/org/objectweb/gotm/lib/JtsTransactionManager.fractal:1.5
---
gotm-jts/src/fractal/org/objectweb/gotm/lib/JtsTransactionManager.fractal:1.4
Tue Sep 6 10:01:49 2005
+++ gotm-jts/src/fractal/org/objectweb/gotm/lib/JtsTransactionManager.fractal
Fri Oct 14 13:43:58 2005
@@ -12,6 +12,8 @@
signature="javax.transaction.UserTransaction"/>
<interface name="xa-terminator" role="server"
signature="javax.resource.spi.XATerminator"/>
+ <interface name="policy" role="server" cardinality="collection"
+
signature="org.objectweb.gotm.otdf.api.policies.demarcation.DemarcationPolicy"/>
<component name="JtsAdapter"
definition="org.objectweb.gotm.lib.jta.FcTransactionManagerImpl"/>
@@ -25,7 +27,9 @@
definition="org.objectweb.gotm.lib.util.FcCollectionImpl"/>
<component name="FcCounter"
definition="org.objectweb.gotm.lib.stat.FcEventCounterImpl"/>
-
+ <component name="FcDemarcation"
+ definition="org.objectweb.gotm.otdf.FcDemarcation"/>
+
<binding client="this.transaction-manager"
server="JtsAdapter.transaction-manager"/>
<binding client="this.user-transaction"
@@ -38,6 +42,19 @@
server="FcCurrent.reference-manager"/>
<binding client="this.event-counter"
server="FcCounter.event-counter"/>
+ <binding client="this.policy-mandatory"
+ server="FcDemarcation.policy-mandatory"/>
+ <binding client="this.policy-never"
+ server="FcDemarcation.policy-never"/>
+ <binding client="this.policy-supports"
+ server="FcDemarcation.policy-supports"/>
+ <binding client="this.policy-required"
+ server="FcDemarcation.policy-required"/>
+ <binding client="this.policy-requiresnew"
+ server="FcDemarcation.policy-requiresnew"/>
+ <binding client="this.policy-notsupported"
+ server="FcDemarcation.policy-notsupported"/>
+
<binding client="JtsAdapter.current-manager"
server="FcCurrent.current-manager"/>
<binding client="XATerminator.reference-manager"
@@ -48,4 +65,6 @@
server="FcCounter.publish"/>
<binding client="FcFactory.loaded-tx"
server="FcCreated.collection"/>
+ <binding client="FcDemarcation.current-manager"
+ server="FcCurrent.current-manager"/>
</definition>
\ No newline at end of file
Index:
gotm-jts/src/java/org/objectweb/gotm/lib/connector/XATerminatorImpl.java
diff -u
gotm-jts/src/java/org/objectweb/gotm/lib/connector/XATerminatorImpl.java:1.1
gotm-jts/src/java/org/objectweb/gotm/lib/connector/XATerminatorImpl.java:1.2
---
gotm-jts/src/java/org/objectweb/gotm/lib/connector/XATerminatorImpl.java:1.1
Tue Sep 6 10:01:50 2005
+++ gotm-jts/src/java/org/objectweb/gotm/lib/connector/XATerminatorImpl.java
Fri Oct 14 13:43:58 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: XATerminatorImpl.java,v 1.1 2005/09/06 08:01:50 rouvoy Exp $
+$Id: XATerminatorImpl.java,v 1.2 2005/10/14 11:43:58 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.connector;
@@ -48,8 +48,8 @@
/**
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 30 août 2005
- * @modified $Date: 2005/09/06 08:01:50 $
- * @version $Revision: 1.1 $
+ * @modified $Date: 2005/10/14 11:43:58 $
+ * @version $Revision: 1.2 $
* @fractal.itf name="xa-terminator"
signature="javax.resource.spi.XATerminator"
* @fractal.itf name="reference-manager" role="client"
signature="org.objectweb.gotm.lib.reference.ReferenceManager"
*/
@@ -69,7 +69,7 @@
* transaction manager
*/
protected final ReferenceManager manager() {
- return (ReferenceManager)
fcBindings.get(ReferenceManager.REFERENCE_MANAGER);
+ return (ReferenceManager)
singletonFc(ReferenceManager.REFERENCE_MANAGER);
}
/**
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.14
gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java:1.15
--- gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java:1.14
Tue Sep 6 10:01:50 2005
+++ gotm-jts/src/java/org/objectweb/gotm/lib/jta/TransactionImpl.java Fri
Oct 14 13:43:58 2005
@@ -22,7 +22,7 @@
Contributor(s): ______________________________________.
---------------------------------------------------------------------
- $Id: TransactionImpl.java,v 1.14 2005/09/06 08:01:50 rouvoy Exp $
+ $Id: TransactionImpl.java,v 1.15 2005/10/14 11:43:58 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.jta;
@@ -57,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/09/06 08:01:50 $
- * @version $Revision: 1.14 $
+ * @modified $Date: 2005/10/14 11:43:58 $
+ * @version $Revision: 1.15 $
* @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"
@@ -104,55 +104,53 @@
* @return the commit coordination process.
*/
protected final CoordinationFeature fcCommit() {
- return (CoordinationFeature) fcBindings.get(COMMIT);
+ return (CoordinationFeature) singletonFc(COMMIT);
}
/**
* @return the commit coordination process.
*/
protected final CoordinationFeature fcCommitOne() {
- return (CoordinationFeature) fcBindings.get(COMMIT_ONE);
+ return (CoordinationFeature) singletonFc(COMMIT_ONE);
}
/**
* @return the rollback coordination process.
*/
protected final CoordinationFeature fcRollback() {
- return (CoordinationFeature) fcBindings.get(ROLLBACK);
+ return (CoordinationFeature) singletonFc(ROLLBACK);
}
/**
* @return Returns the txState.
*/
protected final TransactionState fcTxState() {
- return (TransactionState) fcBindings
- .get(TransactionState.TRANSACTION_STATE);
+ return (TransactionState)
singletonFc(TransactionState.TRANSACTION_STATE);
}
/**
* @return Returns the syncEnlist.
*/
protected final ResourceManager fcSynchronization() {
- return (ResourceManager) fcBindings.get(SYNCHRONIZATION);
+ return (ResourceManager) singletonFc(SYNCHRONIZATION);
}
/**
* @return Returns the resEnlist.
*/
protected final ResourceManager fcResource() {
- return (ResourceManager) fcBindings.get(RESOURCE);
+ return (ResourceManager) singletonFc(RESOURCE);
}
/**
* @return Returns the event converter.
*/
protected final EventConverter fcStatusHelper() {
- return (EventConverter) fcBindings.get(STATUS_CONVERTER);
+ return (EventConverter) singletonFc(STATUS_CONVERTER);
}
protected final TimeoutAttribute timeout() {
- return (TimeoutAttribute) fcBindings
- .get(TimeoutAttribute.TIMEOUT_ATTRIBUTE);
+ return (TimeoutAttribute)
singletonFc(TimeoutAttribute.TIMEOUT_ATTRIBUTE);
}
/* (non-Javadoc)
Index: gotm-jts/src/java/org/objectweb/gotm/lib/jta/UserTransactionImpl.java
diff -u
gotm-jts/src/java/org/objectweb/gotm/lib/jta/UserTransactionImpl.java:1.2
gotm-jts/src/java/org/objectweb/gotm/lib/jta/UserTransactionImpl.java:1.3
--- gotm-jts/src/java/org/objectweb/gotm/lib/jta/UserTransactionImpl.java:1.2
Tue Sep 6 10:01:50 2005
+++ gotm-jts/src/java/org/objectweb/gotm/lib/jta/UserTransactionImpl.java
Fri Oct 14 13:43:58 2005
@@ -23,7 +23,7 @@
Contributor(s): .
---------------------------------------------------------------------
-$Id: UserTransactionImpl.java,v 1.2 2005/09/06 08:01:50 rouvoy Exp $
+$Id: UserTransactionImpl.java,v 1.3 2005/10/14 11:43:58 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.jta;
@@ -44,8 +44,8 @@
* Implementation of a current user transaction.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 9 août 2005
- * @modified $Date: 2005/09/06 08:01:50 $
- * @version $Revision: 1.2 $
+ * @modified $Date: 2005/10/14 11:43:58 $
+ * @version $Revision: 1.3 $
* @fractal.itf name="user-transaction"
* signature="javax.transaction.UserTransaction"
* @fractal.itf name="current-manager" role="client"
@@ -92,7 +92,7 @@
* transaction manager
*/
protected final CurrentManager manager() {
- return (CurrentManager)
fcBindings.get(CurrentManager.CURRENT_MANAGER);
+ return (CurrentManager) singletonFc(CurrentManager.CURRENT_MANAGER);
}
/**
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.6
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java:1.7
---
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java:1.6
Tue Sep 6 10:01:49 2005
+++
gotm-jts/src/java/org/objectweb/gotm/lib/jta/xa/XAResourceActionProvider.java
Fri Oct 14 13:43:58 2005
@@ -22,7 +22,7 @@
Contributor(s): ______________________________________.
---------------------------------------------------------------------
- $Id: XAResourceActionProvider.java,v 1.6 2005/09/06 08:01:49 rouvoy Exp $
+ $Id: XAResourceActionProvider.java,v 1.7 2005/10/14 11:43:58 rouvoy Exp $
====================================================================*/
package org.objectweb.gotm.lib.jta.xa;
@@ -58,8 +58,8 @@
* Implementation of the XA Resource specification.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 3 janv. 2005
- * @modified $Date: 2005/09/06 08:01:49 $
- * @version $Revision: 1.6 $
+ * @modified $Date: 2005/10/14 11:43:58 $
+ * @version $Revision: 1.7 $
* @fractal.itf name="xa-action-provider"
* signature="org.objectweb.gotm.lib.resource.ActionProvider"
* @fractal.itf name="reference-provider" role="client"
@@ -90,28 +90,28 @@
* @return the associated XID.
*/
protected final Xid getXid() {
- return (Xid)((ReferenceProvider)
fcBindings.get(ReferenceProvider.REFERENCE_PROVIDER)).getReference();
+ return (Xid)((ReferenceProvider)
singletonFc(ReferenceProvider.REFERENCE_PROVIDER)).getReference();
}
/**
* @return the vote logger.
*/
protected final LoggerFeature getVoteLog() {
- return (LoggerFeature) fcBindings.get(VOTE_LOG);
+ return (LoggerFeature) singletonFc(VOTE_LOG);
}
/**
* @return the commit ack logger.
*/
protected final LoggerFeature getCommitAckLog() {
- return (LoggerFeature) fcBindings.get(COMMIT_ACK_LOG);
+ return (LoggerFeature) singletonFc(COMMIT_ACK_LOG);
}
/**
* @return the abort ack logger.
*/
protected final LoggerFeature getAbortAckLog() {
- return (LoggerFeature) fcBindings.get(ABORT_ACK_LOG);
+ return (LoggerFeature) singletonFc(ABORT_ACK_LOG);
}
/*
@@ -143,8 +143,8 @@
* Implementation of the XA Start Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 1 août 2005
- * @modified $Date: 2005/09/06 08:01:49 $
- * @version $Revision: 1.6 $
+ * @modified $Date: 2005/10/14 11:43:58 $
+ * @version $Revision: 1.7 $
* @fractal.itf
*/
private final class StartAction
@@ -177,8 +177,8 @@
* Implementation of the XA End Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 1 août 2005
- * @modified $Date: 2005/09/06 08:01:49 $
- * @version $Revision: 1.6 $
+ * @modified $Date: 2005/10/14 11:43:58 $
+ * @version $Revision: 1.7 $
* @fractal.itf
*/
private final class EndAction
@@ -207,8 +207,8 @@
* Implementation of the XA Prepare Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 1 août 2005
- * @modified $Date: 2005/09/06 08:01:49 $
- * @version $Revision: 1.6 $
+ * @modified $Date: 2005/10/14 11:43:58 $
+ * @version $Revision: 1.7 $
* @fractal.itf
*/
private final class PrepareAction
@@ -249,8 +249,8 @@
* Implementation of the XA Commit Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 1 août 2005
- * @modified $Date: 2005/09/06 08:01:49 $
- * @version $Revision: 1.6 $
+ * @modified $Date: 2005/10/14 11:43:58 $
+ * @version $Revision: 1.7 $
* @fractal.itf
*/
private final class CommitAction
@@ -274,8 +274,8 @@
* Implementation of the XA Rollback Action.
* @author <a href="mailto:Romain.Rouvoy@xxxxxxx";>Romain Rouvoy</a>
* @created 1 août 2005
- * @modified $Date: 2005/09/06 08:01:49 $
- * @version $Revision: 1.6 $
+ * @modified $Date: 2005/10/14 11:43:58 $
+ * @version $Revision: 1.7 $
* @fractal.itf
*/
private final class RollbackAction
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.