You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/02/16 17:24:22 UTC
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
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);