cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r508479 - in /cayenne/main/branches/STABLE-1.2/cayenne: cayenne-java/src/cayenne/java/org/objectstyle/cayenne/conf/JNDIDataSourceFactory.java cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt
Date Fri, 16 Feb 2007 16:26:11 GMT
Author: aadamchik
Date: Fri Feb 16 08:26:10 2007
New Revision: 508479

URL: http://svn.apache.org/viewvc?view=rev&rev=508479
Log:
CAY-754: Local jNDI hack breaks when running with Jetty6-Maven 1.2 branch

Modified:
    cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/conf/JNDIDataSourceFactory.java
    cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt

Modified: cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/conf/JNDIDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/conf/JNDIDataSourceFactory.java?view=diff&rev=508479&r1=508478&r2=508479
==============================================================================
--- cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/conf/JNDIDataSourceFactory.java
(original)
+++ cayenne/main/branches/STABLE-1.2/cayenne/cayenne-java/src/cayenne/java/org/objectstyle/cayenne/conf/JNDIDataSourceFactory.java
Fri Feb 16 08:26:10 2007
@@ -144,9 +144,10 @@
         // 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.objectstyle.cayenne.modeler.pref.PreferencesDataSourceFactory")
+                        "org.objectstyle.cayenne.modeler.pref.PreferencesDataSourceFactory",
true, loader)
                 .newInstance();
 
         prefsFactory.initializeWithParentConfiguration(parentConfig);

Modified: cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt
URL: http://svn.apache.org/viewvc/cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt?view=diff&rev=508479&r1=508478&r2=508479
==============================================================================
--- cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt
(original)
+++ cayenne/main/branches/STABLE-1.2/cayenne/cayenne-other/release-notes/RELEASE-NOTES-1.2.3.txt
Fri Feb 16 08:26:10 2007
@@ -14,3 +14,4 @@
 CAY-743 Reordering mappings from domain in xml resulting in StackOverflowException
 CAY-750 Stored procedures without parameters fail on Postgres 8
 CAY-751 AS400 datafields containing # in field names do not get mapped correctly
+CAY-754 Local jNDI hack breaks when running with Jetty6-Maven



Mime
View raw message