Merge branch 'patch-1' of github.com:D1plo1d/java into D1plo1d-patch-1

Conflicts:
	providers/ark.rb

Author: erichelgeson

providers/ark.rb

@@ -78,7 +78,7 @@ def download_direct_from_oracle(tarball_name, new_resource)
     converge_by(description) do
        Chef::Log.debug "downloading oracle tarball straight from the source"
        cmd = shell_out!(
-                                  %Q[ curl --create-dirs -L --retry #{new_resource.retries} --retry-delay #{new_resource.retry_delay} --cookie "#{cookie}" #{new_resource.url} -o #{download_path} ]
+                                  %Q[ curl --create-dirs -L --retry #{new_resource.retries} --retry-delay #{new_resource.retry_delay} --cookie "#{cookie}" #{new_resource.url} -o #{download_path} --connect-timeout #{new_resource.connect_timeout} ]
                                )
     end
   else

resources/ark.rb

@@ -45,6 +45,7 @@
 attribute :alternatives_priority, :kind_of => Integer, :default => 1
 attribute :retries, :kind_of => Integer, :default => 0
 attribute :retry_delay, :kind_of => Integer, :default => 2
+attribute :connect_timeout, :kind_of => Integer, :default => 600 # => 10 minutes
 
 # we have to set default for the supports attribute
 # in initializer since it is a 'reserved' attribute name