Author: andre
Date: 2010-07-07 16:58:31 +0200 (Wed, 07 Jul 2010)
New Revision: 42828
Added:
mmweb/trunk/src/main/webapp/WEB-INF/tags/
mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/
mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/head.tagx
mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/html.tagx
mmweb/trunk/src/main/webapp/index.jspx
Modified:
mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml
mmweb/trunk/src/main/webapp/index.jsp
Log:
primary setup of website in jspx with tag files
Modified: mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml
===================================================================
--- mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml 2010-07-07
14:52:39 UTC (rev 42827)
+++ mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml 2010-07-07
14:58:31 UTC (rev 42828)
@@ -1,77 +1,78 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"
- [
- <!ENTITY mmlevel "org.mmbase.util.logging.log4j.Log4jLevel" >
- <!ENTITY logdir "${catalina.base}/logs/" >]>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" [
+ <!ENTITY mmlevel "org.mmbase.util.logging.log4j.Log4jLevel" >
+ <!ENTITY logdir "${catalina.base}/logs/mmweb_" >
+]>
-<log4j:configuration debug="false"
xmlns:log4j="http://jakarta.apache.org/log4j/"; >
+<!--
+ Example with an extra log file for only the warnings and worse.
+-->
+
+<log4j:configuration>
+<!-- appenders -->
+
<appender name="logfile" class="org.apache.log4j.DailyRollingFileAppender" >
- <param name="File" value="&logdir;mmbase.log" />
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <param name="Encoding" value="UTF-8" />
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="File" value="&logdir;mmbase.log" />
+ <param name="Append" value="true" />
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-7p %c{4} - %m%n" />
+ <param name="ConversionPattern" value="%d %-7p %c{4} %M.%L %x - %m%n" />
+ <!-- very slow! Don't use for production!! -->
</layout>
</appender>
-
- <!--
- A different appender for 'page' logging. This is writing to stdout now too,
but probably you want
- this to go to another file.
- -->
- <appender name="pagedebug" class="org.apache.log4j.DailyRollingFileAppender"
>
- <param name="File" value="&logdir;mmbase-pages.log" />
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <param name="Encoding" value="UTF-8" />
+
+ <appender name="errorfile" class="org.apache.log4j.DailyRollingFileAppender"
>
+ <param name="DatePattern" value="'.'yyyy-MM-dd" />
+ <param name="File" value="&logdir;mmerror.log" />
+ <param name="Append" value="true" />
+ <param name="Threshold" value="WARN"/>
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{MM-dd HH:mm:ss} PAGE %-7p
%c{2} %L - %m%n" />
+ <param name="ConversionPattern" value="%d %-5p %c{4} %M.%L %x - %m%n" />
+ <!-- very slow! Don't use for production!! -->
</layout>
</appender>
-
- <appender name="sqllog" class="org.apache.log4j.DailyRollingFileAppender" >
- <param name="File" value="&logdir;mmbase-sql.log" />
- <param name="DatePattern" value="'.'yyyy-MM-dd" />
- <param name="Encoding" value="UTF-8" />
+ <!-- The 'page debug' loggings are simply logged to the normal
+ logfile, but with a slightly different format -->
+ <appender name="pagedebug" class="org.apache.log4j.FileAppender" >
+ <param name="File" value="&logdir;mmbase.log" />
+ <param name="Append" value="true" />
<layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{MM-dd HH:mm:ss} %m%n" />
+ <param name="ConversionPattern" value="%d{ISO8601} PAGE %c{4} - %m%n"
/>
</layout>
</appender>
+
+ <appender name="errormailer" class="org.apache.log4j.net.SMTPAppender" >
+ <param name="To" value="mm...@mmbase.org" />
+ <param name="Theshold" value="WARN" />
+ <layout class="org.mmbase.util.logging.log4j.MMPatternLayout">
+ <param name="ConversionPattern" value="%N %d %q %c{4} %M.%L- %m%n" />
+ </layout>
+ </appender>
-
- <!-- categories -->
- <logger name="org.mmbase.security" >
- <level class="&mmlevel;" value ="warn" />
+<!--
+ <logger name="org.mmbase.module.builders.Properties">
+ <level class="&mmlevel;" value="debug" />
</logger>
+ -->
+
+ <logger name="org.mmbase.PAGE">
+ <level class="&mmlevel;" value="info" />
+ </logger>
-
- <!-- 'page logging' goes to a different appender -->
- <logger name="org.mmbase.PAGE" additivity="false">
- <level class="&mmlevel;" value ="info" />
+ <!-- categories -->
+<!--
+ <logger name="MMBASE-PAGE" additivity="false" >
+ <level class="&mmlevel;" value="info" />
<appender-ref ref="pagedebug" />
</logger>
-
- <!-- SQL logging -->
- <logger name="org.mmbase.module.database.MultiConnection" additivity="false">
- <level class="&mmlevel;" value ="service" />
- <appender-ref ref="sqllog" />
- </logger>
-
+ -->
- <!--
- STDERR is a special Category, to wich stderr will be written
- (always with level 'warn' or higher)
- The level can be set to 'fatal' and the stderr will not be
- redirected to mmbase logging.
- -->
-
- <logger name="STDERR">
- <level class="&mmlevel;" value ="fatal" />
- </logger>
-
<root>
- <level class="&mmlevel;" value ="service" />
+ <level class="&mmlevel;" value="info" />
<appender-ref ref="logfile" />
+ <appender-ref ref="errorfile" />
</root>
-
+
</log4j:configuration>
Added: mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/head.tagx
===================================================================
--- mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/head.tagx
(rev 0)
+++ mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/head.tagx 2010-07-07
14:58:31 UTC (rev 42828)
@@ -0,0 +1,34 @@
+<jsp:root
+ version="2.0"
+ xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt";
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ >
+ <jsp:directive.attribute name="title"
+ description="An extra text to add to the page's
title"
+ />
+
+ <mm:formatter xslt="xslt/framework/head.xslt" escape="none">
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <mm:cloudinfo type="mmbaseversion">
+ <meta name="MMBase" content="${_}" />
+ </mm:cloudinfo>
+ <mm:time time="now" format=":FULL.FULL">
+ <meta name="Calculate" content="${_}" />
+ </mm:time>
+ <meta name="ContextRoot" content="${mm:link('/')}" />
+ <title>
+ <c:if test="${! empty title}">${title} - </c:if> MMBase
+ </title>
+ <link href="${mm:link('/style/css/main.css')}" rel="stylesheet"
type="text/css" />
+ <link href="${mm:link('/favicon.ico')}" rel="shortcut icon" />
+ <jsp:include page="/mmbase/jquery/jquery.jspx" />
+ <script src="${mm:link('/style/js/main.js.jsp')}"
type="text/javascript"><jsp:text> </jsp:text></script>
+
+ <jsp:doBody />
+
+ </head>
+ </mm:formatter>
+</jsp:root>
Added: mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/html.tagx
===================================================================
--- mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/html.tagx
(rev 0)
+++ mmweb/trunk/src/main/webapp/WEB-INF/tags/mmweb/html.tagx 2010-07-07
14:58:31 UTC (rev 42828)
@@ -0,0 +1,77 @@
+<jsp:root
+ version="2.0"
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:mmweb="urn:jsptagdir:/WEB-INF/tags/mmweb"
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ >
+ <jsp:directive.tag
+ display-name="HTML"
+ description="The HTML tag defines the basic HTML structure of this site
+ " />
+ <jsp:directive.attribute
+ name="title"
+ description="See mmweb:head title"
+ />
+ <jsp:directive.attribute
+ name="styleClass"
+ description="Extra style class with will be added on the body"
+ />
+ <jsp:directive.attribute name="cacheable" type="java.lang.Boolean" />
+
+ <jsp:directive.attribute name="body" fragment="true" required="true" />
+ <jsp:directive.attribute name="head" fragment="true" />
+
+ <!-- html5 -->
+ <mm:content
+ expires="${empty cacheable || cacheable ? 120 : -1}"
+ varies="${empty requestScope['org.mmbase.mmsite.language'] ?
'Accept-Language' : ''}"
+ type="text/html"
+ encoding="UTF-8"
+ postprocessor="none">
+ <jsp:output omit-xml-declaration="true" />
+ <jsp:output doctype-root-element="HTML"
+ doctype-system="about:legacy-compat" />
+
+ <mm:cloud method="${cacheable ? 'anonymous' : 'asis'}">
+
+ <html
+ xml:lang="en"
+ xmlns="http://www.w3.org/1999/xhtml";>
+
+ <mm:import id="page" externid="n" />
+
+ <mmweb:head>
+ <jsp:attribute name="title">
+ <c:choose>
+ <c:when test="${empty title and !empty page}">
+ <mm:node referid="page">
+ <mm:hasfield name="username"><mm:field name="username"
/></mm:hasfield>
+ <mm:hasfield name="title"><mm:field name="title"
/></mm:hasfield>
+ </mm:node>
+ </c:when>
+ <c:otherwise>${title}</c:otherwise>
+ </c:choose>
+ </jsp:attribute>
+ <c:choose>
+ <c:when test="${empty page}">
+ <jsp:invoke fragment="head" />
+ </c:when>
+ <c:otherwise>
+ <mm:node referid="page">
+ <jsp:invoke fragment="head" />
+ </mm:node>
+ </c:otherwise>
+ </c:choose>
+ </mmweb:head>
+
+ <body class="${styleClass}">
+ <div id="main">
+ <jsp:invoke fragment="body" />
+ </div>
+ </body>
+
+ </html>
+ </mm:cloud>
+ </mm:content>
+</jsp:root>
Modified: mmweb/trunk/src/main/webapp/index.jsp
===================================================================
--- mmweb/trunk/src/main/webapp/index.jsp 2010-07-07 14:52:39 UTC (rev
42827)
+++ mmweb/trunk/src/main/webapp/index.jsp 2010-07-07 14:58:31 UTC (rev
42828)
@@ -1,39 +1 @@
-<%@ taglib uri="http://www.mmbase.org/mmbase-taglib-1.0"; prefix="mm"
-%><%@ page language="java" contentType="text/html; charset=utf-8"
session="true"
-%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-<mm:content postprocessor="reducespace">
-<mm:cloud>
- <mm:import externid="template" />
-
- <mm:present referid="template"><%-- template url explicity specified --%>
- <mm:include page="$template" />
- </mm:present>
-
- <mm:notpresent referid="template"><%-- no template specified, using 'page'
en 'portal' arguments' --%>
-
- <%@ include file="includes/getids.jsp" %>
-
- <mm:node number="$page" notfound="skipbody">
-
- <mm:relatednodes type="templates">
- <mm:field name="url" id="templatefound">
- <mm:include page="$_" />
- </mm:field>
- </mm:relatednodes>
-
- <mm:notpresent referid="templatefound"><%-- still not found? then show
error-page --%>
- <%@ include file="/includes/header.jsp"%>
- <td colspan="2">
- <strong><font color="#CC0000">Error:</font></strong>
- <p>
- A template should be added to page '<mm:field name="title" />'.
- </p>
- </td>
- <%@ include file="/includes/footer.jsp"%>
- </mm:notpresent>
-
- </mm:node>
- </mm:notpresent>
-</mm:cloud>
-</mm:content>
+<jsp:directive.include file="index.jspx" />
Added: mmweb/trunk/src/main/webapp/index.jspx
===================================================================
--- mmweb/trunk/src/main/webapp/index.jspx (rev 0)
+++ mmweb/trunk/src/main/webapp/index.jspx 2010-07-07 14:58:31 UTC (rev
42828)
@@ -0,0 +1,17 @@
+<jsp:root
+ version="2.0"
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:mmweb="urn:jsptagdir:/WEB-INF/tags/mmweb">
+ <mmweb:html styleClass="home">
+ <jsp:attribute name="title">Home</jsp:attribute>
+ <jsp:attribute name="head">
+
+ </jsp:attribute>
+ <jsp:attribute name="body">
+ <h1>Home</h1>
+
+ </jsp:attribute>
+ </mmweb:html>
+</jsp:root>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
