[java-idp-testbed COMMIT] in /trunk: pom.xml src/main/webapp/WEB-INF/idp/jsp/error.jsp src/main/webapp/WEB-INF/idp/js...

Tue May 13 06:29:24 EDT 2014

Author: rdw
Date: Tue May 13 06:29:24 2014
New Revision: 223

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=223&view=rev
Log:
IDP-245 port V2 Taglibs to V3.  Checkpoint work so far.

Added:
    trunk/src/main/webapp/WEB-INF/idpui.tld
Modified:
    trunk/pom.xml
    trunk/src/main/webapp/WEB-INF/idp/jsp/error.jsp
    trunk/src/main/webapp/WEB-INF/idp/jsp/login.jsp

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=223&r1=222&r2=223&view=diff
==============================================================================

--- trunk/pom.xml (original)
+++ trunk/pom.xml Tue May 13 06:29:24 2014
@@ -187,11 +187,18 @@
 
         <!-- Runtime scope -->
         <dependency>
+            <groupId>${idp.groupId}</groupId>
+            <artifactId>idp-ui</artifactId>
+            <version>${idp.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-jsp</artifactId>
             <version>${jetty.version}</version>
             <scope>runtime</scope>
-        </dependency>
+        </dependency>        
 
         <dependency>
             <groupId>net.shibboleth.utilities.jetty9</groupId>

Modified: trunk/src/main/webapp/WEB-INF/idp/jsp/error.jsp
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/webapp/WEB-INF/idp/jsp/error.jsp?rev=223&r1=222&r2=223&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/idp/jsp/error.jsp (original)
+++ trunk/src/main/webapp/WEB-INF/idp/jsp/error.jsp Tue May 13 06:29:24 2014
@@ -2,9 +2,6 @@
 
 <%@ page import="net.shibboleth.utilities.java.support.codec.HTMLEncoder" %>
 
-<%
-HTMLEncoder encoder = (HTMLEncoder) request.getAttribute("encoder");
-%>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <body>
@@ -12,7 +9,7 @@
     	<h2>ERROR</h2>
         
 <% if ( request.getAttribute("flowRequestContext").getCurrentEvent() != null) { %>
-		<p>ERROR: <%= encoder.encodeForHTML(request.getAttribute("flowRequestContext").getCurrentEvent().getId()) %></p>
+		<p>ERROR: <%= HTMLEncoder.encodeForHTML(request.getAttribute("flowRequestContext").getCurrentEvent().getId()) %></p>
 <% } %>
         
     </body>

Modified: trunk/src/main/webapp/WEB-INF/idp/jsp/login.jsp
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/webapp/WEB-INF/idp/jsp/login.jsp?rev=223&r1=222&r2=223&view=diff
==============================================================================
--- trunk/src/main/webapp/WEB-INF/idp/jsp/login.jsp (original)
+++ trunk/src/main/webapp/WEB-INF/idp/jsp/login.jsp Tue May 13 06:29:24 2014
@@ -1,4 +1,7 @@
 <%@page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+
+<%@ taglib uri="urn:mace:shibboleth:2.0:idp:ui" prefix="idpui" %>
+
 
 <%@ page import="net.shibboleth.idp.authn.context.*" %>
 <%@ page import="org.opensaml.profile.context.ProfileRequestContext" %>
@@ -11,6 +14,14 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
     <body>
+    
+    <p>
+        <idpui:serviceLogo>default</idpui:serviceLogo>
+    </p>
+    <p>
+        <idpui:serviceDescription>SP description</idpui:serviceDescription>
+    </p>
+    
     
     	<h2>Testbed JSP Login</h2>
         

