From 00822e0ead3d3a0d81aeaad6506f1964cf11d8c8 Mon Sep 17 00:00:00 2001
From: Amanda Anganes <aanganes@mitre.org>
Date: Tue, 21 Feb 2012 15:45:16 -0500
Subject: [PATCH] Added root RequestMapping annotation to
 ManagerController.java - Spring requires there to be a mapping on the root of
 controllers. AuthZ server is up, needs further testing to see if it is
 behaving as expected.

---
 .../openid/connect/web/ManagerController.java   |  1 +
 server/src/main/webapp/WEB-INF/web.xml          | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/org/mitre/openid/connect/web/ManagerController.java b/server/src/main/java/org/mitre/openid/connect/web/ManagerController.java
index 3bbc4ce1c..7cab8b429 100644
--- a/server/src/main/java/org/mitre/openid/connect/web/ManagerController.java
+++ b/server/src/main/java/org/mitre/openid/connect/web/ManagerController.java
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
  */
 
 @Controller
+@RequestMapping("/manager")
 public class ManagerController {
 
     @RequestMapping({"/", "/home", "/index"})
diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
index f2c37cb74..eb8152894 100644
--- a/server/src/main/webapp/WEB-INF/web.xml
+++ b/server/src/main/webapp/WEB-INF/web.xml
@@ -6,13 +6,28 @@
 	<!-- The definition of the Root Spring Container shared by all Servlets and Filters -->
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/spring/application-context.xml</param-value>
+		<param-value>
+			/WEB-INF/spring/application-context.xml
+		</param-value>
 	</context-param>
 	
 	<!-- Creates the Spring Container shared by all Servlets and Filters -->
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
+	
+	
+
+	<!-- Since we defined a custom authorization-endpoint-url, we need an additional filter: -->
+	<filter>
+	    <filter-name>oauth2EndpointUrlFilter</filter-name>
+	    <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+	</filter>
+	
+	<filter-mapping>
+	    <filter-name>oauth2EndpointUrlFilter</filter-name>
+	    <url-pattern>/*</url-pattern>
+	</filter-mapping>
 
 	<!-- filter through Spring Security -->
 	<filter>