svn commit: r506133 - /incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java

[maartenc]

Author: maartenc
Date: Sun Feb 11 12:55:32 2007
New Revision: 506133

URL: http://svn.apache.org/viewvc?view=rev&rev=506133
Log:
Attempt to fix some junit tests who fail in gump.

Modified:
    
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java

Modified: 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
URL: 
http://svn.apache.org/viewvc/incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java?view=diff&rev=506133&r1=506132&r2=506133
==============================================================================
--- 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java 
(original)
+++ 
incubator/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java 
Sun Feb 11 12:55:32 2007
@@ -124,7 +124,7 @@
        private StatusManager _statusManager;
        
        public IvySettings() {
-        setVariable("ivy.default.conf.dir", getSettingsURL().toExternalForm(), 
true);
+        setVariable("ivy.default.conf.dir", getDefaultConfigurationDir(), 
true);
         
         String ivyTypeDefs = System.getProperty("ivy.typedef.files");
         if (ivyTypeDefs != null) {
@@ -297,9 +297,9 @@
         return getSettingsURL("ivyconf.xml");
     }
 
-
-       private static URL getSettingsURL() {
-               return XmlSettingsParser.class.getResource("");
+       private String getDefaultConfigurationDir() {
+               String ivyconfLocation = 
getDefaultConfigurationURL().toExternalForm();
+               return ivyconfLocation.substring(0, ivyconfLocation.length() - 
"ivyconf.xml".length());
        }
 
        private static URL getSettingsURL(String file) {