Return-Path: Delivered-To: apmail-cayenne-commits-archive@www.apache.org Received: (qmail 35465 invoked from network); 16 Feb 2007 16:24:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Feb 2007 16:24:43 -0000 Received: (qmail 63463 invoked by uid 500); 16 Feb 2007 16:24:51 -0000 Delivered-To: apmail-cayenne-commits-archive@cayenne.apache.org Received: (qmail 63449 invoked by uid 500); 16 Feb 2007 16:24:50 -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 63434 invoked by uid 99); 16 Feb 2007 16:24:50 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Feb 2007 08:24:50 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Feb 2007 08:24:42 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 547951A981A; Fri, 16 Feb 2007 08:24:22 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r508477 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java Date: Fri, 16 Feb 2007 16:24:22 -0000 To: commits@cayenne.apache.org From: aadamchik@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070216162422.547951A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: aadamchik Date: Fri Feb 16 08:24:21 2007 New Revision: 508477 URL: http://svn.apache.org/viewvc?view=rev&rev=508477 Log: CAY-754: Local jNDI hack breaks when running with Jetty6-Maven - 3.0 Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?view=diff&rev=508477&r1=508476&r2=508477 ============================================================================== --- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original) +++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Fri Feb 16 08:24:21 2007 @@ -85,6 +85,7 @@ CAY-724 Bogus FaultFailureExceptions CAY-726 SQLTemplate parsing bug when macros appear at the end of line CAY-751 AS400 datafields containing # in field names do not get mapped correctly +CAY-754 Local jNDI hack breaks when running with Jetty6-Maven API Changes ---------------------------------- Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java?view=diff&rev=508477&r1=508476&r2=508477 ============================================================================== --- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java (original) +++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/JNDIDataSourceFactory.java Fri Feb 16 08:24:21 2007 @@ -97,8 +97,9 @@ // as we don't want compile dependencies on the Modeler, instantiate factory via // reflection ... + ClassLoader loader = Thread.currentThread().getContextClassLoader(); DataSourceFactory prefsFactory = (DataSourceFactory) Class - .forName("org.apache.cayenne.modeler.pref.PreferencesDataSourceFactory") + .forName("org.apache.cayenne.modeler.pref.PreferencesDataSourceFactory", true, loader) .newInstance(); prefsFactory.initializeWithParentConfiguration(parentConfig);