cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r724025 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
Date Sat, 06 Dec 2008 18:36:12 GMT
Author: aadamchik
Date: Sat Dec  6 10:36:12 2008
New Revision: 724025

URL: http://svn.apache.org/viewvc?rev=724025&view=rev
Log:
CAY-1143 CayenneModeler 'Import DataMap' function error

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.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?rev=724025&r1=724024&r2=724025&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Sat Dec  6 10:36:12 2008
@@ -16,6 +16,7 @@
 
 CAY-1140 Store ObjEntity name in the DataRow
 CAY-1142 (Single table) Inheritance and Paginated lists 
+CAY-1143 CayenneModeler 'Import DataMap' function error
 
 ----------------------------------
 Release: 3.0M5

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java?rev=724025&r1=724024&r2=724025&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/map/MapLoader.java
Sat Dec  6 10:36:12 2008
@@ -749,10 +749,14 @@
      */
     protected ResourceFinder createResourceFinder() {
         ResourceLocator locator = new ResourceLocator();
-        locator.setSkipAbsolutePath(true);
+
+        // absolute paths are usually passed by the Modeler
+        // while runtime would use classpath
+
+        locator.setSkipAbsolutePath(false);
         locator.setSkipClasspath(false);
         locator.setSkipCurrentDirectory(false);
-        locator.setSkipHomeDirectory(false);
+        locator.setSkipHomeDirectory(true);
         return locator;
     }
     



Mime
View raw message