svn commit: r962015 - in /incubator/deltacloud/trunk/framework: config/environment.rb config/routes.rb lib/converters/xml_converter.rb

[lu...@apache.org]

Author: lutter
Date: Thu Jul  8 23:17:06 2010
New Revision: 962015

URL: http://svn.apache.org/viewvc?rev=962015&view=rev
Log:
Remove generic routing.
Make XML pretty-printed.  I like whitespace.

Modified:
    incubator/deltacloud/trunk/framework/config/environment.rb
    incubator/deltacloud/trunk/framework/config/routes.rb
    incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb

Modified: incubator/deltacloud/trunk/framework/config/environment.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/config/environment.rb?rev=962015&r1=962014&r2=962015&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/config/environment.rb (original)
+++ incubator/deltacloud/trunk/framework/config/environment.rb Thu Jul  8 23:17:06 2010
@@ -51,7 +51,7 @@ Rails::Initializer.run do |config|
 end
 
 
-DRIVER=:ec2
+DRIVER=:mock
 
 DRIVER_ROOT = File.dirname( __FILE__ ) + "/../../deltacloud-driver-#{DRIVER}"
 $: << DRIVER_ROOT+'/lib'

Modified: incubator/deltacloud/trunk/framework/config/routes.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/config/routes.rb?rev=962015&r1=962014&r2=962015&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/config/routes.rb (original)
+++ incubator/deltacloud/trunk/framework/config/routes.rb Thu Jul  8 23:17:06 2010
@@ -59,6 +59,6 @@ ActionController::Routing::Routes.draw d
   # Install the default routes as the lowest priority.
   # Note: These default routes make all actions in every controller accessible via GET requests. You should
   # consider removing the them or commenting them out if you're using named routes and resources.
-  map.connect ':controller/:action/:id'
-  map.connect ':controller/:action/:id.:format'
+  #map.connect ':controller/:action/:id'
+  #map.connect ':controller/:action/:id.:format'
 end

Modified: incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb?rev=962015&r1=962014&r2=962015&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb Thu Jul  8 23:17:06 2010
@@ -24,7 +24,7 @@ module Converters
     end 
 
     def convert(obj, builder=nil)
-      builder ||= Builder::XmlMarkup.new
+      builder ||= Builder::XmlMarkup.new( :indent=>2 )
       if ( obj.is_a?( Array ) )
         builder.__send__( @type.to_s.pluralize.to_sym ) do
           obj.each do |e|