From: Mathieu Baudier Date: Thu, 5 Jun 2008 11:00:35 +0000 (+0000) Subject: Centralize server spring configs X-Git-Tag: argeo-slc-2.1.7~2835 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=0371614d32d9e90125c3e136aba6fd6cc6cac792;p=gpl%2Fargeo-slc.git Centralize server spring configs git-svn-id: https://svn.argeo.org/slc/trunk@1206 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/coda.jspf b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/coda.jspf new file mode 100644 index 000000000..691287b6e --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/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/addResultToCollectionS.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp deleted file mode 100644 index bceedf377..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/addResultToCollectionS.jsp +++ /dev/null @@ -1,4 +0,0 @@ -
-

Add result to collection

-Result ${param.resultUuid} successfully added to collection ${param.collectionId}. -
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 deleted file mode 100644 index 691287b6e..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/coda.jspf +++ /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/common.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp deleted file mode 100644 index 71e66e2b9..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/common.jsp +++ /dev/null @@ -1,40 +0,0 @@ - - - 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 deleted file mode 100644 index 7a192d794..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/home.jsp +++ /dev/null @@ -1,6 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> - -
-

SLC Home

- -
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 deleted file mode 100644 index 229119023..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/prelude.jspf +++ /dev/null @@ -1,16 +0,0 @@ - -<%@ 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 deleted file mode 100644 index 30a2b9fa8..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/removeResultFromCollectionS.jsp +++ /dev/null @@ -1,4 +0,0 @@ -
-

Remove result from collection

-Result ${param.resultUuid} successfully removed from collection ${param.collectionId}. -
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 deleted file mode 100644 index 9b11de4bd..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionList.jsp +++ /dev/null @@ -1,19 +0,0 @@ -
-

Result Collections

- - - - - - - - - - - - - -
Id
${resultCollection.id}view
- -
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 deleted file mode 100644 index 2d741d9bf..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultCollectionView.jsp +++ /dev/null @@ -1,29 +0,0 @@ -
-

Result Collection ${resultCollection.id}

- - - - - - - - - - - - - - - - - - - - - - - -
IdStatus
${result.uuid}${result.closeDate}NOT CLOSEDviewremove
- -
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 deleted file mode 100644 index 3ae2101dd..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultList.jsp +++ /dev/null @@ -1,28 +0,0 @@ -
-

Results

- - - - - - - - - - - - - - - - - - - - - - - -
IdStatus
${result.uuid}${result.closeDate}NOT CLOSEDviewxsl
- -
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 deleted file mode 100644 index b3141a788..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/resultView.jsp +++ /dev/null @@ -1,51 +0,0 @@ -
-

Result #${result.uuid}

- - - - -

-Add to staging collection
-Add to official collection -

- - - - - - - - -
${tocEntry.key.name }
- - - - -

<%=describedPaths.get(resultPartEntry.getKey())%>

- - - - - - - -
${tagEntry.key}${tagEntry.value}
- - - - - - - - - - -
- ${part.message} - test run -
- -
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 deleted file mode 100644 index 1848c26e9..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionList.jsp +++ /dev/null @@ -1,24 +0,0 @@ -
-

SLC Execution List

- - - - - - - - - - - - - - - - - - - -
UUIDSTATUSHOSTTYPE
${slcExecution.uuid}${slcExecution.status}${slcExecution.host}${slcExecution.type}view
- -
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 deleted file mode 100644 index 360e98ef6..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/slcExecutionView.jsp +++ /dev/null @@ -1,45 +0,0 @@ -
-

SLC Execution #${slcExecution.uuid}

- -

Details

- - - - - - - - - - - - - - - - - - - - - - - - - -
Host${slcExecution.host}
User${slcExecution.user}
Status${slcExecution.status}
Type${slcExecution.type}
Script${slcExecution.attributes['ant.file']}
- -

Execution Steps

- - -

${slcExecutionStep.begin} - - ${slcExecutionStep.uuid} (${slcExecutionStep.type})

- - - - - - -
${slcExecutionStepLogLine}
-
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 deleted file mode 100644 index 9c77b6e12..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/jsp/testRunView.jsp +++ /dev/null @@ -1,22 +0,0 @@ -
-

TestRun #${testRunDescriptor.testRunUuid}

- - - Related SLC Execution: ${testRunDescriptor.slcExecutionUuid} -
- - Related SLC Execution Step: ${testRunDescriptor.slcExecutionStepUuid} -
- - - Related Test Result: ${testRunDescriptor.testResultUuid} -
- - - - Related Deployed System: ${testRunDescriptor.deployedSytemId} -
- diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/prelude.jspf b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/prelude.jspf new file mode 100644 index 000000000..ff958992d --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/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="slc-jsp/common.jsp"%> diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/addResultToCollectionS.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/addResultToCollectionS.jsp new file mode 100644 index 000000000..bceedf377 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/addResultToCollectionS.jsp @@ -0,0 +1,4 @@ +
+

Add result to collection

+Result ${param.resultUuid} successfully added to collection ${param.collectionId}. +
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/common.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/common.jsp new file mode 100644 index 000000000..71e66e2b9 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/common.jsp @@ -0,0 +1,40 @@ + + + diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/home.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/home.jsp new file mode 100644 index 000000000..7a192d794 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/home.jsp @@ -0,0 +1,6 @@ +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> + +
+

SLC Home

+ +
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/removeResultFromCollectionS.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/removeResultFromCollectionS.jsp new file mode 100644 index 000000000..30a2b9fa8 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/removeResultFromCollectionS.jsp @@ -0,0 +1,4 @@ +
+

Remove result from collection

+Result ${param.resultUuid} successfully removed from collection ${param.collectionId}. +
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp new file mode 100644 index 000000000..9b11de4bd --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionList.jsp @@ -0,0 +1,19 @@ +
+

Result Collections

+ + + + + + + + + + + + + +
Id
${resultCollection.id}view
+ +
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionView.jsp new file mode 100644 index 000000000..2d741d9bf --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultCollectionView.jsp @@ -0,0 +1,29 @@ +
+

Result Collection ${resultCollection.id}

+ + + + + + + + + + + + + + + + + + + + + + + +
IdStatus
${result.uuid}${result.closeDate}NOT CLOSEDviewremove
+ +
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp new file mode 100644 index 000000000..3ae2101dd --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultList.jsp @@ -0,0 +1,28 @@ +
+

Results

+ + + + + + + + + + + + + + + + + + + + + + + +
IdStatus
${result.uuid}${result.closeDate}NOT CLOSEDviewxsl
+ +
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultView.jsp new file mode 100644 index 000000000..b3141a788 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/resultView.jsp @@ -0,0 +1,51 @@ +
+

Result #${result.uuid}

+ + + + +

+Add to staging collection
+Add to official collection +

+ + + + + + + + +
${tocEntry.key.name }
+ + + + +

<%=describedPaths.get(resultPartEntry.getKey())%>

+ + + + + + + +
${tagEntry.key}${tagEntry.value}
+ + + + + + + + + + +
+ ${part.message} + test run +
+ +
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionList.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionList.jsp new file mode 100644 index 000000000..1848c26e9 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionList.jsp @@ -0,0 +1,24 @@ +
+

SLC Execution List

+ + + + + + + + + + + + + + + + + + + +
UUIDSTATUSHOSTTYPE
${slcExecution.uuid}${slcExecution.status}${slcExecution.host}${slcExecution.type}view
+ +
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionView.jsp new file mode 100644 index 000000000..360e98ef6 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/slcExecutionView.jsp @@ -0,0 +1,45 @@ +
+

SLC Execution #${slcExecution.uuid}

+ +

Details

+ + + + + + + + + + + + + + + + + + + + + + + + + +
Host${slcExecution.host}
User${slcExecution.user}
Status${slcExecution.status}
Type${slcExecution.type}
Script${slcExecution.attributes['ant.file']}
+ +

Execution Steps

+ + +

${slcExecutionStep.begin} - + ${slcExecutionStep.uuid} (${slcExecutionStep.type})

+ + + + + + +
${slcExecutionStepLogLine}
+
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/testRunView.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/testRunView.jsp new file mode 100644 index 000000000..9c77b6e12 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/testRunView.jsp @@ -0,0 +1,22 @@ +
+

TestRun #${testRunDescriptor.testRunUuid}

+ + + Related SLC Execution: ${testRunDescriptor.slcExecutionUuid} +
+ + Related SLC Execution Step: ${testRunDescriptor.slcExecutionStepUuid} +
+ + + Related Test Result: ${testRunDescriptor.testResultUuid} +
+ + + + Related Deployed System: ${testRunDescriptor.deployedSytemId} +
+ 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/slc-xslt/resultView.xsl b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt/resultView.xsl new file mode 100644 index 000000000..947cef0f9 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt/resultView.xsl @@ -0,0 +1,50 @@ + + + + + + + + + Result + + +

+ Result + +

+ +

+ +

+ + + + + + + + + + + + + +
+ + + +
+ + + + + \ 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 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 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/xslt/resultView.xsl deleted file mode 100644 index 947cef0f9..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - Result - - -

- Result - -

- -

- -

- - - - - - - - - - - - - -
- - - -
- - - - - \ No newline at end of file