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 2011/05/15 11:59:43 UTC

svn commit: r1103305 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java

Author: aadamchik
Date: Sun May 15 09:59:43 2011
New Revision: 1103305

URL: http://svn.apache.org/viewvc?rev=1103305&view=rev
Log:
fixing resource lookup

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java?rev=1103305&r1=1103304&r2=1103305&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/configuration/XMLDataChannelDescriptorLoaderTest.java Sun May 15 09:59:43 2011
@@ -54,9 +54,8 @@ public class XMLDataChannelDescriptorLoa
         injector.injectMembers(loader);
 
         String testConfigName = "testConfig1";
-        String baseUrl = getClass().getPackage().getName().replace('.', '/');
-        URL url = getClass().getClassLoader().getResource(
-                baseUrl + "/cayenne-" + testConfigName + ".xml");
+
+        URL url = getClass().getResource("cayenne-" + testConfigName + ".xml");
         ConfigurationTree<DataChannelDescriptor> tree = loader.load(new URLResource(url));
 
         assertNotNull(tree);
@@ -112,9 +111,7 @@ public class XMLDataChannelDescriptorLoa
         injector.injectMembers(loader);
 
         String testConfigName = "testConfig2";
-        String baseUrl = getClass().getPackage().getName().replace('.', '/');
-        URL url = getClass().getClassLoader().getResource(
-                baseUrl + "/cayenne-" + testConfigName + ".xml");
+        URL url = getClass().getResource("cayenne-" + testConfigName + ".xml");
 
         ConfigurationTree<DataChannelDescriptor> tree = loader.load(new URLResource(url));
 
@@ -148,9 +145,7 @@ public class XMLDataChannelDescriptorLoa
         injector.injectMembers(loader);
 
         String testConfigName = "testConfig3";
-        String baseUrl = getClass().getPackage().getName().replace('.', '/');
-        URL url = getClass().getClassLoader().getResource(
-                baseUrl + "/cayenne-" + testConfigName + ".xml");
+        URL url = getClass().getResource("cayenne-" + testConfigName + ".xml");
 
         ConfigurationTree<DataChannelDescriptor> tree = loader.load(new URLResource(url));