You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2013/03/01 11:23:31 UTC
[3/3] git commit: Core: Cleanup in deltacloud error HAML views
Updated Branches:
refs/heads/master b922b16a1 -> 75e3db4c3
Core: Cleanup in deltacloud error HAML views
* Removed all HAML views for handling errors
* Added one HAML view to handle them all
Signed-off-by: Michal fojtik <mf...@redhat.com>
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/5192efc6
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/5192efc6
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/5192efc6
Branch: refs/heads/master
Commit: 5192efc6cf79f8e2c8270c8ad31bee41e07a1e58
Parents: b922b16
Author: Michal Fojtik <mf...@redhat.com>
Authored: Mon Jan 14 13:08:34 2013 +0100
Committer: Michal fojtik <mf...@redhat.com>
Committed: Fri Mar 1 11:23:04 2013 +0100
----------------------------------------------------------------------
server/views/errors/400.html.haml | 41 -------------------------
server/views/errors/400.xml.haml | 3 --
server/views/errors/401.html.haml | 26 ----------------
server/views/errors/401.xml.haml | 3 --
server/views/errors/403.html.haml | 42 -------------------------
server/views/errors/403.xml.haml | 9 -----
server/views/errors/404.html.haml | 28 -----------------
server/views/errors/404.xml.haml | 3 --
server/views/errors/405.html.haml | 29 ------------------
server/views/errors/405.xml.haml | 5 ---
server/views/errors/409.html.haml | 47 -----------------------------
server/views/errors/409.xml.haml | 11 -------
server/views/errors/500.html.haml | 47 -----------------------------
server/views/errors/500.xml.haml | 13 --------
server/views/errors/501.html.haml | 44 ---------------------------
server/views/errors/501.xml.haml | 1 -
server/views/errors/502.html.haml | 44 ---------------------------
server/views/errors/502.xml.haml | 1 -
server/views/errors/504.html.haml | 43 --------------------------
server/views/errors/504.xml.haml | 1 -
server/views/errors/common.html.haml | 47 +++++++++++++++++++++++++++++
server/views/errors/common.xml.haml | 16 ++++++++++
22 files changed, 63 insertions(+), 441 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/400.html.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/400.html.haml b/server/views/errors/400.html.haml
deleted file mode 100644
index aeae736..0000000
--- a/server/views/errors/400.html.haml
+++ /dev/null
@@ -1,41 +0,0 @@
-%div{ :'data-role' => :content, :'data-theme' => 'b'}
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li{ :'data-role' => 'list-divider'} Server message
- %li
- %h3=[@error.class.name, @error.message].join(' - ')
- %li{ :'data-role' => 'list-divider'} Original request URI
- %li
- %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
- %span=request.env['REQUEST_URI']
- %span{ :class => 'ui-li-count'} Retry
- %li{ :'data-role' => 'list-divider'} Error details
- %li
- - if @error.class.method_defined? :details
- %p= @error.details
- - else
- %em No details
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Backtrace
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li
- %pre=(@error.backtrace.nil?) ? "n/a" : @error.backtrace.join("\n")
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Parameters
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - if params.keys.empty?
- %li{ :'data-role' => 'list-divider'} No parameters
- - params.each do |key, value|
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
-
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Request details
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - request.env.each do |key, value|
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/400.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/400.xml.haml b/server/views/errors/400.xml.haml
deleted file mode 100644
index dd512a2..0000000
--- a/server/views/errors/400.xml.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
- %message< #{cdata @error.message}
- %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/401.html.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/401.html.haml b/server/views/errors/401.html.haml
deleted file mode 100644
index cbdff37..0000000
--- a/server/views/errors/401.html.haml
+++ /dev/null
@@ -1,26 +0,0 @@
-%div{ :'data-role' => :content, :'data-theme' => 'b'}
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li{ :'data-role' => 'list-divider'} Server message
- %li
- %h3 Authentication Failure
- %li{ :'data-role' => 'list-divider'} Original request URI
- %li
- %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
- %span=request.env['REQUEST_URI']
- %span{ :class => 'ui-li-count'} Retry
- %li{ :'data-role' => 'list-divider'} Error details
- %li
- - if @error.class.method_defined? :details
- %p= @error.details
- - else
- %em No details
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Parameters
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - if params.keys.empty?
- %li{ :'data-role' => 'list-divider'} No parameters
- - params.each do |key, value|
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/401.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/401.xml.haml b/server/views/errors/401.xml.haml
deleted file mode 100644
index dd8894a..0000000
--- a/server/views/errors/401.xml.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
- %message Authentication required
-
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/403.html.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/403.html.haml b/server/views/errors/403.html.haml
deleted file mode 100644
index 781b6ae..0000000
--- a/server/views/errors/403.html.haml
+++ /dev/null
@@ -1,42 +0,0 @@
-%div{ :'data-role' => :content, :'data-theme' => 'b'}
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li{ :'data-role' => 'list-divider'} Server message
- %li
- %h3=[@error.class.name, @error.message].join(' - ')
- %li{ :'data-role' => 'list-divider'} Original request URI
- %li
- %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
- %span=request.env['REQUEST_URI']
- %span{ :class => 'ui-li-count'} Retry
- %li{ :'data-role' => 'list-divider'} Error details
- %li
- - if @error.class.method_defined? :details
- %p= @error.details
- - else
- %em No details
-
- - if @error.backtrace
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Backtrace
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li
- %pre=@error.backtrace.join("\n")
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Parameters
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - if params.keys.empty?
- %li{ :'data-role' => 'list-divider'} No parameters
- - params.each do |key, value|
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
-
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Request details
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - request.env.each do |key, value|
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/403.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/403.xml.haml b/server/views/errors/403.xml.haml
deleted file mode 100644
index 274ce82..0000000
--- a/server/views/errors/403.xml.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
- %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }
- - if @error.respond_to?(:backtrace) and !@error.backtrace.nil?
- %backtrace=cdata(@error.backtrace.join("\n"))
- - if params
- %request
- - params.each do |k, v|
- %param{ :name => k}=v
- %message Method not allowed for this resource
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/404.html.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/404.html.haml b/server/views/errors/404.html.haml
deleted file mode 100644
index a05c1eb..0000000
--- a/server/views/errors/404.html.haml
+++ /dev/null
@@ -1,28 +0,0 @@
-%div{ :'data-role' => :content, :'data-theme' => 'b'}
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li{ :'data-role' => 'list-divider'} Server message
- %li
- %h3 Not Found
- %li{ :'data-role' => 'list-divider'} Original request URI
- %li
- %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
- %span=request.env['REQUEST_URI']
- %span{ :class => 'ui-li-count'} Retry
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Parameters
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - if params.keys.empty?
- %li{ :'data-role' => 'list-divider'} No parameters
- - params.each do |key, value|
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Request Headers
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - request_headers.each do |key, value|
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/404.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/404.xml.haml b/server/views/errors/404.xml.haml
deleted file mode 100644
index 5de624c..0000000
--- a/server/views/errors/404.xml.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
- %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }
- %message Resource not found
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/405.html.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/405.html.haml b/server/views/errors/405.html.haml
deleted file mode 100644
index 12e51b0..0000000
--- a/server/views/errors/405.html.haml
+++ /dev/null
@@ -1,29 +0,0 @@
-%div{ :'data-role' => :content, :'data-theme' => 'b'}
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li{ :'data-role' => 'list-divider'} Server message
- %li
- %h3 Method not allowed on given resource
- %li{ :'data-role' => 'list-divider'} Original request URI
- %li
- %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
- %span=request.env['REQUEST_URI']
- %span{ :class => 'ui-li-count'} Retry
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Parameters
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - if params.keys.empty?
- %li{ :'data-role' => 'list-divider'} No parameters
- - params.each do |key, value|
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
-
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Request details
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - request.env.each do |key, value|
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/405.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/405.xml.haml b/server/views/errors/405.xml.haml
deleted file mode 100644
index e0198f5..0000000
--- a/server/views/errors/405.xml.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
- %message
- Requested method not allowed
- %method
- =request.env['REQUEST_METHOD']
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/409.html.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/409.html.haml b/server/views/errors/409.html.haml
deleted file mode 100644
index fb9daca..0000000
--- a/server/views/errors/409.html.haml
+++ /dev/null
@@ -1,47 +0,0 @@
-%div{ :'data-role' => :content, :'data-theme' => 'b'}
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li{ :'data-role' => 'list-divider'} Server message
- %li
- %h3= h [@error.class.name, @error.message].join(' - ')
- %li{ :'data-role' => 'list-divider'} Original request URI
- %li
- %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
- %span=request.env['REQUEST_URI']
- %span{ :class => 'ui-li-count'} Retry
- %li{ :'data-role' => 'list-divider'} Error details
- %li
- - if @error.class.method_defined? :details
- %p= h @error.details
- - else
- %em No details
- %li{ :'data-role' => 'list-divider'} Backtrace
- %li
- %em No details
-
- - if @error.backtrace
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Backtrace
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li
- %pre= h @error.backtrace.join("\n")
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Parameters
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - if params.keys.empty?
- %li{ :'data-role' => 'list-divider'} No parameters
- - params.each do |key, value|
- - next if value.inspect.to_s == '#'
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
-
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Request details
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - request.env.each do |key, value|
- - next if value.inspect.to_s == '#'
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}= h value.inspect
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/409.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/409.xml.haml b/server/views/errors/409.xml.haml
deleted file mode 100644
index de05bf8..0000000
--- a/server/views/errors/409.xml.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-- unless defined?(partial)
- !!! XML
-%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
- %kind backend_error
- %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }
- %code=response.status
- %message< #{cdata @error.message}
- - if params
- %request
- - params.each do |k, v|
- %param{ :name => k}=v
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/500.html.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/500.html.haml b/server/views/errors/500.html.haml
deleted file mode 100644
index 8cd3c74..0000000
--- a/server/views/errors/500.html.haml
+++ /dev/null
@@ -1,47 +0,0 @@
-%div{ :'data-role' => :content, :'data-theme' => 'b'}
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li{ :'data-role' => 'list-divider'} Server message
- %li
- %h3= h [@error.class.name, @error.message].join(' - ')
- %li{ :'data-role' => 'list-divider'} Original request URI
- %li
- %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
- %span=request.env['REQUEST_URI']
- %span{ :class => 'ui-li-count'} Retry
- %li{ :'data-role' => 'list-divider'} Error details
- %li
- - if @error.class.method_defined? :details
- %p= h @error.details
- - else
- %em No details
- %li{ :'data-role' => 'list-divider'} Backtrace
- %li
- %pre= bt @error.backtrace
-
- - if @error.backtrace
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Backtrace
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li
- %pre= h @error.backtrace.join("\n")
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Parameters
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - if params.keys.empty?
- %li{ :'data-role' => 'list-divider'} No parameters
- - params.each do |key, value|
- - next if value.inspect.to_s == '#'
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
-
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Request details
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - request.env.each do |key, value|
- - next if value.inspect.to_s == '#'
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}= h value.inspect
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/500.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/500.xml.haml b/server/views/errors/500.xml.haml
deleted file mode 100644
index b3e71e2..0000000
--- a/server/views/errors/500.xml.haml
+++ /dev/null
@@ -1,13 +0,0 @@
-- unless defined?(partial)
- !!! XML
-%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
- %kind backend_error
- %backend{ :driver => driver_symbol, :provider => "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}" }
- %code=response.status
- %message< #{cdata @error.message}
- - if @error.respond_to?(:backtrace) and !@error.backtrace.nil?
- %backtrace=cdata(@error.backtrace.join("\n"))
- - if params
- %request
- - params.each do |k, v|
- %param{ :name => k}=v
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/501.html.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/501.html.haml b/server/views/errors/501.html.haml
deleted file mode 100644
index 428e452..0000000
--- a/server/views/errors/501.html.haml
+++ /dev/null
@@ -1,44 +0,0 @@
-%div{ :'data-role' => :content, :'data-theme' => 'b'}
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li{ :'data-role' => 'list-divider'} Server message
- %li
- %h3=[@error.class.name, @error.message].join(' - ')
- %li{ :'data-role' => 'list-divider'} Original request URI
- %li
- %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
- %span=request.env['REQUEST_URI']
- %span{ :class => 'ui-li-count'} Retry
- %li{ :'data-role' => 'list-divider'} Error details
- %li
- - if @error.class.method_defined? :details
- %p= @error.details
- - else
- %em No details
-
- - if @error.class.method_defined? :backtrace
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Backtrace
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li
- %pre=@error.backtrace.join("\n") unless @error.backtrace.nil?
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Parameters
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - if params.keys.empty?
- %li{ :'data-role' => 'list-divider'} No parameters
- - params.each do |key, value|
- - next if value.inspect.to_s == '#'
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
-
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Request details
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - request.env.each do |key, value|
- - next if value.inspect.to_s == '#'
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/501.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/501.xml.haml b/server/views/errors/501.xml.haml
deleted file mode 100644
index a4015a4..0000000
--- a/server/views/errors/501.xml.haml
+++ /dev/null
@@ -1 +0,0 @@
-= haml :'errors/500', :locals => { :@error => @error, :partial => true }
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/502.html.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/502.html.haml b/server/views/errors/502.html.haml
deleted file mode 100644
index a41402b..0000000
--- a/server/views/errors/502.html.haml
+++ /dev/null
@@ -1,44 +0,0 @@
-%div{ :'data-role' => :content, :'data-theme' => 'b'}
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li{ :'data-role' => 'list-divider'} Server message
- %li
- %h3=[@error.class.name, @error.message].join(' - ')
- %li{ :'data-role' => 'list-divider'} Original request URI
- %li
- %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
- %span=request.env['REQUEST_URI']
- %span{ :class => 'ui-li-count'} Retry
- %li{ :'data-role' => 'list-divider'} Error details
- %li
- - if @error.class.method_defined? :details
- %p= @error.details
- - else
- %em No details
-
- - if @error.backtrace
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Backtrace
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li
- %pre=@error.backtrace.join("\n")
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Parameters
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - if params.keys.empty?
- %li{ :'data-role' => 'list-divider'} No parameters
- - params.each do |key, value|
- - next if value.inspect.to_s == '#'
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
-
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Request details
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - request.env.each do |key, value|
- - next if value.inspect.to_s == '#'
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/502.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/502.xml.haml b/server/views/errors/502.xml.haml
deleted file mode 100644
index a4015a4..0000000
--- a/server/views/errors/502.xml.haml
+++ /dev/null
@@ -1 +0,0 @@
-= haml :'errors/500', :locals => { :@error => @error, :partial => true }
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/504.html.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/504.html.haml b/server/views/errors/504.html.haml
deleted file mode 100644
index 19cf090..0000000
--- a/server/views/errors/504.html.haml
+++ /dev/null
@@ -1,43 +0,0 @@
-%div{ :'data-role' => :content, :'data-theme' => 'b'}
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li{ :'data-role' => 'list-divider'} Server message
- %li
- %h3=[@error.class.name, @error.message].join(' - ')
- %li{ :'data-role' => 'list-divider'} Original request URI
- %li
- %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
- %span=request.env['REQUEST_URI']
- %span{ :class => 'ui-li-count'} Retry
- %li{ :'data-role' => 'list-divider'} Error details
- %li
- - if @error.class.method_defined? :details
- %p= @error.details
- - else
- %em No details
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Backtrace
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- %li
- %pre=@error.backtrace.join("\n")
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Parameters
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - if params.keys.empty?
- %li{ :'data-role' => 'list-divider'} No parameters
- - params.each do |key, value|
- - next if value.inspect.to_s == '#'
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
-
-
- %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
- %h3 Request details
- %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
- - request.env.each do |key, value|
- - next if value.inspect.to_s == '#'
- %li{ :'data-role' => 'list-divider'}=key
- %li
- %span{:style => 'font-weight:normal;'}=value.inspect
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/504.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/504.xml.haml b/server/views/errors/504.xml.haml
deleted file mode 100644
index a4015a4..0000000
--- a/server/views/errors/504.xml.haml
+++ /dev/null
@@ -1 +0,0 @@
-= haml :'errors/500', :locals => { :@error => @error, :partial => true }
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/common.html.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/common.html.haml b/server/views/errors/common.html.haml
new file mode 100644
index 0000000..8cd3c74
--- /dev/null
+++ b/server/views/errors/common.html.haml
@@ -0,0 +1,47 @@
+%div{ :'data-role' => :content, :'data-theme' => 'b'}
+ %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+ %li{ :'data-role' => 'list-divider'} Server message
+ %li
+ %h3= h [@error.class.name, @error.message].join(' - ')
+ %li{ :'data-role' => 'list-divider'} Original request URI
+ %li
+ %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
+ %span=request.env['REQUEST_URI']
+ %span{ :class => 'ui-li-count'} Retry
+ %li{ :'data-role' => 'list-divider'} Error details
+ %li
+ - if @error.class.method_defined? :details
+ %p= h @error.details
+ - else
+ %em No details
+ %li{ :'data-role' => 'list-divider'} Backtrace
+ %li
+ %pre= bt @error.backtrace
+
+ - if @error.backtrace
+ %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+ %h3 Backtrace
+ %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+ %li
+ %pre= h @error.backtrace.join("\n")
+
+ %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+ %h3 Parameters
+ %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+ - if params.keys.empty?
+ %li{ :'data-role' => 'list-divider'} No parameters
+ - params.each do |key, value|
+ - next if value.inspect.to_s == '#'
+ %li{ :'data-role' => 'list-divider'}=key
+ %li
+ %span{:style => 'font-weight:normal;'}=value.inspect
+
+
+ %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+ %h3 Request details
+ %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+ - request.env.each do |key, value|
+ - next if value.inspect.to_s == '#'
+ %li{ :'data-role' => 'list-divider'}=key
+ %li
+ %span{:style => 'font-weight:normal;'}= h value.inspect
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/5192efc6/server/views/errors/common.xml.haml
----------------------------------------------------------------------
diff --git a/server/views/errors/common.xml.haml b/server/views/errors/common.xml.haml
new file mode 100644
index 0000000..5509a87
--- /dev/null
+++ b/server/views/errors/common.xml.haml
@@ -0,0 +1,16 @@
+- unless defined?(partial)
+ !!! XML
+%error{ :url => request.env['REQUEST_URI'], :status => response.status }
+ %backend{ :driver => driver_symbol, :provider => current_provider }
+ %code=response.status
+ %message<
+ - if @error.respond_to? :message
+ =cdata @error.message
+ - else
+ =translate_error_code(response.status)
+ - if @error.respond_to? :backtrace
+ %backtrace=@error.backtrace.nil? ? '' : @error.backtrace.join("\n")
+ %request
+ - if params
+ -params.each do |name, value|
+ %param{ :name => name }=cdata value.inspect