You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/09/13 04:29:52 UTC
svn commit: r280461 - in /geronimo/trunk/modules/transaction: ./
src/java/org/apache/geronimo/transaction/context/
Author: djencks
Date: Mon Sep 12 19:29:48 2005
New Revision: 280461
URL: http://svn.apache.org/viewcvs?rev=280461&view=rev
Log:
GERONIMO-1005 abstract dependence of transaction on tranql
Added:
geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/Flushable.java
Modified:
geronimo/trunk/modules/transaction/project.xml
geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/AbstractTransactionContext.java
geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContext.java
Modified: geronimo/trunk/modules/transaction/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/project.xml?rev=280461&r1=280460&r2=280461&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/project.xml (original)
+++ geronimo/trunk/modules/transaction/project.xml Mon Sep 12 19:29:48 2005
@@ -112,13 +112,6 @@
</dependency>
<dependency>
- <groupId>tranql</groupId>
- <artifactId>tranql</artifactId>
- <version>${tranql_version}</version>
- <url>http://tranql.codehaus.org</url>
- </dependency>
-
- <dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
<version>${mx4j_version}</version>
Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/AbstractTransactionContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/AbstractTransactionContext.java?rev=280461&r1=280460&r2=280461&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/AbstractTransactionContext.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/AbstractTransactionContext.java Mon Sep 12 19:29:48 2005
@@ -27,7 +27,6 @@
import org.apache.geronimo.transaction.ConnectionReleaser;
import org.apache.geronimo.transaction.DoubleKeyedHashMap;
import org.apache.geronimo.transaction.InstanceContext;
-import org.tranql.cache.InTxCache;
/**
@@ -40,7 +39,7 @@
private InstanceContext currentContext;
private final DoubleKeyedHashMap associatedContexts = new DoubleKeyedHashMap();
private final DoubleKeyedHashMap dirtyContexts = new DoubleKeyedHashMap();
- private InTxCache inTxCache;
+ private Flushable inTxCache;
public final void associate(InstanceContext context) throws Throwable {
if (associatedContexts.put(context.getContainerId(), context.getId(), context) == null) {
@@ -117,11 +116,11 @@
}
}
- public final void setInTxCache(InTxCache inTxCache) {
+ public final void setInTxCache(Flushable inTxCache) {
this.inTxCache = inTxCache;
}
-
- public final InTxCache getInTxCache() {
+
+ public final Flushable getInTxCache() {
return inTxCache;
}
Added: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/Flushable.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/Flushable.java?rev=280461&view=auto
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/Flushable.java (added)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/Flushable.java Mon Sep 12 19:29:48 2005
@@ -0,0 +1,24 @@
+/**
+ *
+ * Copyright 2005 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.transaction.context;
+
+/**
+ * @version $Rev: $ $Date: $
+ */
+public interface Flushable {
+ void flush() throws Exception;
+}
Modified: geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContext.java?rev=280461&r1=280460&r2=280461&view=diff
==============================================================================
--- geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContext.java (original)
+++ geronimo/trunk/modules/transaction/src/java/org/apache/geronimo/transaction/context/TransactionContext.java Mon Sep 12 19:29:48 2005
@@ -27,7 +27,6 @@
import org.apache.geronimo.transaction.ConnectionReleaser;
import org.apache.geronimo.transaction.InstanceContext;
-import org.tranql.cache.InTxCache;
/**
@@ -70,9 +69,9 @@
void flushState() throws Throwable;
- void setInTxCache(InTxCache inTxCache);
+ void setInTxCache(Flushable flushable);
- InTxCache getInTxCache();
+ Flushable getInTxCache();
void setManagedConnectionInfo(ConnectionReleaser key, Object info);