Replace urls starting with /session by /sessions

diff --git a/sonar-server/src/main/webapp/WEB-INF/config/routes.rb b/sonar-server/src/main/webapp/WEB-INF/config/routes.rb
index f10a537e29ad1a99778963681369bd03b476fa6f..c50f2280fa55423882b5e3357eb4d0795f8e401e 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/config/routes.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/config/routes.rb
@@ -2,7 +2,6 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'users/select_group', :controller => 'users', :action => 'select_group'
   map.connect 'users/set_groups', :controller => 'users', :action => 'set_groups'
   map.resources :users
-  map.resource :session
 
   # used only for the events widget
   map.resources :events

diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/authenticated_system.rb b/sonar-server/src/main/webapp/WEB-INF/lib/authenticated_system.rb
index e5f7711a472fa563d96c58b48e4ada3b4e8a1b5d..92ea9abae75ed1507b5e664827746387ac350d79 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/lib/authenticated_system.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/lib/authenticated_system.rb
@@ -67,7 +67,7 @@ module AuthenticatedSystem
           if logged_in?
             flash[:loginerror]='You are not authorized to access this page. Please log in with more privileges and try again.'
           end
-          redirect_to new_session_path
+          redirect_to url_for :controller => 'sessions', :action => 'new'
         end
         # format.any doesn't work in rails version < http://dev.rubyonrails.org/changeset/8987
         # Add any other API formats here.  (Some browsers, notably IE6, send Accept: */* and trigger