lib/buildr/ivy_extension.rb in ivy4r-0.12.9 vs lib/buildr/ivy_extension.rb in ivy4r-0.12.10

@@ -140,12 +140,12 @@
       def configure
         if @base_ivy
           @base_ivy.configure
         else
           unless @configured
-            ivy4r.property['ivy.status'] = status
-            ivy4r.property['ivy.home'] = home
+            ivy4r.property['ivy.status'] = status if status
+            ivy4r.property['ivy.home'] = home if home
             properties.each {|key, value| ivy4r.property[key.to_s] = value }
             @configured = ivy4r.settings :file => settings if settings
           end
         end
       end
@@ -206,18 +206,18 @@
           end
         end
       end
       
       def home
-        @ivy_home_dir ||= Ivy.setting('home.dir') || "#{@extension_dir}/ivy-home"
+        @ivy_home_dir ||= Ivy.setting('home.dir')
       end
       
       def lib_dir
         @lib_dir ||= Ivy.setting('lib.dir')
       end
       
       def settings
-        @settings ||= Ivy.setting('settings.file') || "#{@extension_dir}/ant-scripts/ivysettings.xml"
+        @settings ||= Ivy.setting('settings.file') || "#{@extension_dir}/ivysettings.xml"
       end
       
       # The basic file name to use in project dir as ivy.xml file. Normally this should be __ivy.xml__
       # If the file resides in a sub directory the relative path from project can be set with this method
       def ivy_xml_filename