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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Feb  5 14:12:18 2015
New Revision: 7316

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7316&view=rev
Log:
IDP-593 - idp-metadata.xml is invalid because of WEB-INF/jsp/metadata.jsp

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=7316&r1=7315&r2=7316&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 Thu Feb  5 14:12:18 2015
@@ -1,17 +1,15 @@
-<%@ page import="org.springframework.web.context.WebApplicationContext" %>
-<%@ page import="org.springframework.web.context.support.WebApplicationContextUtils" %>
 <%
-final WebApplicationContext springContext =
-	WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext());
+final org.springframework.web.context.WebApplicationContext springContext =
+    org.springframework.web.context.support.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) {
-	    out.write(i);
-	}
+    int i;
+    while ((i = in.read()) != -1) {
+        out.write(i);
+    }
 } catch (final java.io.IOException e) {
-	out.println(e.getMessage());
-	return;
+    out.println(e.getMessage());
+    return;
 }
 
 final String acceptHeader = request.getHeader("Accept");