From: Mathieu Baudier Date: Thu, 5 Jun 2008 15:11:17 +0000 (+0000) Subject: Files organization X-Git-Tag: argeo-slc-2.1.7~2829 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=4e94bc28de731b537f150dd0cb662b0d86b42d8e;p=gpl%2Fargeo-slc.git Files organization git-svn-id: https://svn.argeo.org/slc/trunk@1212 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- 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 index c49b71be8..000000000 --- a/org.argeo.slc.webapp/src/main/resources/log4j.properties +++ /dev/null @@ -1,24 +0,0 @@ -# Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=INFO, console - -## Levels -# Slc -log4j.logger.org.argeo.slc=DEBUG -log4j.logger.org.argeo.slc.ws.process=DEBUG -# Spring -log4j.logger.org.springframework=INFO -# Hibernate -log4j.logger.org.hibernate=WARN -#log4j.logger.org.hibernate.SQL=TRACE -#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE -#log4j.logger.org.hibernate.type=TRACE - - -## Appenders -# A1 is set to be a ConsoleAppender. -log4j.appender.console=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n - 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 index 000000000..c49b71be8 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/classes/log4j.properties @@ -0,0 +1,24 @@ +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=INFO, console + +## Levels +# Slc +log4j.logger.org.argeo.slc=DEBUG +log4j.logger.org.argeo.slc.ws.process=DEBUG +# Spring +log4j.logger.org.springframework=INFO +# Hibernate +log4j.logger.org.hibernate=WARN +#log4j.logger.org.hibernate.SQL=TRACE +#log4j.logger.org.hibernate.tool.hbm2ddl=TRACE +#log4j.logger.org.hibernate.type=TRACE + + +## Appenders +# A1 is set to be a ConsoleAppender. +log4j.appender.console=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n + 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 index 691287b6e..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/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/prelude.jspf b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/prelude.jspf deleted file mode 100644 index ff958992d..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/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="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 index 71e66e2b9..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-jsp/common.jsp +++ /dev/null @@ -1,40 +0,0 @@ - - - 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 index e8e1d7ebf..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt-servlet.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - \ 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 index 947cef0f9..000000000 --- a/org.argeo.slc.webapp/src/main/webapp/WEB-INF/slc-xslt/resultView.xsl +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - Result - - -

- Result - -

- -

- - - - - - - - - - - - - -

- -

- - - - - \ 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 index 000000000..691287b6e --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/coda.jspf @@ -0,0 +1,2 @@ + + \ 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 index 000000000..71e66e2b9 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/common.jsp @@ -0,0 +1,40 @@ + + + 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 index 000000000..229119023 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/specific/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/web.xml b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/web.xml index d692d216f..29499de2f 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 @@ -31,14 +31,14 @@ - slc-xslt + xslt

org.springframework.web.servlet.DispatcherServlet

- slc-xslt + xslt

*.xslt

@@ -57,8 +57,8 @@

*.jsp

ISO-8859-1 - /WEB-INF/prelude.jspf - /WEB-INF/coda.jspf + /WEB-INF/specific/prelude.jspf + /WEB-INF/specific/coda.jspf 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 index 000000000..e8e1d7ebf --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt-servlet.xml @@ -0,0 +1,9 @@ + + + + + \ 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 index 000000000..947cef0f9 --- /dev/null +++ b/org.argeo.slc.webapp/src/main/webapp/WEB-INF/xslt/resultView.xsl @@ -0,0 +1,50 @@ + + + + + + + + + Result + + +

+ Result + +

+ +

+ + + + + + + + + + + + + +

+ +

+ + + + + \ No newline at end of file