projects / gpl / argeo-slc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b681f60)
Centralize JSPs
authorMathieu Baudier <mbaudier@argeo.org>
Thu, 5 Jun 2008 10:12:28 +0000 (10:12 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Thu, 5 Jun 2008 10:12:28 +0000 (10:12 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@1199 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

18 files changed:
org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF [deleted file] patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/coda.jspf [new file with mode: 0644] patch | blob
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/footer.txt [deleted file] patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/header.txt [deleted file] patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/prelude.jspf [new file with mode: 0644] patch | blob
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/testRunView.jsp patch | blob | history
org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml patch | blob | history
org.argeo.slc.webapp/src/main/webapp/index.jsp patch | blob | history

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 (file)
index 58630c0..0000000
--- a/org.argeo.slc.webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0\r
-\r
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 f1453bdf4230e68775b1fb6336fd62b4e979a9d7..bceedf377abadd8c31bbff24f7d84f8effcd0064 100644 (file)
--- 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" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
-\r
-<%@include file="header.txt"%>\r
-<jsp:include page="common.jsp" />\r
-\r
 <div id="main">\r
 <h1>Add result to collection</h1>\r
 Result <b>${param.resultUuid}</b> successfully added to collection <b>${param.collectionId}</b>.\r
 </div>\r
-\r
-<%@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 (file)
index 0000000..691287b
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/coda.jspf
@@ -0,0 +1,2 @@
+</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 0abd193d1efe5b91a5e99814b95935795458d02b..71e66e2b9d675a4149eb6ed870ba9b6c0c709834 100644 (file)
--- 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"%>\r
-\r
 <div id="banner"><a href="home.web"><img\r
        src="images/SpartaBanner.gif" /></a></div>\r
 \r
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 (file)
index d733a1f..0000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/footer.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-</body>\r
-</html>
\ 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 (file)
index dc83a37..0000000
--- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/header.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-\r
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r
-<html xmlns="http://www.w3.org/1999/xhtml">\r
-<head>\r
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />\r
-<title>SLC Web</title>\r
-<link href="style.css" rel="stylesheet" type="text/css"/>\r
-</head>\r
-<body>\r
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 d90466931b6385918fea6bbbb050fdcfc6c5fd27..7a192d794e5e703214b01416b6e8b725662509a1 100644 (file)
--- 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" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
 \r
-<%@include file="header.txt"%>\r
-<jsp:include page="common.jsp" />\r
-\r
 <div id="main">\r
 <h1>SLC Home</h1>\r
 \r
 </div>\r
-\r
-<%@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 (file)
index 0000000..2291190
--- /dev/null
+++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/prelude.jspf
@@ -0,0 +1,16 @@
+<?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 dd7a773893dd28716e2d4d0a3e382f2dcf925e1c..30a2b9fa8496be69e93c2e6824656ecec91640ba 100644 (file)
--- 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" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
-\r
-<%@include file="header.txt"%>\r
-<jsp:include page="common.jsp" />\r
-\r
 <div id="main">\r
 <h1>Remove result from collection</h1>\r
 Result <b>${param.resultUuid}</b> successfully removed from collection <b>${param.collectionId}</b>.\r
 </div>\r
-\r
-<%@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 7eb19a2eb105bb8cd0b0f527ef52a147a9d78ad1..9b11de4bdc57cc16f7ccacccace20c0ec2e321a9 100644 (file)
--- 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" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
-\r
-<%@include file="header.txt"%>\r
-<jsp:include page="common.jsp" />\r
-\r
 <div id="main">\r
 <h1>Result Collections</h1>\r
 \r
@@ -26,5 +17,3 @@
 </table>\r
 \r
 </div>\r
-\r
-<%@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 d4aa538b9ff8e010343f0edafa36cc4edf2c9fee..2d741d9bfb7878c36f3bc9919a9a5cae732c636d 100644 (file)
--- 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" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
-\r
-<%@include file="header.txt"%>\r
-<jsp:include page="common.jsp" />\r
-\r
 <div id="main">\r
 <h1>Result Collection ${resultCollection.id}</h1>\r
 \r
@@ -36,5 +27,3 @@
 </table>\r
 \r
 </div>\r
-\r
-<%@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 3de908e48b73c53a481dd766d9f8180f889522d7..3ae2101dd83a3ca085a753b406354a8c1b73a9ab 100644 (file)
--- 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" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
-\r
-<%@include file="header.txt"%>\r
-<jsp:include page="common.jsp" />\r
-\r
 <div id="main">\r
 <h1>Results</h1>\r
 \r
@@ -35,5 +26,3 @@
 </table>\r
 \r
 </div>\r
-\r
-<%@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 66e63a11d3be71062ad2c73e4c01505be978c89f..b3141a7884b1a203f53340bc1c5006367d7b4f5b 100644 (file)
--- 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" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
-\r
-<%@include file="header.txt"%>\r
-<jsp:include page="common.jsp" />\r
-\r
 <div id="main">\r
 <h1>Result #${result.uuid}</h1>\r
 \r
@@ -58,5 +49,3 @@
        </table>\r
 \r
 </c:forEach></div>\r
-\r
-<%@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 fb70e50a111a21cc7d6a46ebda1b1f4d1dc37a9e..1848c26e968a32d788f26e2f1796e0358eb88172 100644 (file)
--- 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" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
-\r
-<%@include file="header.txt"%>\r
-<jsp:include page="common.jsp" />\r
-\r
 <div id="main">\r
 <h1>SLC Execution List</h1>\r
 \r
@@ -30,5 +22,3 @@
 </table>\r
 \r
 </div>\r
-\r
-<%@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 eafe31eb57f7359d15598afe68cae7b850a8d52f..360e98ef61e9ec8822802b00822a1e6b985eba88 100644 (file)
--- 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" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
-\r
-<%@include file="header.txt"%>\r
-<jsp:include page="common.jsp" />\r
-\r
 <div id="main">\r
 <h1>SLC Execution #${slcExecution.uuid}</h1>\r
 \r
@@ -51,5 +43,3 @@
                </c:forEach>\r
        </table>\r
 </c:forEach></div>\r
-\r
-<%@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 8152342aa17b2accf84b8abcbc7badc5f931fee9..9c77b6e12a37344031cba264e1e06eb693a878e6 100644 (file)
--- 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" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>\r
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>\r
-\r
-<%@include file="header.txt"%>\r
-<jsp:include page="common.jsp" />\r
-\r
 <div id="main">\r
 <h1>TestRun #${testRunDescriptor.testRunUuid}</h1>\r
 \r
@@ -29,5 +20,3 @@
        Related Deployed System: ${testRunDescriptor.deployedSytemId}\r
        <br />\r
 </c:if>\r
-\r
- <%@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 dbfebf22be61ab7ced3a58157fc74b3b8709429e..23cb582fe1494efeccdad6e2fe050ff3c421a6de 100644 (file)
--- 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"?>\r
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"\r
-       version="2.4">\r
-\r
-       <display-name>SLC Web Application</display-name>\r
-\r
-       <servlet>\r
-               <servlet-name>slc-ws</servlet-name>\r
-               <servlet-class>\r
-                       org.springframework.ws.transport.http.MessageDispatcherServlet\r
-               </servlet-class>\r
-       </servlet>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>slc-ws</servlet-name>\r
-               <url-pattern>/slcService/*</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet>\r
-               <servlet-name>slc-web</servlet-name>\r
-               <servlet-class>\r
-                       org.springframework.web.servlet.DispatcherServlet\r
-               </servlet-class>\r
-       </servlet>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>slc-web</servlet-name>\r
-               <url-pattern>*.web</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <servlet>\r
-               <servlet-name>slc-xslt</servlet-name>\r
-               <servlet-class>\r
-                       org.springframework.web.servlet.DispatcherServlet\r
-               </servlet-class>\r
-       </servlet>\r
-\r
-       <servlet-mapping>\r
-               <servlet-name>slc-xslt</servlet-name>\r
-               <url-pattern>*.xslt</url-pattern>\r
-       </servlet-mapping>\r
-\r
-       <context-param>\r
-               <param-name>contextConfigLocation</param-name>\r
-               <param-value>/WEB-INF/applicationContext.xml</param-value>\r
-       </context-param>\r
-\r
-       <listener>\r
-               <listener-class>\r
-                       org.springframework.web.context.ContextLoaderListener\r
-               </listener-class>\r
-       </listener>\r
-\r
-\r
-</web-app>\r
+<?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 dd825aee769c88eda04caeb4e8623ca2492186cc..8e6efaeec27f7b641608ed9444bbd17dd9e8f642 100644 (file)
--- 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" ?>\r
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1"\r
-       pageEncoding="ISO-8859-1"%>\r
-\r
-<%@include file="WEB-INF/jsp/header.txt"%>\r
-<jsp:include page="WEB-INF/jsp/common.jsp" />\r
-\r
+<%@ page language="java" contentType="text/html"%>\r
 <%\r
-response.sendRedirect("slcWeb/home");\r
+response.sendRedirect("home.web");\r
 %>\r
-\r
-<%@include file="WEB-INF/jsp/footer.txt"%>
\ No newline at end of file
Argeo SLC - Build, deploy, test, monitor, backup