From 69f2075872f0a1b99a96b35ed582c8573a54c917 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Sat, 22 Mar 2008 00:05:53 +0000
Subject: [PATCH] SEC-722: Fix jstl versions in openID sample login page.

---
 samples/openid/pom.xml                         | 8 +++++---
 samples/openid/src/main/webapp/openidlogin.jsp | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/samples/openid/pom.xml b/samples/openid/pom.xml
index 61c0a37d57..cb7235f1ec 100644
--- a/samples/openid/pom.xml
+++ b/samples/openid/pom.xml
@@ -7,7 +7,7 @@
     </parent>
     <groupId>org.springframework.security</groupId>
     <artifactId>spring-security-samples-openid</artifactId>
-    <name>Spring Security - openid sample</name>
+    <name>Spring Security - OpenID Sample</name>
     <packaging>war</packaging>
     <dependencies>
         <dependency>
@@ -42,21 +42,23 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
-            <version>1.2</version>
+            <version>1.1.2</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
-            <version>1.0.6</version>
+            <version>1.1.2</version>
             <scope>runtime</scope>
         </dependency>
+<!--         
         <dependency>
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>
             <version>1.1.1</version>
             <optional>true</optional>
         </dependency>
+  -->
     </dependencies>
 
     <build>
diff --git a/samples/openid/src/main/webapp/openidlogin.jsp b/samples/openid/src/main/webapp/openidlogin.jsp
index 30fb418d77..71c4c5615c 100644
--- a/samples/openid/src/main/webapp/openidlogin.jsp
+++ b/samples/openid/src/main/webapp/openidlogin.jsp
@@ -1,4 +1,4 @@
-<%@ taglib prefix='c' uri='http://java.sun.com/jsp/jstl/core' %>
+<%@ taglib prefix='c' uri='http://java.sun.com/jstl/core_rt' %>
 <%@ page import="org.springframework.security.ui.AbstractProcessingFilter" %>
 <%@ page import="org.springframework.security.ui.webapp.AuthenticationProcessingFilter" %>
 <%@ page import="org.springframework.security.AuthenticationException" %>