[java-identity-provider COMMIT] /trunk/idp-war/src/main/webapp/WEB-INF/jsp/metadata.jsp

[noreply at shibboleth.net]

Author: scantor
Date: Fri Dec  5 15:35:59 2014
New Revision: 7045

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7045&view=rev
Log:
IDP-529 -  The idp/shibboleth metadata "view" isn't seeing idp.home set.

Modified:
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/metadata.jsp

Modified: trunk/idp-war/src/main/webapp/WEB-INF/jsp/metadata.jsp
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-war/src/main/webapp/WEB-INF/jsp/metadata.jsp?rev=7045&r1=7044&r2=7045&view=diff
==============================================================================
--- trunk/idp-war/src/main/webapp/WEB-INF/jsp/metadata.jsp (original)
+++ trunk/idp-war/src/main/webapp/WEB-INF/jsp/metadata.jsp Fri Dec  5 15:35:59 2014
@@ -1,5 +1,9 @@
+<%@ page import="org.springframework.web.context.WebApplicationContext" %>
+<%@ page import="org.springframework.web.context.support.WebApplicationContextUtils" %>
 <%
-final String path = System.getProperty("idp.home") + "/metadata/idp-metadata.xml";
+final WebApplicationContext springContext =
+	WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext());
+final String path = springContext.getEnvironment().getProperty("idp.home") + "/metadata/idp-metadata.xml";
 try (final java.io.FileInputStream in = new java.io.FileInputStream(path)) {
 	int i;
 	while ((i = in.read()) != -1) {