--- C:\download\ivy\ivy-1.4.1-src\ivy-1.4.1\src\java\fr\jayasoft\ivy\xml\XmlIvyConfigurationParser.java	2006-11-09 16:52:40.000000000 +-1000
+++ C:\development\uncontrolled\ivy-1.4.1\src\java\fr\jayasoft\ivy\xml\XmlIvyConfigurationParser.java	2007-07-12 15:44:00.000000000 +-1000
@@ -1,16 +1,19 @@
 /*
  * This file is subject to the license found in LICENCE.TXT in the root directory of the project.
- * 
+ *
  * #SNAPSHOT#
  */
 package fr.jayasoft.ivy.xml;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -46,29 +49,33 @@
     private String _defaultResolver;
     private String _defaultCM;
     private String _defaultLatest;
     private String _defaultCircular;
     private String _currentConfiguratorTag;
 
+    private URL ivyconfUrl;
+
     public XmlIvyConfigurationParser(Ivy ivy) {
         _ivy = ivy;
 	}
 
     public void parse(URL configuration) throws ParseException, IOException {
         _configurator = new Configurator();
         // put every type definition from ivy to configurator
         Map typeDefs = _ivy.getTypeDefs();
         for (Iterator iter = typeDefs.keySet().iterator(); iter.hasNext();) {
             String name = (String) iter.next();
             _configurator.typeDef(name, (Class)typeDefs.get(name));
         }
-        
+
         doParse(configuration);
     }
 
     private void doParse(URL configuration) throws IOException, ParseException {
+        Message.verbose("Setting ivyconfUrl [configuration="+configuration+"]");
+        ivyconfUrl = configuration;
         InputStream stream = null;
         try {
             stream = URLHandlerRegistry.getDefault().openStream(configuration);
             SAXParserFactory.newInstance().newSAXParser().parse(
                 stream,
                 this);
@@ -87,22 +94,22 @@
             }
         }
     }
 
     private void parse(Configurator configurator, URL configuration) throws IOException, ParseException {
         _configurator = configurator;
-        doParse(configuration);        
+        doParse(configuration);
     }
 
     public void startElement(String uri, String localName, String qName, Attributes att) throws SAXException {
         // we first copy attributes in a Map to be able to modify them
         Map attributes = new HashMap();
         for (int i=0; i<att.getLength(); i++) {
             attributes.put(att.getQName(i), att.getValue(i));
         }
-        
+
         try {
             if (_configurator.getCurrent() != null) {
                 if ("macrodef".equals(_currentConfiguratorTag) && _configurator.getTypeDef(qName) != null) {
                     String name = (String)attributes.get("name");
                     if (name == null) {
                         attributes.put("name", "@{name}");
@@ -175,28 +182,147 @@
                     throw new IllegalArgumentException("missing attribute value on property tag");
                 }
                 _ivy.setVariable(name, value, override == null ? true : Boolean.valueOf(override).booleanValue());
             } else if ("properties".equals(qName)) {
                 String propFilePath = _ivy.substitute((String)attributes.get("file"));
                 String override = _ivy.substitute((String)attributes.get("override"));
-                try {
-                    Message.verbose("loading properties: "+propFilePath);
-                    _ivy.loadProperties(new File(propFilePath), override == null ? true : Boolean.valueOf(override).booleanValue());
-                } catch (Exception fileEx) {
-                    Message.verbose("failed to load properties as file: trying as url: "+propFilePath);
-                    try {
-                    	_ivy.loadProperties(new URL(propFilePath), override == null ? true : Boolean.valueOf(override).booleanValue());
-                    } catch (Exception urlEx) {
-                    	throw new IllegalArgumentException("unable to load properties from "+propFilePath+". Tried both as an url and a file, with no success. File exception: "+fileEx+". URL exception: "+urlEx);
-                    }
-                }
+
+                // resolve our properties file
+
+               URL propertiesUrl = null;
+               String propertiesPath = propFilePath;
+   
+               Message.info("Resolving " + propertiesPath + "]");
+               Message.debug("[propertiesPath=" + propertiesPath + "]");
+   
+               for(int i = 0; i < 1; i++) { // we are treating the end of this block as a goto label
+   
+                  // if our properties file is a remote resource
+                  //    resolve it to the remote resource
+                  //   
+                  // if our properties file is a local resource
+                  //    resolve it to the local resource
+                  //    resolve it relative to the ivyconf file directory
+   
+                  // is our properties file path a valid URI
+   
+                  URI propertiesUri;
+   
+                  try {
+                     propertiesUri = new URI(propertiesPath.replace("\\", "/")).normalize();
+                  }
+                  catch(URISyntaxException e) {
+                     String message = "The properties file is not a valid URI [propertiesPath=" + propertiesPath + "]";
+                     Message.error(message);
+                     throw new IllegalArgumentException("Unable to load properties. " + message, e);
+                  }
+   
+                  Message.debug("Converted to URI [propertiesUri=" + propertiesUri + "]");
+   
+                  // is our properties file a remote resource
+   
+                  if(propertiesUri.getHost() != null) {
+                     propertiesUrl = propertiesUri.toURL();
+                     Message.debug("properties file is a remote resource [propertiesUrl=" + propertiesUrl + "]");
+                     break;
+                  }
+   
+                  // if we get to here, we have a local properties file
+   
+                  // remove the protocol and convert to our platform
+   
+                  propertiesPath = new File(propertiesUri.getPath()).getPath();
+   
+                  // does our properties file resolve to a file
+   
+                  File propertiesFile;
+   
+                  propertiesFile = new File(propertiesPath);
+   
+                  if(propertiesFile.exists()) {
+   
+                     propertiesUrl = propertiesFile.toURL();
+   
+                     // message for debug
+                     
+                     StringBuffer message = new StringBuffer();
+   
+                     message.append("resolved properties file");
+   
+                     File propertiesDir = propertiesFile.getAbsoluteFile().getParentFile();
+                     File currentDir = new File(".").getAbsoluteFile().getParentFile();
+   
+                     boolean isCurrentDir;
+   
+                     if(propertiesDir == null && currentDir == null)
+                        isCurrentDir = true;
+                     else if(propertiesDir != null && propertiesDir.equals(currentDir))
+                        isCurrentDir = true;
+                     else
+                        isCurrentDir = false;
+   
+                     if(isCurrentDir)
+                        message.append(" relative to current directory");
+   
+                     message.append(" [propertiesUrl=" + propertiesUrl + "]");
+   
+                     Message.debug(message.toString());
+                     break;
+                  }
+   
+                  // we didnt resolve our properties file to the local resource.
+   
+                  // is our ivyconf file a remote resource
+   
+                  if(ivyconfUrl.getHost() != null && ivyconfUrl.getHost().length() > 0) {
+                     propertiesUrl = new File(propFilePath).toURL();
+                     Message.debug("properties file is not on a path relative to remote ivyconf [propertiesUrl=" + propertiesUrl
+                              + ", ivyconfUrl=" + ivyconfUrl + "]");
+                     break;
+                  }
+   
+                  // try to resolve our properties file relative to a local ivyconf file
+   
+                  // remove the protocol and convert to our platform
+   
+                  URI ivyconfUri = ivyconfUrl.toURI().normalize();
+                  File ivyconfFile = new File(ivyconfUri.getPath());
+   
+                  // does our properties file resolve to a file relative to our ivyconf file
+   
+                  propertiesFile = new File(ivyconfFile.getParentFile(), propertiesPath);
+   
+                  if(propertiesFile.exists()) {
+                     propertiesUrl = propertiesFile.toURL();
+                     Message.debug("resolved properties file relative to ivyconf file [propertiesUrl=" + propertiesUrl + "]");
+                     break;
+                  }
+   
+                  // use our original properties file path
+   
+                  propertiesUrl = new File(propFilePath).toURL();
+                  Message.debug("leaving properties file as is [propertiesUrl=" + propertiesUrl + "]");
+   
+                  break;
+   
+               } // for
+   
+               Message.info("Loading properties from " + propertiesUrl + " (resolved from " + propFilePath + ")");
+   
+               try {
+                  _ivy.loadProperties(propertiesUrl, override == null ? true : Boolean.valueOf(override).booleanValue());
+               }
+               catch(Exception e) {
+                  Message.error("Failed to load properties from " + propertiesUrl);
+                  throw new IllegalArgumentException("Unable to load properties from " + propertiesUrl, e);
+               }
             } else if ("include".equals(qName)) {
                 Map variables = new HashMap(_ivy.getVariables());
                 try {
                     String propFilePath = _ivy.substitute((String)attributes.get("file"));
-                    URL ivyconfURL = null; 
+                    URL ivyconfURL = null;
                     if (propFilePath == null) {
                         propFilePath = _ivy.substitute((String)attributes.get("url"));
                         if (propFilePath == null) {
                             Message.error("bad include tag: specify file or url to include");
                             return;
                         } else {
@@ -302,13 +428,13 @@
                 _currentConfiguratorTag = null;
             } else {
                 _configurator.endCreateChild();
             }
         }
     }
-    
+
     public void endDocument() throws SAXException {
         if (_defaultResolver != null) {
             _ivy.setDefaultResolver(_ivy.substitute(_defaultResolver));
         }
         if (_defaultCM != null) {
             ConflictManager conflictManager = _ivy.getConflictManager(_ivy.substitute(_defaultCM));