Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 18457 invoked from network); 13 Sep 2005 02:29:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Sep 2005 02:29:55 -0000 Received: (qmail 90281 invoked by uid 500); 13 Sep 2005 02:29:54 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 90256 invoked by uid 500); 13 Sep 2005 02:29:54 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 90243 invoked by uid 99); 13 Sep 2005 02:29:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Sep 2005 19:29:54 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 12 Sep 2005 19:30:05 -0700 Received: (qmail 18448 invoked by uid 65534); 13 Sep 2005 02:29:53 -0000 Message-ID: <20050913022953.18446.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r280461 - in /geronimo/trunk/modules/transaction: ./ src/java/org/apache/geronimo/transaction/context/ Date: Tue, 13 Sep 2005 02:29:52 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ - tranql - tranql - ${tranql_version} - http://tranql.codehaus.org - - - mx4j mx4j ${mx4j_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);