Author: nico
Date: 2009-05-18 15:12:59 +0200 (Mon, 18 May 2009)
New Revision: 35259
Added:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/log4j.xml
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml
CMSContainer/trunk/CMSContainer_Templates/double/maven-base/project.xml
CMSContainer/trunk/CMSContainer_Templates/single/maven-base/project.xml
Log:
CMSC-1405 SiteCache loading on postgresql is very slow
mmbase email templates
<mmbase.templates.bundle>false</mmbase.templates.bundle>
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml
2009-05-18 12:45:35 UTC (rev 35258)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml
2009-05-18 13:12:59 UTC (rev 35259)
@@ -227,7 +227,7 @@
</dependency>
<!--begin dependency by JForum portlet. -->
-<!--
+
<dependency>
<groupId>freemarker</groupId>
<artifactId>freemarker</artifactId>
@@ -310,7 +310,7 @@
<war.bundle>${war.bundle}</war.bundle>
</properties>
</dependency>
--->
+
<!-- jboss -->
<!--
<dependency>
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml
2009-05-18 12:45:35 UTC (rev 35258)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml
2009-05-18 13:12:59 UTC (rev 35259)
@@ -46,6 +46,19 @@
driverClassName="com.mysql.jdbc.Driver"
url="jdbc:mysql://localhost:3306/community?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useServerPrepStmts=false"
/>
+ <Resource name="jdbc/jforum" auth="Container" type="javax.sql.DataSource"
+ removeAbandoned="true"
+ removeAbandonedTimeout="60"
+ logAbandoned="true"
+ maxActive="10"
+ maxIdle="1"
+ maxWait="10000"
+ username="cmsc"
+ password="cmsc"
+ driverClassName="com.mysql.jdbc.Driver"
+ factory="org.apache.commons.dbcp.BasicDataSourceFactory"
+
url="jdbc:mysql://localhost:3306/cmscjforum?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useServerPrepStmts=false"
/>
+
<!-- zeroDateTimeBehavior=convertToNull
Datetimes with all-zero components ('0000-00-00 ...') - These
values can not be represented reliably
in Java. Connector/J 3.0.x always converted them to NULL when
being read from a ResultSet.
Added:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/log4j.xml
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/log4j.xml
(rev 0)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/WEB-INF/log4j.xml
2009-05-18 13:12:59 UTC (rev 35259)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'>
+ <appender name="jforum-stdout" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{HH:mm:ss,SSS}
%5p [%-20c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="jforum.log"
class="org.apache.log4j.RollingFileAppender">
+ <param name="MaxFileSize" value="1024KB"/>
+ <param name="MaxBackupIndex" value="4"/>
+
+ <param name="File" value="/tmp/jforum.log"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%-c{1}]
- %m%n"/>
+ </layout>
+ </appender>
+
+ <category name="org.jgroups">
+ <priority value="info"/>
+ <appender-ref ref="jforum-stdout"/>
+ </category>
+
+ <category name="org.jboss">
+ <priority value="info"/>
+ <appender-ref ref="jforum-stdout"/>
+ </category>
+
+ <category name="net.jforum">
+ <priority value="info" />
+ <appender-ref ref="jforum-stdout" />
+ </category>
+
+ <category name="freemarker">
+ <priority value="info"/>
+ <appender-ref ref="jforum-stdout"/>
+ </category>
+
+ <category name="com.mchange">
+ <priority value="info" />
+ <appender-ref ref="jforum-stdout" />
+ </category>
+</log4j:configuration>
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Templates/double/maven-base/project.xml
===================================================================
--- CMSContainer/trunk/CMSContainer_Templates/double/maven-base/project.xml
2009-05-18 12:45:35 UTC (rev 35258)
+++ CMSContainer/trunk/CMSContainer_Templates/double/maven-base/project.xml
2009-05-18 13:12:59 UTC (rev 35259)
@@ -203,6 +203,7 @@
<type>mmbase-module</type>
<properties>
<mmbase.config.bundle>false</mmbase.config.bundle>
+
<mmbase.templates.bundle>false</mmbase.templates.bundle>
</properties>
</dependency>
<dependency>
Modified:
CMSContainer/trunk/CMSContainer_Templates/single/maven-base/project.xml
===================================================================
--- CMSContainer/trunk/CMSContainer_Templates/single/maven-base/project.xml
2009-05-18 12:45:35 UTC (rev 35258)
+++ CMSContainer/trunk/CMSContainer_Templates/single/maven-base/project.xml
2009-05-18 13:12:59 UTC (rev 35259)
@@ -197,6 +197,7 @@
<type>mmbase-module</type>
<properties>
<mmbase.config.bundle>false</mmbase.config.bundle>
+
<mmbase.templates.bundle>false</mmbase.templates.bundle>
</properties>
</dependency>
<dependency>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
