From geronimo-cvs-return-487-apmail-incubator-geronimo-cvs-archive=incubator.apache.org@incubator.apache.org Sat Aug 16 23:16:37 2003 Return-Path: Delivered-To: apmail-incubator-geronimo-cvs-archive@incubator.apache.org Received: (qmail 44504 invoked by uid 500); 16 Aug 2003 23:16:37 -0000 Mailing-List: contact geronimo-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: geronimo-dev@incubator.apache.org Delivered-To: mailing list geronimo-cvs@incubator.apache.org Received: (qmail 44491 invoked from network); 16 Aug 2003 23:16:37 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 16 Aug 2003 23:16:37 -0000 Received: (qmail 73901 invoked by uid 1711); 16 Aug 2003 23:16:51 -0000 Date: 16 Aug 2003 23:16:51 -0000 Message-ID: <20030816231651.73900.qmail@minotaur.apache.org> From: dain@apache.org To: incubator-geronimo-cvs@apache.org Subject: cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context TransactionInterceptor.java CMTInterceptor.java ExecutionContextInterceptor.java StatelessBMTInterceptor.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dain 2003/08/16 16:16:51 Modified: modules/core/src/java/org/apache/geronimo/ejb/context TransactionInterceptor.java CMTInterceptor.java ExecutionContextInterceptor.java StatelessBMTInterceptor.java Log: Initial revision of deployment dependency management system. Revision Changes Path 1.7 +3 -7 incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/TransactionInterceptor.java Index: TransactionInterceptor.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/TransactionInterceptor.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- TransactionInterceptor.java 15 Aug 2003 14:12:19 -0000 1.6 +++ TransactionInterceptor.java 16 Aug 2003 23:16:51 -0000 1.7 @@ -119,12 +119,8 @@ transactionInterceptor.startRecursive(); } - public void stop() { + public void stop() throws Exception { transactionInterceptor.stop(); - } - - // @todo not supported by JSR77 lifecycle - public void destroy() { transactionInterceptor.setContainer(null); transactionInterceptor = null; } @@ -144,6 +140,6 @@ */ public String getObjectName () { - return null; + return transactionInterceptor.getObjectName(); } } 1.5 +5 -5 incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/CMTInterceptor.java Index: CMTInterceptor.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/CMTInterceptor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- CMTInterceptor.java 15 Aug 2003 14:12:19 -0000 1.4 +++ CMTInterceptor.java 16 Aug 2003 23:16:51 -0000 1.5 @@ -85,14 +85,14 @@ public final class CMTInterceptor extends ExecutionContextInterceptor { private EJBMetadata ejbMetadata; - public void start() throws Exception { - super.start(); + protected void doStart() throws Exception { + super.doStart(); ejbMetadata = EJBPlugins.getEJBMetadata((RPCContainer)getContainer()); } - public void stop() { + protected void doStop() throws Exception { ejbMetadata = null; - super.stop(); + super.doStop(); } public InvocationResult invoke(Invocation invocation) throws Exception { 1.4 +5 -5 incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/ExecutionContextInterceptor.java Index: ExecutionContextInterceptor.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/ExecutionContextInterceptor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ExecutionContextInterceptor.java 15 Aug 2003 14:12:19 -0000 1.3 +++ ExecutionContextInterceptor.java 16 Aug 2003 23:16:51 -0000 1.4 @@ -74,14 +74,14 @@ public abstract class ExecutionContextInterceptor extends AbstractInterceptor { protected TransactionManager tm; - public void start() throws Exception { - super.start(); + protected void doStart() throws Exception { + super.doStart(); tm = EJBPlugins.getTransactionManager((RPCContainer)getContainer()); } - public void stop() { + protected void doStop() throws Exception { tm = null; - super.stop(); + super.doStop(); } /** 1.5 +3 -3 incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/StatelessBMTInterceptor.java Index: StatelessBMTInterceptor.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/StatelessBMTInterceptor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- StatelessBMTInterceptor.java 15 Aug 2003 14:12:19 -0000 1.4 +++ StatelessBMTInterceptor.java 16 Aug 2003 23:16:51 -0000 1.5 @@ -76,8 +76,8 @@ public final class StatelessBMTInterceptor extends ExecutionContextInterceptor { private String ejbName; - public void start() throws Exception { - super.start(); + protected void doStart() throws Exception { + super.doStart(); ejbName = EJBPlugins.getEJBMetadata((RPCContainer)getContainer()).getName(); }