Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 24320 invoked from network); 21 Feb 2011 08:56:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Feb 2011 08:56:20 -0000 Received: (qmail 84408 invoked by uid 500); 21 Feb 2011 08:56:20 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 84378 invoked by uid 500); 21 Feb 2011 08:56:19 -0000 Mailing-List: contact commits-help@cayenne.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cayenne.apache.org Delivered-To: mailing list commits@cayenne.apache.org Received: (qmail 84368 invoked by uid 99); 21 Feb 2011 08:56:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Feb 2011 08:56:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Feb 2011 08:56:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 636D32388A40; Mon, 21 Feb 2011 08:55:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1072886 - /cayenne/main/tags/3.1M2/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java Date: Mon, 21 Feb 2011 08:55:55 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110221085555.636D32388A40@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aadamchik Date: Mon Feb 21 08:55:55 2011 New Revision: 1072886 URL: http://svn.apache.org/viewvc?rev=1072886&view=rev Log: CAY-1542 DI container is not shutting down Cayenne-managed connection pool making sure PoolManager can be reused in the test lifecycle (cherry picked from commit 7e6228c0a6e0ddda1a8b92c52e24e9cb083b20ea) Modified: cayenne/main/tags/3.1M2/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java Modified: cayenne/main/tags/3.1M2/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java URL: http://svn.apache.org/viewvc/cayenne/main/tags/3.1M2/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java?rev=1072886&r1=1072885&r2=1072886&view=diff ============================================================================== --- cayenne/main/tags/3.1M2/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java (original) +++ cayenne/main/tags/3.1M2/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/unit/CayenneResources.java Mon Feb 21 08:55:55 2011 @@ -20,6 +20,7 @@ package org.apache.cayenne.unit; import java.io.InputStream; +import java.sql.SQLException; import java.util.Map; import javax.sql.DataSource; @@ -107,8 +108,6 @@ public class CayenneResources implements return resources; } - - public CayenneResources(Map adapterMap) { this.adapterMap = adapterMap; } @@ -237,7 +236,15 @@ public class CayenneResources implements 1, 1, connectionInfo.getUserName(), - connectionInfo.getPassword()); + connectionInfo.getPassword()) { + + @Override + public void shutdown() throws SQLException { + // noop - make sure we are not shutdown by the test scope, but at the + // same time PoolManager methods are exposed (so we can't wrap + // PoolManager) + } + }; } catch (Exception ex) { logger.error("Can not create shared data source.", ex);