From: Mathieu Baudier Date: Thu, 5 Jun 2008 10:12:28 +0000 (+0000) Subject: Centralize JSPs X-Git-Tag: argeo-slc-2.1.7~2842 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=c0e22fbfb28fc864579d6cd34b6c274f1b5382bc;hp=b681f608a58605b96344acc691e48bacd647617e;p=gpl%2Fargeo-slc.git Centralize JSPs git-svn-id: https://svn.argeo.org/slc/trunk@1199 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- 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 @@ - -<%@ 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"%> - -

Add result to collection

Result ${param.resultUuid} successfully added to collection ${param.collectionId}.
- -<%@include file="footer.txt"%> \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/coda.jspf b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/coda.jspf new file mode 100644 index 000000000..691287b6e --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/coda.jspf @@ -0,0 +1,2 @@ + + \ 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"%> - 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/footer.txt deleted file mode 100644 index d733a1ffd..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/footer.txt +++ /dev/null @@ -1,2 +0,0 @@ - - \ 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/header.txt deleted file mode 100644 index dc83a3783..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/header.txt +++ /dev/null @@ -1,12 +0,0 @@ - -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - -SLC Web - - - 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 @@ - -<%@ 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"%> - -

SLC Home

- -<%@include file="footer.txt"%> \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/prelude.jspf b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/prelude.jspf new file mode 100644 index 000000000..229119023 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/prelude.jspf @@ -0,0 +1,16 @@ + +<%@ 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"%> + + + + + +SLC Web + + + + +<%@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 @@ - -<%@ 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"%> - -

Remove result from collection

Result ${param.resultUuid} successfully removed from collection ${param.collectionId}.
- -<%@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 @@ - -<%@ 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"%> - -

Result Collections

@@ -26,5 +17,3 @@
- -<%@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 @@ - -<%@ 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"%> - -

Result Collection ${resultCollection.id}

@@ -36,5 +27,3 @@
- -<%@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 @@ - -<%@ 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"%> - -

Results

@@ -35,5 +26,3 @@
- -<%@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 @@ - -<%@ 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"%> - -

Result #${result.uuid}

@@ -58,5 +49,3 @@
- -<%@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 @@ - -<%@ 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"%> - -

SLC Execution List

@@ -30,5 +22,3 @@
- -<%@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 @@ - -<%@ 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"%> - -

SLC Execution #${slcExecution.uuid}

@@ -51,5 +43,3 @@
- -<%@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 @@ - -<%@ 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"%> - -

TestRun #${testRunDescriptor.testRunUuid}

@@ -29,5 +20,3 @@ Related Deployed System: ${testRunDescriptor.deployedSytemId}
- - <%@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 @@ - - - - SLC Web Application - - - slc-ws - - org.springframework.ws.transport.http.MessageDispatcherServlet - - - - - slc-ws - /slcService/* - - - - slc-web - - org.springframework.web.servlet.DispatcherServlet - - - - - slc-web - *.web - - - - slc-xslt - - org.springframework.web.servlet.DispatcherServlet - - - - - slc-xslt - *.xslt - - - - contextConfigLocation - /WEB-INF/applicationContext.xml - - - - - org.springframework.web.context.ContextLoaderListener - - - - - + + + + SLC Web Application + + + slc-ws + + org.springframework.ws.transport.http.MessageDispatcherServlet + + + + + slc-ws + /slcService/* + + + + slc-web + + org.springframework.web.servlet.DispatcherServlet + + + + + slc-web + *.web + + + + slc-xslt + + org.springframework.web.servlet.DispatcherServlet + + + + + slc-xslt + *.xslt + + + + contextConfigLocation + /WEB-INF/applicationContext.xml + + + + + org.springframework.web.context.ContextLoaderListener + + + + + + *.jsp + ISO-8859-1 + /WEB-INF/jsp/prelude.jspf + /WEB-INF/jsp/coda.jspf + + + 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 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - -<%@include file="WEB-INF/jsp/header.txt"%> - - +<%@ 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