Webapp - Added env_debug-info.jsp

Asqatasun · Jan 28, 2018 · 88f98ee · 88f98ee
1 parent d388fde
commit 88f98ee
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/webapp/src/main/webapp/WEB-INF/pages/form.jsp b/webapp/src/main/webapp/WEB-INF/pages/form.jsp
@@ -21,15 +21,9 @@
 
                 <%-- DEBUG   contrast-finder.conf  --%>
                 <c:if test="${env == 'debug'}">
-                    <div style="background-color:pink; padding: 0.4em;">
-                        env              <strong> ${env}                        </strong> <br>
-                        defaultAlgorithm <strong> ${defaultAlgorithm}           </strong> <br>
-                        cookie.algo      <strong> ${cookie.algo.value}          </strong> <br>
-                        algo             <strong> ${algo}                       </strong> <br>
-                    </div>
+                    <%@include file='/WEB-INF/template/env_debug-info.jspf' %>
                 </c:if>
 
-
                 <%-- ===== FORM ========================================================================================= --%>
                 <div id="set-up-form" class="row">
                     <div class="col-lg-12">

diff --git a/webapp/src/main/webapp/WEB-INF/template/env_debug-info.jspf b/webapp/src/main/webapp/WEB-INF/template/env_debug-info.jspf
@@ -0,0 +1,21 @@
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page pageEncoding="UTF-8" %>
+
+<c:set var="debugJavaVersion"><%= System.getProperty("java.version") %></c:set>
+<c:set var="debugTomcatVersion"><%= application.getServerInfo() %></c:set>
+<c:set var="debugServletVersion"><%= application.getMajorVersion() %>.<%= application.getMinorVersion() %></c:set>
+<c:set var="debugJspVersion"><%=JspFactory.getDefaultFactory().getEngineInfo().getSpecificationVersion() %></c:set>
+<div style="background-color:pink; padding: 0.4em;display: flex;justify-content: space-between">
+    <p>
+        env              <strong> ${env}                        </strong> <br>
+        defaultAlgorithm <strong> ${defaultAlgorithm}           </strong> <br>
+        cookie.algo      <strong> ${cookie.algo.value}          </strong> <br>
+        algo             <strong> ${algo}                       </strong>
+    </p>
+    <p>
+        Java                    <strong> ${debugJavaVersion}    </strong> <br>
+        Tomcat :                <strong> ${debugTomcatVersion}  </strong> <br>
+        Servlet specification : <strong> ${debugServletVersion} </strong> <br>
+        JSP :                   <strong> ${debugJspVersion}     </strong> <br>
+    </p>
+</div>