Files organization
authorMathieu Baudier <mbaudier@argeo.org>
Thu, 5 Jun 2008 15:11:17 +0000 (15:11 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Thu, 5 Jun 2008 15:11:17 +0000 (15:11 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@1212 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

13 files changed:
org.argeo.slc.webapp/src/main/resources/log4j.properties [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/coda.jspf [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/prelude.jspf [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/common.jsp [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt-servlet.xml [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt/resultView.xsl [deleted file]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/coda.jspf [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/common.jsp [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/prelude.jspf [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml
org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml [new file with mode: 0644]
org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl [new file with mode: 0644]

diff --git a/org.argeo.slc.webapp/src/main/resources/log4j.properties b/org.argeo.slc.webapp/src/main/resources/log4j.properties
deleted file mode 100644 (file)
index c49b71b..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.\r
-log4j.rootLogger=INFO, console\r
-\r
-## Levels\r
-# Slc\r
-log4j.logger.org.argeo.slc=DEBUG\r
-log4j.logger.org.argeo.slc.ws.process=DEBUG\r
-# Spring\r
-log4j.logger.org.springframework=INFO\r
-# Hibernate\r
-log4j.logger.org.hibernate=WARN\r
-#log4j.logger.org.hibernate.SQL=TRACE\r
-#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE\r
-#log4j.logger.org.hibernate.type=TRACE\r
-\r
-\r
-## Appenders\r
-# A1 is set to be a ConsoleAppender.\r
-log4j.appender.console=org.apache.log4j.ConsoleAppender\r
-\r
-# A1 uses PatternLayout.\r
-log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n\r
-\r
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties
new file mode 100644 (file)
index 0000000..c49b71b
--- /dev/null
@@ -0,0 +1,24 @@
+# Set root logger level to DEBUG and its only appender to A1.\r
+log4j.rootLogger=INFO, console\r
+\r
+## Levels\r
+# Slc\r
+log4j.logger.org.argeo.slc=DEBUG\r
+log4j.logger.org.argeo.slc.ws.process=DEBUG\r
+# Spring\r
+log4j.logger.org.springframework=INFO\r
+# Hibernate\r
+log4j.logger.org.hibernate=WARN\r
+#log4j.logger.org.hibernate.SQL=TRACE\r
+#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE\r
+#log4j.logger.org.hibernate.type=TRACE\r
+\r
+\r
+## Appenders\r
+# A1 is set to be a ConsoleAppender.\r
+log4j.appender.console=org.apache.log4j.ConsoleAppender\r
+\r
+# A1 uses PatternLayout.\r
+log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n\r
+\r
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
deleted file mode 100644 (file)
index 691287b..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-</body>
-</html>
\ No newline at end of file
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
deleted file mode 100644 (file)
index ff95899..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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="slc-jsp/common.jsp"%>
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
deleted file mode 100644 (file)
index 71e66e2..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-<div id="banner"><a href="home.web"><img\r
-       src="images/SpartaBanner.gif" /></a></div>\r
-\r
-<div id="navigation">\r
-\r
-<table border="0" cellspacing="0">\r
-       <tr>\r
-               <td class="nav1"><a href="home.web">Home</a></td>\r
-       </tr>\r
-       <tr>\r
-               <td class="nav1">Overview</td>\r
-       </tr>\r
-       <tr>\r
-               <td class="nav2"><a href="resultCollectionList.web">Collections</a></td>\r
-       </tr>\r
-       <tr>\r
-               <td class="nav2"><a href="resultList.web">All Results</a></td>\r
-       </tr>\r
-       <tr>\r
-               <td class="nav2"><a href="slcExecutionList.web">SLC\r
-               Executions</a></td>\r
-       </tr>\r
-       <tr>\r
-               <td class="nav1"><a href="resultCollectionList.web">Collections</a></td>\r
-       </tr>\r
-       <c:forEach items="${resultCollections}" var="resultCollection">\r
-               <tr>\r
-                       <td class="nav2"><a\r
-                               href="resultCollectionView.web?id=${resultCollection.id}">${resultCollection.id}</a></td>\r
-               </tr>\r
-       </c:forEach>\r
-       <tr>\r
-               <td class="nav1">Technical</td>\r
-       </tr>\r
-       <tr>\r
-               <td class="nav2"><a href="slcService/slcDefinition.wsdl">WSDL\r
-               Definition</a></td>\r
-       </tr>\r
-</table>\r
-</div>\r
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
deleted file mode 100644 (file)
index e8e1d7e..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       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"\r
-       default-lazy-init="true">\r
-\r
-       <import resource="classpath:/org/argeo/slc/server/spring/slc-xslt-servlet.xml"/>
-</beans>
\ 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
deleted file mode 100644 (file)
index 947cef0..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<xsl:stylesheet version="1.0"\r
-       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r
-       xmlns:slc="http://argeo.org/projects/slc/schemas"\r
-       exclude-result-prefixes="slc">\r
-\r
-       <xsl:output method="html" omit-xml-declaration="yes" />\r
-\r
-       <xsl:template match="/">\r
-               <html>\r
-                       <head>\r
-                               <title>Result</title>\r
-                       </head>\r
-                       <body style="font-family: sans-serif">\r
-                               <h1>\r
-                                       Result\r
-                                       <xsl:value-of select="slc:tree-test-result/@uuid" />\r
-                               </h1>\r
-                               <xsl:for-each\r
-                                       select="slc:tree-test-result/slc:result-parts/slc:result-part">\r
-                                       <h2>\r
-                                               <xsl:value-of select="@path" />\r
-                                       </h2>\r
-                                       <table>\r
-                                               <xsl:for-each\r
-                                                       select="slc:part-sub-list/slc:parts/slc:simple-result-part">\r
-                                                       <tr>\r
-                                                               <xsl:choose>\r
-                                                                       <xsl:when\r
-                                                                               test="slc:status = 'PASSED' ">\r
-                                                                               <td style="color:green">\r
-                                                                                       <xsl:value-of\r
-                                                                                               select="slc:message" />\r
-                                                                               </td>\r
-                                                                       </xsl:when>\r
-                                                                       <xsl:otherwise>\r
-                                                                               <td style="color:red">\r
-                                                                                       <xsl:value-of\r
-                                                                                               select="slc:message" />\r
-                                                                               </td>\r
-                                                                       </xsl:otherwise>\r
-                                                               </xsl:choose>\r
-                                                       </tr>\r
-                                               </xsl:for-each>\r
-                                       </table>\r
-                               </xsl:for-each>\r
-                       </body>\r
-               </html>\r
-       </xsl:template>\r
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/coda.jspf b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/coda.jspf
new file mode 100644 (file)
index 0000000..691287b
--- /dev/null
@@ -0,0 +1,2 @@
+</body>
+</html>
\ No newline at end of file
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/common.jsp b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/common.jsp
new file mode 100644 (file)
index 0000000..71e66e2
--- /dev/null
@@ -0,0 +1,40 @@
+<div id="banner"><a href="home.web"><img\r
+       src="images/SpartaBanner.gif" /></a></div>\r
+\r
+<div id="navigation">\r
+\r
+<table border="0" cellspacing="0">\r
+       <tr>\r
+               <td class="nav1"><a href="home.web">Home</a></td>\r
+       </tr>\r
+       <tr>\r
+               <td class="nav1">Overview</td>\r
+       </tr>\r
+       <tr>\r
+               <td class="nav2"><a href="resultCollectionList.web">Collections</a></td>\r
+       </tr>\r
+       <tr>\r
+               <td class="nav2"><a href="resultList.web">All Results</a></td>\r
+       </tr>\r
+       <tr>\r
+               <td class="nav2"><a href="slcExecutionList.web">SLC\r
+               Executions</a></td>\r
+       </tr>\r
+       <tr>\r
+               <td class="nav1"><a href="resultCollectionList.web">Collections</a></td>\r
+       </tr>\r
+       <c:forEach items="${resultCollections}" var="resultCollection">\r
+               <tr>\r
+                       <td class="nav2"><a\r
+                               href="resultCollectionView.web?id=${resultCollection.id}">${resultCollection.id}</a></td>\r
+               </tr>\r
+       </c:forEach>\r
+       <tr>\r
+               <td class="nav1">Technical</td>\r
+       </tr>\r
+       <tr>\r
+               <td class="nav2"><a href="slcService/slcDefinition.wsdl">WSDL\r
+               Definition</a></td>\r
+       </tr>\r
+</table>\r
+</div>\r
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/prelude.jspf b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/prelude.jspf
new file mode 100644 (file)
index 0000000..2291190
--- /dev/null
@@ -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"%>
index d692d216f186fae7e009e7ba10fb3a66f22de7b8..29499de2f343925a18cc74c87b0b194059c39fc1 100644 (file)
        </servlet-mapping>
 
        <servlet>
-               <servlet-name>slc-xslt</servlet-name>
+               <servlet-name>xslt</servlet-name>
                <servlet-class>
                        org.springframework.web.servlet.DispatcherServlet
                </servlet-class>
        </servlet>
 
        <servlet-mapping>
-               <servlet-name>slc-xslt</servlet-name>
+               <servlet-name>xslt</servlet-name>
                <url-pattern>*.xslt</url-pattern>
        </servlet-mapping>
 
@@ -57,8 +57,8 @@
                <jsp-property-group>
                        <url-pattern>*.jsp</url-pattern>
                        <page-encoding>ISO-8859-1</page-encoding>
-                       <include-prelude>/WEB-INF/prelude.jspf</include-prelude>
-                       <include-coda>/WEB-INF/coda.jspf</include-coda>
+                       <include-prelude>/WEB-INF/specific/prelude.jspf</include-prelude>
+                       <include-coda>/WEB-INF/specific/coda.jspf</include-coda>
                </jsp-property-group>
        </jsp-config>
 </web-app>
diff --git a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml
new file mode 100644 (file)
index 0000000..e8e1d7e
--- /dev/null
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xmlns:aop="http://www.springframework.org/schema/aop"\r
+       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"\r
+       default-lazy-init="true">\r
+\r
+       <import resource="classpath:/org/argeo/slc/server/spring/slc-xslt-servlet.xml"/>
+</beans>
\ 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/xslt/resultView.xsl
new file mode 100644 (file)
index 0000000..947cef0
--- /dev/null
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<xsl:stylesheet version="1.0"\r
+       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r
+       xmlns:slc="http://argeo.org/projects/slc/schemas"\r
+       exclude-result-prefixes="slc">\r
+\r
+       <xsl:output method="html" omit-xml-declaration="yes" />\r
+\r
+       <xsl:template match="/">\r
+               <html>\r
+                       <head>\r
+                               <title>Result</title>\r
+                       </head>\r
+                       <body style="font-family: sans-serif">\r
+                               <h1>\r
+                                       Result\r
+                                       <xsl:value-of select="slc:tree-test-result/@uuid" />\r
+                               </h1>\r
+                               <xsl:for-each\r
+                                       select="slc:tree-test-result/slc:result-parts/slc:result-part">\r
+                                       <h2>\r
+                                               <xsl:value-of select="@path" />\r
+                                       </h2>\r
+                                       <table>\r
+                                               <xsl:for-each\r
+                                                       select="slc:part-sub-list/slc:parts/slc:simple-result-part">\r
+                                                       <tr>\r
+                                                               <xsl:choose>\r
+                                                                       <xsl:when\r
+                                                                               test="slc:status = 'PASSED' ">\r
+                                                                               <td style="color:green">\r
+                                                                                       <xsl:value-of\r
+                                                                                               select="slc:message" />\r
+                                                                               </td>\r
+                                                                       </xsl:when>\r
+                                                                       <xsl:otherwise>\r
+                                                                               <td style="color:red">\r
+                                                                                       <xsl:value-of\r
+                                                                                               select="slc:message" />\r
+                                                                               </td>\r
+                                                                       </xsl:otherwise>\r
+                                                               </xsl:choose>\r
+                                                       </tr>\r
+                                               </xsl:for-each>\r
+                                       </table>\r
+                               </xsl:for-each>\r
+                       </body>\r
+               </html>\r
+       </xsl:template>\r
+</xsl:stylesheet>
\ No newline at end of file