From 0371614d32d9e90125c3e136aba6fd6cc6cac792 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 5 Jun 2008 11:00:35 +0000 Subject: [PATCH] Centralize server spring configs git-svn-id: https://svn.argeo.org/slc/trunk@1206 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../main/webapp/WEB-INF/{jsp => }/coda.jspf | 0 .../webapp/WEB-INF/{jsp => }/prelude.jspf | 2 +- .../addResultToCollectionS.jsp | 0 .../WEB-INF/{jsp => slc-jsp}/common.jsp | 0 .../webapp/WEB-INF/{jsp => slc-jsp}/home.jsp | 0 .../removeResultFromCollectionS.jsp | 0 .../{jsp => slc-jsp}/resultCollectionList.jsp | 0 .../{jsp => slc-jsp}/resultCollectionView.jsp | 0 .../WEB-INF/{jsp => slc-jsp}/resultList.jsp | 0 .../WEB-INF/{jsp => slc-jsp}/resultView.jsp | 0 .../{jsp => slc-jsp}/slcExecutionList.jsp | 0 .../{jsp => slc-jsp}/slcExecutionView.jsp | 0 .../WEB-INF/{jsp => slc-jsp}/testRunView.jsp | 0 .../main/webapp/WEB-INF/slc-web-servlet.xml | 92 +----------------- .../main/webapp/WEB-INF/slc-ws-servlet.xml | 97 +------------------ .../main/webapp/WEB-INF/slc-xslt-servlet.xml | 30 +----- .../WEB-INF/{xslt => slc-xslt}/resultView.xsl | 0 .../src/main/webapp/WEB-INF/web.xml | 4 +- 18 files changed, 8 insertions(+), 217 deletions(-) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => }/coda.jspf (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => }/prelude.jspf (93%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => slc-jsp}/addResultToCollectionS.jsp (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => slc-jsp}/common.jsp (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => slc-jsp}/home.jsp (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => slc-jsp}/removeResultFromCollectionS.jsp (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => slc-jsp}/resultCollectionList.jsp (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => slc-jsp}/resultCollectionView.jsp (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => slc-jsp}/resultList.jsp (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => slc-jsp}/resultView.jsp (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => slc-jsp}/slcExecutionList.jsp (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => slc-jsp}/slcExecutionView.jsp (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{jsp => slc-jsp}/testRunView.jsp (100%) rename org.argeo.slc.webapp/src/main/webapp/WEB-INF/{xslt => slc-xslt}/resultView.xsl (100%) 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/coda.jspf similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/coda.jspf rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/coda.jspf 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/prelude.jspf similarity index 93% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/prelude.jspf rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/prelude.jspf index 229119023..ff958992d 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/prelude.jspf +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/prelude.jspf @@ -13,4 +13,4 @@ -<%@include file="common.jsp"%> +<%@include file="slc-jsp/common.jsp"%> 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/slc-jsp/addResultToCollectionS.jsp similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/addResultToCollectionS.jsp 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/slc-jsp/common.jsp similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/common.jsp 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/slc-jsp/home.jsp similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/home.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/slc-jsp/removeResultFromCollectionS.jsp similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/removeResultFromCollectionS.jsp 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/slc-jsp/resultCollectionList.jsp similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp 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/slc-jsp/resultCollectionView.jsp similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionView.jsp 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/slc-jsp/resultList.jsp similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp 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/slc-jsp/resultView.jsp similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultView.jsp 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/slc-jsp/slcExecutionList.jsp similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionList.jsp 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/slc-jsp/slcExecutionView.jsp similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionView.jsp 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/slc-jsp/testRunView.jsp similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/testRunView.jsp rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/testRunView.jsp diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml index 95886aeb0..c8278fbd0 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-web-servlet.xml @@ -3,93 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd" - default-lazy-init="true"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.springframework.web.servlet.view.JstlView - - - WEB-INF/jsp/ - - - .jsp - - - - + default-lazy-init="true"> + + \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml index 3fc84efef..755973f07 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-ws-servlet.xml @@ -4,100 +4,5 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" default-lazy-init="true"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - slcExecutionRequestEp - - - slcExecutionRequestEp - - - slcExecutionStepsRequestEp - - - createTreeTestResultRequestEp - - - closeTreeTestResultRequestEp - - - resultPartRequestEp - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt-servlet.xml index 2b43c124a..e8e1d7ebf 100644 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt-servlet.xml +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt-servlet.xml @@ -5,33 +5,5 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd" default-lazy-init="true"> - - - - - - - - - - - - - - org.argeo.slc.web.mvc.XsltMarshallerView - - - WEB-INF/xslt/ - - - .xsl - - - - - + \ No newline at end of file diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt/resultView.xsl similarity index 100% rename from org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl rename to org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt/resultView.xsl 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 23cb582fe..d692d216f 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 @@ -57,8 +57,8 @@

*.jsp

ISO-8859-1 - /WEB-INF/jsp/prelude.jspf - /WEB-INF/jsp/coda.jspf + /WEB-INF/prelude.jspf + /WEB-INF/coda.jspf -- 2.39.2