projects / java-idp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: aadbabd)
https://bugs.internet2.edu/jira/browse/SIDP-353
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 27 Oct 2009 05:58:43 +0000 (05:58 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Tue, 27 Oct 2009 05:58:43 +0000 (05:58 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2899 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

doc/RELEASE-NOTES.txt patch | blob | history
pom.xml patch | blob | history
src/main/webapp/login.jsp patch | blob | history

diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt
index f580920..60a3d59 100644 (file)
--- a/doc/RELEASE-NOTES.txt
+++ b/doc/RELEASE-NOTES.txt
@@ -1,3 +1,7 @@
+Changes in Release 2.1.5
+=============================================
+[SIDP-353] - Default login.jsp crashes on anonymous RPs
+
 Changes in Release 2.1.4
 =============================================
 [SIDP-340] - Default tc-config.xml causes TCNonPortableObjectError
diff --git a/pom.xml b/pom.xml
index 11d9622..31def66 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    
     <groupId>edu.internet2.middleware</groupId>
     <artifactId>shibboleth-identityprovider</artifactId>
-    <version>2.1.4</version>
+    <version>2.1.5</version>
+    
     <!-- We bundle as a jar here, the installer creates the WAR -->
     <packaging>jar</packaging>
 
diff --git a/src/main/webapp/login.jsp b/src/main/webapp/login.jsp
index a71c786..7d8719b 100644 (file)
--- a/src/main/webapp/login.jsp
+++ b/src/main/webapp/login.jsp
@@ -6,10 +6,6 @@
 <%
     LoginContext loginContext = HttpServletHelper.getLoginContext(HttpServletHelper.getStorageService(application),
                                                                   application, request);
-                                                                  
-    EntityDescriptor entityDescriptor = HttpServletHelper.getRelyingPartyMetadata(loginContext.getRelyingPartyId(),
-                                                   HttpServletHelper.getRelyingPartyConfirmationManager(application)); 
-                                                    
     Session userSession = HttpServletHelper.getUserSession(request);
 %>
 
@@ -21,7 +17,7 @@
 
        <body>
                <img src="<%= request.getContextPath() %>/images/logo.jpg" />
-               <h2>Shibboleth Identity Provider Login to Service Provider <%= entityDescriptor.getEntityID() %></h2>
+               <h2>Shibboleth Identity Provider Login to Service Provider <%= loginContext.getRelyingPartyId() %></h2>
                <p>
         Existing Session: <%= userSession != null %><br/>      
                Requested Authentication Methods: <%= loginContext.getRequestedAuthenticationMethods() %><br/>
Shibboleth 2 Java IdP