Make IdP display its metadata when you hit the entity ID URL - SIDP-268

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2823 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/doc/RELEASE-NOTES.txt b/doc/RELEASE-NOTES.txt
index 9dd33f7..ddd28d5 100644 (file)
--- a/doc/RELEASE-NOTES.txt
+++ b/doc/RELEASE-NOTES.txt
@@ -2,6 +2,7 @@ Changes in Release 2.1.2
 =============================================
 * Significant memory optimizations
 [SIDP-260] - NPE in login-err.jsp
+[SIDP-268] - Expose Metadata on entityID URL
 
 
 Changes in Release 2.1.1

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 93b6861..f397fd6 100644 (file)
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -42,6 +42,17 @@
         <servlet-name>ProfileRequestDispatcher</servlet-name>
         <url-pattern>/profile/*</url-pattern>
     </servlet-mapping>
+    
+    <!-- Send request to the EntityID to the SAML metadata handler. -->
+    <servlet>
+        <servlet-name>shibboleth_jsp</servlet-name>
+        <jsp-file>/shibboleth.jsp</jsp-file>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>shibboleth_jsp</servlet-name>
+        <url-pattern>/shibboleth</url-pattern>
+    </servlet-mapping> 
 
     <!-- Authentication Engine Entry Point -->
     <servlet>

diff --git a/src/main/webapp/shibboleth.jsp b/src/main/webapp/shibboleth.jsp
new file mode 100644 (file)
index 0000000..3807e83
--- /dev/null
+++ b/src/main/webapp/shibboleth.jsp
@@ -0,0 +1 @@
+<jsp:forward page="/profile/Metadata/SAML" />
\ No newline at end of file