From c0e22fbfb28fc864579d6cd34b6c274f1b5382bc Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 5 Jun 2008 10:12:28 +0000
Subject: [PATCH 1/1] Centralize JSPs

git-svn-id: https://svn.argeo.org/slc/trunk@1199 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../src/main/webapp/META-INF/MANIFEST.MF      |   2 -
 .../WEB-INF/jsp/addResultToCollectionS.jsp    |  11 --
 .../WEB-INF/jsp/{footer.txt => coda.jspf}     |   2 +-
 .../src/main/webapp/WEB-INF/jsp/common.jsp    |   2 -
 .../src/main/webapp/WEB-INF/jsp/home.jsp      |   8 --
 .../WEB-INF/jsp/{header.txt => prelude.jspf}  |  28 ++--
 .../jsp/removeResultFromCollectionS.jsp       |  11 --
 .../WEB-INF/jsp/resultCollectionList.jsp      |  11 --
 .../WEB-INF/jsp/resultCollectionView.jsp      |  11 --
 .../main/webapp/WEB-INF/jsp/resultList.jsp    |  11 --
 .../main/webapp/WEB-INF/jsp/resultView.jsp    |  11 --
 .../webapp/WEB-INF/jsp/slcExecutionList.jsp   |  10 --
 .../webapp/WEB-INF/jsp/slcExecutionView.jsp   |  10 --
 .../main/webapp/WEB-INF/jsp/testRunView.jsp   |  11 --
 .../src/main/webapp/WEB-INF/web.xml           | 121 +++++++++---------
 .../src/main/webapp/index.jsp                 |  11 +-
 16 files changed, 83 insertions(+), 188 deletions(-)
 delete mode 100644 org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF
 rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/{footer.txt => coda.jspf} (50%)
 rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/{header.txt => prelude.jspf} (53%)

diff --git a/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF b/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 58630c02e..000000000
--- a/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp
index f1453bdf4..bceedf377 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp
@@ -1,15 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
-<%@include file="header.txt"%>
-<jsp:include page="common.jsp" />
-
 <div id="main">
 <h1>Add result to collection</h1>
 Result <b>${param.resultUuid}</b> successfully added to collection <b>${param.collectionId}</b>.
 </div>
-
-<%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/footer.txt b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/coda.jspf
similarity index 50%
rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/footer.txt
rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/coda.jspf
index d733a1ffd..691287b6e 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/footer.txt
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/coda.jspf
@@ -1,2 +1,2 @@
-</body>
+</body>
 </html>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp
index 0abd193d1..71e66e2b9 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp
@@ -1,5 +1,3 @@
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
 <div id="banner"><a href="home.web"><img
 	src="images/SpartaBanner.gif" /></a></div>
 
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp
index d90466931..7a192d794 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp
@@ -1,14 +1,6 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 
-<%@include file="header.txt"%>
-<jsp:include page="common.jsp" />
-
 <div id="main">
 <h1>SLC Home</h1>
 
 </div>
-
-<%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/header.txt b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/prelude.jspf
similarity index 53%
rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/header.txt
rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/prelude.jspf
index dc83a3783..229119023 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/header.txt
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/prelude.jspf
@@ -1,12 +1,16 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>SLC Web</title>
-<link href="style.css" rel="stylesheet" type="text/css"/>
-</head>
-<body>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<%@ page language="java" contentType="text/html"%>
+
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html" />
+<title>SLC Web</title>
+<link href="style.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+
+<%@include file="common.jsp"%>
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp
index dd7a77389..30a2b9fa8 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp
@@ -1,15 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
-<%@include file="header.txt"%>
-<jsp:include page="common.jsp" />
-
 <div id="main">
 <h1>Remove result from collection</h1>
 Result <b>${param.resultUuid}</b> successfully removed from collection <b>${param.collectionId}</b>.
 </div>
-
-<%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp
index 7eb19a2eb..9b11de4bd 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp
@@ -1,12 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
-<%@include file="header.txt"%>
-<jsp:include page="common.jsp" />
-
 <div id="main">
 <h1>Result Collections</h1>
 
@@ -26,5 +17,3 @@
 </table>
 
 </div>
-
-<%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp
index d4aa538b9..2d741d9bf 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp
@@ -1,12 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
-<%@include file="header.txt"%>
-<jsp:include page="common.jsp" />
-
 <div id="main">
 <h1>Result Collection ${resultCollection.id}</h1>
 
@@ -36,5 +27,3 @@
 </table>
 
 </div>
-
-<%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp
index 3de908e48..3ae2101dd 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp
@@ -1,12 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
-<%@include file="header.txt"%>
-<jsp:include page="common.jsp" />
-
 <div id="main">
 <h1>Results</h1>
 
@@ -35,5 +26,3 @@
 </table>
 
 </div>
-
-<%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
index 66e63a11d..b3141a788 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp
@@ -1,12 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
-<%@include file="header.txt"%>
-<jsp:include page="common.jsp" />
-
 <div id="main">
 <h1>Result #${result.uuid}</h1>
 
@@ -58,5 +49,3 @@
 	</table>
 
 </c:forEach></div>
-
-<%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp
index fb70e50a1..1848c26e9 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp
@@ -1,11 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
-<%@include file="header.txt"%>
-<jsp:include page="common.jsp" />
-
 <div id="main">
 <h1>SLC Execution List</h1>
 
@@ -30,5 +22,3 @@
 </table>
 
 </div>
-
-<%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp
index eafe31eb5..360e98ef6 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp
@@ -1,11 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
-<%@include file="header.txt"%>
-<jsp:include page="common.jsp" />
-
 <div id="main">
 <h1>SLC Execution #${slcExecution.uuid}</h1>
 
@@ -51,5 +43,3 @@
 		</c:forEach>
 	</table>
 </c:forEach></div>
-
-<%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/testRunView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/testRunView.jsp
index 8152342aa..9c77b6e12 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/testRunView.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/testRunView.jsp
@@ -1,12 +1,3 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
-<%@include file="header.txt"%>
-<jsp:include page="common.jsp" />
-
 <div id="main">
 <h1>TestRun #${testRunDescriptor.testRunUuid}</h1>
 
@@ -29,5 +20,3 @@
 	Related Deployed System: ${testRunDescriptor.deployedSytemId}
 	<br />
 </c:if>
-
- <%@include file="footer.txt"%>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
index dbfebf22b..23cb582fe 100644
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,57 +1,64 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-	version="2.4">
-
-	<display-name>SLC Web Application</display-name>
-
-	<servlet>
-		<servlet-name>slc-ws</servlet-name>
-		<servlet-class>
-			org.springframework.ws.transport.http.MessageDispatcherServlet
-		</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>slc-ws</servlet-name>
-		<url-pattern>/slcService/*</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>slc-web</servlet-name>
-		<servlet-class>
-			org.springframework.web.servlet.DispatcherServlet
-		</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>slc-web</servlet-name>
-		<url-pattern>*.web</url-pattern>
-	</servlet-mapping>
-
-	<servlet>
-		<servlet-name>slc-xslt</servlet-name>
-		<servlet-class>
-			org.springframework.web.servlet.DispatcherServlet
-		</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>slc-xslt</servlet-name>
-		<url-pattern>*.xslt</url-pattern>
-	</servlet-mapping>
-
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/applicationContext.xml</param-value>
-	</context-param>
-
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>
-
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+	version="2.4">
+
+	<display-name>SLC Web Application</display-name>
+
+	<servlet>
+		<servlet-name>slc-ws</servlet-name>
+		<servlet-class>
+			org.springframework.ws.transport.http.MessageDispatcherServlet
+		</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>slc-ws</servlet-name>
+		<url-pattern>/slcService/*</url-pattern>
+	</servlet-mapping>
+
+	<servlet>
+		<servlet-name>slc-web</servlet-name>
+		<servlet-class>
+			org.springframework.web.servlet.DispatcherServlet
+		</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>slc-web</servlet-name>
+		<url-pattern>*.web</url-pattern>
+	</servlet-mapping>
+
+	<servlet>
+		<servlet-name>slc-xslt</servlet-name>
+		<servlet-class>
+			org.springframework.web.servlet.DispatcherServlet
+		</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>slc-xslt</servlet-name>
+		<url-pattern>*.xslt</url-pattern>
+	</servlet-mapping>
+
+	<context-param>
+		<param-name>contextConfigLocation</param-name>
+		<param-value>/WEB-INF/applicationContext.xml</param-value>
+	</context-param>
+
+	<listener>
+		<listener-class>
+			org.springframework.web.context.ContextLoaderListener
+		</listener-class>
+	</listener>
+
+	<jsp-config>
+		<jsp-property-group>
+			<url-pattern>*.jsp</url-pattern>
+			<page-encoding>ISO-8859-1</page-encoding>
+			<include-prelude>/WEB-INF/jsp/prelude.jspf</include-prelude>
+			<include-coda>/WEB-INF/jsp/coda.jspf</include-coda>
+		</jsp-property-group>
+	</jsp-config>
+</web-app>
diff --git a/org.argeo.slc.webapp/src/main/webapp/index.jsp b/org.argeo.slc.webapp/src/main/webapp/index.jsp
index dd825aee7..8e6efaeec 100644
--- a/org.argeo.slc.webapp/src/main/webapp/index.jsp
+++ b/org.argeo.slc.webapp/src/main/webapp/index.jsp
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-	pageEncoding="ISO-8859-1"%>
-
-<%@include file="WEB-INF/jsp/header.txt"%>
-<jsp:include page="WEB-INF/jsp/common.jsp" />
-
+<%@ page language="java" contentType="text/html"%>
 <%
-response.sendRedirect("slcWeb/home");
+response.sendRedirect("home.web");
 %>
-
-<%@include file="WEB-INF/jsp/footer.txt"%>
\ No newline at end of file
-- 
2.39.2