active_fedora.rake in active-fedora-4.0.0.rc1

- old
+ new

@@ -17,11 +17,11 @@
       rescue ActiveFedora::ObjectNotFoundError
         puts "The object #{pid} has already been deleted (or was never created)."
       rescue Errno::ECONNREFUSED => e
         puts "Can't connect to Fedora! Are you sure jetty is running?"
       end
-      puts "Deleted '#{pid}' from #{ActiveFedora.fedora_config[:url]}"
+      puts "Deleted '#{pid}' from #{ActiveFedora::Base.connection_for_pid(pid).client.url}"
     end
   end
   
   desc "Delete a range of objects in a given namespace.  ie 'rake repo:delete_range namespace=demo start=22 stop=50' will delete demo:22 through demo:50"
   task :delete_range => :init do |t, args|
@@ -38,22 +38,22 @@
       begin
         ActiveFedora::Base.load_instance(pid).delete
       rescue ActiveFedora::ObjectNotFoundError
         # The object has already been deleted (or was never created).  Do nothing.
       end
-      puts "Deleted '#{pid}' from #{ActiveFedora.fedora_config[:url]}"
+      puts "Deleted '#{pid}' from #{ActiveFedora::Base.connection_for_pid(pid).client.url}"
       i += 1
     end
   end
 
   desc "Export the object identified by pid into spec/fixtures. Example:rake repo:export pid=demo:12"
   task :export => :init do
     if ENV["pid"].nil? 
       puts "You must specify a valid pid.  Example: rake repo:export pid=demo:12"
     else
       pid = ENV["pid"]
-      puts "Exporting '#{pid}' from #{ActiveFedora.fedora_config[:url]}"
+      puts "Exporting '#{pid}' from #{ActiveFedora::Base.connection_for_pid(pid).client.url}"
       if !ENV["path"].nil?
         path = ENV["path"]
       else
         path = File.join('spec', 'fixtures')
       end
@@ -76,15 +76,15 @@
     else
       puts "You must specify a path to the object or provide its pid.  Example: rake repo:load path=spec/fixtures/demo_12.foxml.xml"
     end
     
     if !filename.nil?
-      puts "Loading '#{filename}' in #{ActiveFedora.fedora_config[:url]}"
+      puts "Loading '#{filename}' in #{ActiveFedora::Base.connection_for_pid(pid).client.url}"
       file = File.new(filename, "r")
-      result = ActiveFedora::RubydoraConnection.instance.connection.ingest(:file=>file.read)
+      result = ActiveFedora::Base.connection_for_pid(pid).ingest(:file=>file.read)
       if result
         puts "The object has been loaded as #{result.body}"
-	if pid.nil?
+      	if pid.nil?
           pid = result.body
         end
         solrizer = Solrizer::Fedora::Solrizer.new 
         solrizer.solrize(pid) 
       else