Author: seba.wagner
Date: Tue Oct 7 05:03:07 2008
New Revision: 1599
Added:
trunk/webapp/conf/backup/
trunk/webapp/conf/backup/log4j.properties (props changed)
- copied unchanged from r1529, /trunk/webapp/src/app/log4j.properties
trunk/webapp/conf/commons-logging.properties (props changed)
- copied unchanged from r1529,
/trunk/webapp/webapp/openmeetings/WEB-INF/classes/commons-logging.properties
trunk/webapp/lib/hibernate_331/
trunk/webapp/lib/hibernate_331/antlr-2.7.6.jar (contents, props
changed)
trunk/webapp/lib/hibernate_331/c3p0-0.9.1.jar (contents, props changed)
trunk/webapp/lib/hibernate_331/commons-collections-3.1.jar (contents,
props changed)
trunk/webapp/lib/hibernate_331/dom4j-1.6.1.jar (contents, props
changed)
trunk/webapp/lib/hibernate_331/ehcache-1.2.3.jar (contents, props
changed)
trunk/webapp/lib/hibernate_331/hibernate-cglib-repack-2.1_3.jar
(contents, props changed)
trunk/webapp/lib/hibernate_331/hibernate-testing.jar (contents, props
changed)
trunk/webapp/lib/hibernate_331/hibernate3.jar (contents, props changed)
trunk/webapp/lib/hibernate_331/javassist-3.4.GA.jar (contents, props
changed)
trunk/webapp/lib/hibernate_331/jta-1.1.jar (contents, props changed)
trunk/webapp/lib/slf4j/
trunk/webapp/lib/slf4j/jcl-over-slf4j-1.5.3.jar (contents, props
changed)
trunk/webapp/lib/slf4j/log4j-over-slf4j-1.5.3.jar (contents, props
changed)
trunk/webapp/lib/slf4j/logback-classic-0.9.10-SNAPSHOT.jar (contents,
props changed)
trunk/webapp/lib/slf4j/logback-core-0.9.10-SNAPSHOT.jar (contents,
props changed)
trunk/webapp/lib/slf4j/slf4j-api-1.5.3.jar (contents, props changed)
trunk/webapp/src/app/logback-openmeetings.xml
trunk/webapp/webapp/openmeetings/WEB-INF/classes/logback-openmeetings.xml
Removed:
trunk/webapp/lib/hibernate3/
trunk/webapp/src/app/log4j.properties
trunk/webapp/src/app/logback.xml
trunk/webapp/webapp/openmeetings/WEB-INF/classes/commons-logging.properties
trunk/webapp/webapp/openmeetings/WEB-INF/classes/log4j.properties
trunk/webapp/webapp/openmeetings/WEB-INF/log4j.properties
Modified:
trunk/webapp/.classpath
trunk/webapp/build.xml
trunk/webapp/conf/log4j.properties
trunk/webapp/filetest.keystore
trunk/webapp/src/app/org/openmeetings/app/quartz/scheduler/QuartzSessionClear.java
trunk/webapp/src/app/org/openmeetings/app/remote/Application.java
trunk/webapp/webapp/openmeetings/WEB-INF/web.xml
Log:
Replaces Hibernate3 with Hibernate-3.3.1 and SLF4J, connected to Issue 476
Modified: trunk/webapp/.classpath
==============================================================================
--- trunk/webapp/.classpath (original)
+++ trunk/webapp/.classpath Tue Oct 7 05:03:07 2008
@@ -8,7 +8,18 @@
<classpathentry kind="src" path="src/templates"/>
<classpathentry kind="src" path="src/test"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/kunststoff.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate_331/antlr-2.7.6.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate_331/c3p0-0.9.1.jar"/>
+ <classpathentry kind="lib"
path="lib/hibernate_331/commons-collections-3.1.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate_331/dom4j-1.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate_331/ehcache-1.2.3.jar"/>
+ <classpathentry kind="lib"
path="lib/hibernate_331/hibernate-cglib-repack-2.1_3.jar"/>
+ <classpathentry kind="lib"
path="lib/hibernate_331/hibernate-testing.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate_331/hibernate3.jar"/>
+ <classpathentry kind="lib"
path="lib/hibernate_331/javassist-3.4.GA.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate_331/jta-1.1.jar"/>
+ <classpathentry kind="lib" path="lib/junit/junit-4.0.jar"/>
+ <classpathentry kind="lib" path="lib/junit/junit.jar"/>
<classpathentry kind="lib" path="lib/red5_08rc1/quartz-1.6.0.jar"/>
<classpathentry kind="lib" path="lib/red5_08rc1/red5.jar"/>
<classpathentry kind="lib" path="lib/red5_08rc1/servlet-api-2.5.jar"/>
@@ -19,6 +30,46 @@
<classpathentry kind="lib" path="lib/red5_08rc1/spring-core-2.5.5.jar"/>
<classpathentry kind="lib" path="lib/red5_08rc1/spring-orm-2.5.5.jar"/>
<classpathentry kind="lib" path="lib/red5_08rc1/spring-web-2.5.5.jar"/>
+ <classpathentry kind="lib" path="lib/kunststoff.jar"/>
+ <classpathentry kind="lib"
path="lib/database/mysql-connector-java-5.0.7-bin.jar"/>
+ <classpathentry kind="lib"
path="lib/database/postgresql-8.2-504.jdbc2.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j/jcl-over-slf4j-1.5.3.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j/log4j-over-slf4j-1.5.3.jar"/>
+ <classpathentry kind="lib"
path="lib/slf4j/logback-classic-0.9.10-SNAPSHOT.jar"/>
+ <classpathentry kind="lib"
path="lib/slf4j/logback-core-0.9.10-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/slf4j/slf4j-api-1.5.3.jar"/>
+ <classpathentry kind="lib" path="lib/upload/commons-digester-1.8.jar"/>
+ <classpathentry kind="lib" path="lib/upload/commons-lang-2.2.jar"/>
+ <classpathentry kind="lib"
path="lib/upload/commons-transaction-1.1.jar"/>
+ <classpathentry kind="lib" path="lib/upload/itext-1.3.jar"/>
+ <classpathentry kind="lib" path="lib/upload/mail.jar"/>
+ <classpathentry kind="lib" path="lib/upload/multipartrequest.jar"/>
+ <classpathentry kind="lib"
path="lib/upload/mysql-connector-java-5.0.7-bin.jar"/>
+ <classpathentry kind="lib" path="lib/upload/velocity-1.6-dev.jar"/>
+ <classpathentry kind="lib"
path="lib/upload/velocity-tools-view-1.3.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/commons-beanutils-1.7.0.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/commons-collections-3.1.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/commons-jelly-20050813.225330.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/commons-jelly-tags-define-1.0.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/commons-jelly-tags-jsl-1.0.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/commons-jelly-tags-xml-20050823.222913.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/commons-jexl-1.0.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="lib" path="lib/xdoclet2/lib/dom4j-1.6.jar"/>
+ <classpathentry kind="lib" path="lib/xdoclet2/lib/generama-1.2.1.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/jaxen-1.1-beta-4.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/nanocontainer-1.0-beta-3.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/nanocontainer-ant-1.0-beta-3.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/picocontainer-1.0.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/lib/qdox-20051211.114207.jar"/>
+ <classpathentry kind="lib" path="lib/xdoclet2/lib/saxpath-1.0-FCS.jar"/>
+ <classpathentry kind="lib" path="lib/xdoclet2/lib/velocity-1.4.jar"/>
+ <classpathentry kind="lib" path="lib/xdoclet2/lib/xdoclet-2.0.6.jar"/>
+ <classpathentry kind="lib" path="lib/xdoclet2/lib/xerces-2.4.0.jar"/>
+ <classpathentry kind="lib"
path="lib/xdoclet2/plugins/xdoclet-plugin-hibernate-1.0.4-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/xstream/xpp3_min-1.1.3.4.O.jar"/>
+ <classpathentry kind="lib"
path="lib/xstream/xstream-benchmark-SNAPSHOT.jar"/>
+ <classpathentry kind="lib" path="lib/xstream/xstream-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="lib/axis2-1.3/activation-1.1.jar"/>
<classpathentry kind="lib" path="lib/axis2-1.3/annogen-0.1.0.jar"/>
<classpathentry kind="lib" path="lib/axis2-1.3/axiom-api-1.2.5.jar"/>
@@ -76,55 +127,5 @@
<classpathentry kind="lib" path="lib/axis2-1.3/xercesImpl-2.8.1.jar"/>
<classpathentry kind="lib" path="lib/axis2-1.3/xml-apis-1.3.03.jar"/>
<classpathentry kind="lib" path="lib/axis2-1.3/XmlSchema-1.3.2.jar"/>
- <classpathentry kind="lib"
path="lib/database/mysql-connector-java-5.0.7-bin.jar"/>
- <classpathentry kind="lib"
path="lib/database/postgresql-8.2-504.jdbc2.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/ant-1.6.5.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/ant-antlr-1.6.5.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/ant-junit-1.6.5.jar"/>
- <classpathentry kind="lib"
path="lib/hibernate3/ant-launcher-1.6.5.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/ant-swing-1.6.5.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/antlr-2.7.6.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/antlr-2.7.6rc1.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/asm-attrs.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/asm.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/c3p0-0.9.0.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/c3p0-0.9.1.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/cglib-2.1.3.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/checkstyle-all.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/cleanimports.jar"/>
- <classpathentry kind="lib"
path="lib/hibernate3/commons-logging-1.0.4.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/concurrent-1.3.2.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/connector.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/dom4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/ehcache-1.1.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/ehcache-1.2.3.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/hibernate3.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/jaas.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/jacc-1_0-fr.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/javassist.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/jaxen-1.1-beta-7.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/jdbc2_0-stdext.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/jgroups-2.2.8.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/oscache-2.1.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/proxool-0.8.3.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/swarmcache-1.0rc2.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/syndiag2.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/versioncheck.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/xerces-2.6.2.jar"/>
- <classpathentry kind="lib" path="lib/hibernate3/xml-apis.jar"/>
- <classpathentry kind="lib" path="lib/junit/junit-4.0.jar"/>
- <classpathentry kind="lib" path="lib/junit/junit.jar"/>
- <classpathentry kind="lib" path="lib/upload/commons-digester-1.8.jar"/>
- <classpathentry kind="lib" path="lib/upload/commons-lang-2.2.jar"/>
- <classpathentry kind="lib"
path="lib/upload/commons-transaction-1.1.jar"/>
- <classpathentry kind="lib" path="lib/upload/itext-1.3.jar"/>
- <classpathentry kind="lib" path="lib/upload/mail.jar"/>
- <classpathentry kind="lib" path="lib/upload/multipartrequest.jar"/>
- <classpathentry kind="lib"
path="lib/upload/mysql-connector-java-5.0.7-bin.jar"/>
- <classpathentry kind="lib" path="lib/upload/velocity-1.6-dev.jar"/>
- <classpathentry kind="lib"
path="lib/upload/velocity-tools-view-1.3.jar"/>
- <classpathentry kind="lib" path="lib/xstream/xpp3_min-1.1.3.4.O.jar"/>
- <classpathentry kind="lib"
path="lib/xstream/xstream-benchmark-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="lib/xstream/xstream-SNAPSHOT.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/webapp/build.xml
==============================================================================
--- trunk/webapp/build.xml (original)
+++ trunk/webapp/build.xml Tue Oct 7 05:03:07 2008
@@ -30,7 +30,7 @@
<property name="project.lib" value="./lib"/>
<!-- Hibernate -->
- <property name="hibernate.lib" value="${project.lib}/hibernate3"/>
+ <property name="hibernate.lib" value="${project.lib}/hibernate_331"/>
<!-- Log4j -->
<property name="log4j.lib" value="${project.lib}/log4j" />
<!-- xDoclet -->
@@ -45,7 +45,9 @@
<property name="junit.lib" value="${project.lib}/junit" />
<property name="web.lib" value="${project.lib}" />
<!-- Axis2 -->
- <property name="axis2.lib" value="${project.lib}/axis2-1.3" />
+ <property name="axis2.lib" value="${project.lib}/axis2-1.3" />
+ <!-- SLF4J -->
+ <property name="slf4j.lib" value="${project.lib}/slf4j" />
<!-- compile classpath -->
<path id="compile.classpath">
@@ -58,6 +60,7 @@
<fileset dir="${xstream.lib}" includes="*.jar"/>
<fileset dir="${junit.lib}" includes="*.jar"/>
<fileset dir="${web.lib}" includes="*.jar"/>
+ <fileset dir="${slf4j.lib}" includes="*.jar"/>
<fileset dir="${axis2.lib}" includes="*.jar"/>
</path>
@@ -194,8 +197,14 @@
</fileset>
</copy>
<copy todir="${dist.dir}/openmeetings/WEB-INF/lib">
+ <!--
<fileset dir="${axis2.lib}">
</fileset>
+ -->
+ <!--
+ <fileset dir="${slf4j.lib}">
+ </fileset>
+ -->
<fileset dir="${hibernate.lib}">
</fileset>
<fileset dir="${upload.lib}">
@@ -384,6 +393,7 @@
<target name="clean" depends="cleanForBinary"
description="Prepare for clean build">
<delete file="${main.out.dir}/**/*.hbm.xml"/>
+ <delete dir="${main.out.dir}"/>
<!--mkdir dir="${main.out.dir}"/-->
</target>
Modified: trunk/webapp/conf/log4j.properties
==============================================================================
--- trunk/webapp/conf/log4j.properties (original)
+++ trunk/webapp/conf/log4j.properties Tue Oct 7 05:03:07 2008
@@ -1,10 +1,32 @@
-log4j.rootLogger=DEBUG, console
+log4j.rootLogger=DEBUG, FLOG2, CONSOLE2
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE2 =org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE2.layout=org.apache.log4j.PatternLayout
# Pattern to output the caller's file name and line number.
-#log4j.appender.console.layout.ConversionPattern=[%t] %5p ( %F : %L )
- %m%n
-log4j.appender.console.layout.ConversionPattern=%5p %d{MM-dd HH:mm:ss.SSS
} %F %L %c [%t] - %m%n
+#log4j.appender.CONSOLE2.layout.ConversionPattern=[%t] %5p ( %F : %L )
- %m%n
+log4j.appender.CONSOLE2.layout.ConversionPattern=%5p %d{MM-dd HH:mm:ss.SSS
} %F %r %L %c [%t] - %m%n
+
+log4j.appender.FLOG2=org.apache.log4j.RollingFileAppender
+log4j.appender.FLOG2.File=openmeetings.log
+log4j.appender.FLOG2.Threshold=DEBUG
+#log4j.appender.FLOG2.MaxFileSize=20000KB
+log4j.appender.FLOG2.MaxBackupIndex=1
+log4j.appender.FLOG2.layout=org.apache.log4j.PatternLayout
+log4j.appender.FLOG2.layout.ConversionPattern=%5p %d{MM-dd HH:mm:ss.SSS
} %F %r %L %c [%t] - %m%n
-log4j.logger.org.hibernate=INFO
\ No newline at end of file
+
+log4j.logger.org.hibernate=ERROR
+log4j.logger.org.hibernate=ERROR
+log4j.logger.org.hibernate.SQL=ERROR
+log4j.logger.org.hibernate.cache=ERROR
+log4j.logger.org.hibernate.jdbc=ERROR
+log4j.logger.org.hibernate.tool.hbm2ddl=ERROR
+log4j.logger.com.mchange.v2=ERROR
+
+log4j.logger.org.apache.axiom=ERROR
+log4j.logger.org.apache.axis2=ERROR
+log4j.logger.org.apache.axis2.enterprise=ERROR
+log4j.logger.de.hunsicker.jalopy.io=ERROR
+log4j.logger.httpclient.wire.header=ERROR
+log4j.logger.org.apache.commons.httpclient=ERROR
\ No newline at end of file
Modified: trunk/webapp/filetest.keystore
==============================================================================
Binary files. No diff available.
Added: trunk/webapp/lib/hibernate_331/antlr-2.7.6.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/hibernate_331/c3p0-0.9.1.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/hibernate_331/commons-collections-3.1.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/hibernate_331/dom4j-1.6.1.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/hibernate_331/ehcache-1.2.3.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/hibernate_331/hibernate-cglib-repack-2.1_3.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/hibernate_331/hibernate-testing.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/hibernate_331/hibernate3.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/hibernate_331/javassist-3.4.GA.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/hibernate_331/jta-1.1.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/slf4j/jcl-over-slf4j-1.5.3.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/slf4j/log4j-over-slf4j-1.5.3.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/slf4j/logback-classic-0.9.10-SNAPSHOT.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/slf4j/logback-core-0.9.10-SNAPSHOT.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/lib/slf4j/slf4j-api-1.5.3.jar
==============================================================================
Binary file. No diff available.
Added: trunk/webapp/src/app/logback-openmeetings.xml
==============================================================================
--- (empty file)
+++ trunk/webapp/src/app/logback-openmeetings.xml Tue Oct 7 05:03:07 2008
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration>
+ <appender name="FLOG2"
class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <Threshold>DEBUG</Threshold>
+ <File>openmeetings.log</File>
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %F %r %L %c [%t]
- %m%n</pattern>
+ </layout>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+ <maxIndex>1</maxIndex>
+ </rollingPolicy>
+ </appender>
+ <appender name="CONSOLE2" class="ch.qos.logback.core.ConsoleAppender">
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %F %r %L %c [%t]
- %m%n</pattern>
+ </layout>
+ </appender>
+ <logger name="org.apache.axis2">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="com.mchange.v2">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.hibernate.cache">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.apache.axiom">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.hibernate.jdbc">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.hibernate.SQL">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.apache.commons.httpclient">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.hibernate.tool.hbm2ddl">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.hibernate">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="de.hunsicker.jalopy.io">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.apache.axis2.enterprise">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="httpclient.wire.header">
+ <level value="ERROR"/>
+ </logger>
+ <root>
+ <level value="DEBUG"/>
+ <appender-ref ref="FLOG2"/>
+ <appender-ref ref="CONSOLE2"/>
+ </root>
+</configuration>
Modified:
trunk/webapp/src/app/org/openmeetings/app/quartz/scheduler/QuartzSessionClear.java
==============================================================================
---
trunk/webapp/src/app/org/openmeetings/app/quartz/scheduler/QuartzSessionClear.java
(original)
+++
trunk/webapp/src/app/org/openmeetings/app/quartz/scheduler/QuartzSessionClear.java
Tue Oct 7 05:03:07 2008
@@ -1,7 +1,10 @@
package org.openmeetings.app.quartz.scheduler;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+//import org.apache.commons.logging.Log;
+//import org.apache.commons.logging.LogFactory;
+
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
import org.red5.server.api.scheduling.IScheduledJob;
import org.red5.server.api.scheduling.ISchedulingService;
@@ -9,7 +12,7 @@
public class QuartzSessionClear implements IScheduledJob {
- private static final Log log =
LogFactory.getLog(QuartzSessionClear.class);
+ private static Logger log =
LoggerFactory.getLogger(QuartzSessionClear.class.getName());
public void execute(ISchedulingService service) {
try {
@@ -17,7 +20,9 @@
//cntxt.getScheduler().rescheduleJob("Income Session",
"SessionClear
Generation", cntxt.getTrigger());
// TODO Generate report
- Sessionmanagement.getInstance().clearSessionTable();
+ //Sessionmanagement.getInstance().clearSessionTable();
+ System.out.println("ISchedulingService do Clear
Session"+this);
+ log.debug("ISchedulingService do Clear Session",this);
} catch (Exception err){
log.error("execute",err);
}
Modified: trunk/webapp/src/app/org/openmeetings/app/remote/Application.java
==============================================================================
--- trunk/webapp/src/app/org/openmeetings/app/remote/Application.java
(original)
+++ trunk/webapp/src/app/org/openmeetings/app/remote/Application.java Tue
Oct 7 05:03:07 2008
@@ -12,6 +12,9 @@
import java.util.Map;
import java.util.Set;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -52,6 +55,8 @@
IPendingServiceCallback, IStreamAwareScopeHandler {
private static final Log log = LogFactory.getLog(Application.class);
+
+ private static Logger log2 =
LoggerFactory.getLogger(Application.class.getName());
private Long objectIdentifier = new Long(0);
private static HashMap<String,RoomClient> ClientList = new
HashMap<String,RoomClient>();
@@ -93,6 +98,9 @@
@Override
public boolean appStart(IScope scope) {
try {
+ System.out.println("Custom Webapp start UP "+new
Date());
+ log2.debug("Custom Webapp start UP "+new Date());
+
whiteBoardObjectList = new
HashMap<Long,HashMap<String,Map>>();
webAppPath =
scope.getResource("/").getFile().getAbsolutePath();
log.debug("webAppPath : "+webAppPath);
@@ -104,7 +112,8 @@
// init your handler here
//System.out.println("################## appStart ");
QuartzSessionClear bwHelp = new QuartzSessionClear();
- String jobName = addScheduledJob(300000,bwHelp);
+ //String jobName = addScheduledJob(300000,bwHelp);
+ String jobName = addScheduledJob(1000,bwHelp);
log.debug("jobName: "+jobName);
} catch (Exception err) {
log.error("[appStart]",err);
Added:
trunk/webapp/webapp/openmeetings/WEB-INF/classes/logback-openmeetings.xml
==============================================================================
--- (empty file)
+++
trunk/webapp/webapp/openmeetings/WEB-INF/classes/logback-openmeetings.xml
Tue Oct 7 05:03:07 2008
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<configuration>
+ <appender name="FLOG2"
class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <Threshold>DEBUG</Threshold>
+ <File>openmeetings.log</File>
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %F %r %L %c [%t]
- %m%n</pattern>
+ </layout>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+ <maxIndex>1</maxIndex>
+ </rollingPolicy>
+ </appender>
+ <appender name="CONSOLE2" class="ch.qos.logback.core.ConsoleAppender">
+ <layout class="ch.qos.logback.classic.PatternLayout">
+ <pattern>%5p %d{MM-dd HH:mm:ss.SSS } %F %r %L %c [%t]
- %m%n</pattern>
+ </layout>
+ </appender>
+ <logger name="org.apache.axis2">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="com.mchange.v2">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.hibernate.cache">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.apache.axiom">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.hibernate.jdbc">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.hibernate.SQL">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.apache.commons.httpclient">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.hibernate.tool.hbm2ddl">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.hibernate">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="de.hunsicker.jalopy.io">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="org.apache.axis2.enterprise">
+ <level value="ERROR"/>
+ </logger>
+ <logger name="httpclient.wire.header">
+ <level value="ERROR"/>
+ </logger>
+ <root>
+ <level value="DEBUG"/>
+ <appender-ref ref="FLOG2"/>
+ <appender-ref ref="CONSOLE2"/>
+ </root>
+</configuration>
Modified: trunk/webapp/webapp/openmeetings/WEB-INF/web.xml
==============================================================================
--- trunk/webapp/webapp/openmeetings/WEB-INF/web.xml (original)
+++ trunk/webapp/webapp/openmeetings/WEB-INF/web.xml Tue Oct 7 05:03:07
2008
@@ -6,6 +6,29 @@
<param-name>globalScope</param-name>
<param-value>default</param-value>
</context-param>
+
+ <!-- Custom logging like described in Paul Gregoire Patch:
+ http://gregoire.org/2008/09/18/logging-work-around/
+ THIS WILL NOT WORK for us as we can hardly rewrite all logging
statements of hibernate
+
+ -->
+ <listener>
+
<listener-class>org.red5.logging.ContextLoggingListener</listener-class>
+ </listener>
+
+ <!--
+ <filter>
+ <filter-name>LoggerContextFilter</filter-name>
+ <filter-class>org.red5.logging.LoggerContextFilter</filter-class>
+ </filter>
+
+
+ <filter-mapping>
+ <filter-name>LoggerContextFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+ -->
+
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>/WEB-INF/red5-*.xml</param-value>
@@ -25,6 +48,7 @@
<param-value>/WEB-INF/log4j.properties</param-value>
</context-param>
-->
+
<context-param>
<param-name>webAppRootKey</param-name>
<param-value>/openmeetings</param-value>
@@ -76,7 +100,7 @@
<servlet-name>Import</servlet-name>
<servlet-class>org.openmeetings.servlet.outputhandler.Import</servlet-class>
</servlet>
- <!-- Axis Settings -->
+ <!-- Axis2 Settings
<servlet>
<servlet-name>AxisServlet</servlet-name>
<servlet-class>org.apache.axis2.transport.http.AxisServlet</servlet-class>
@@ -86,6 +110,7 @@
<servlet-name>AxisAdminServlet</servlet-name>
<servlet-class>org.apache.axis2.transport.http.AxisAdminServlet</servlet-class>
</servlet>
+ -->
<servlet>
<description>MethodGateway</description>
<display-name>MethodGateway</display-name>
@@ -132,6 +157,7 @@
<servlet-name>Import</servlet-name>
<url-pattern>/Import</url-pattern>
</servlet-mapping>
+ <!-- Axis2
<servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
<url-pattern>/servlet/AxisServlet</url-pattern>
@@ -148,6 +174,7 @@
<servlet-name>AxisAdminServlet</servlet-name>
<url-pattern>/axis2-admin/*</url-pattern>
</servlet-mapping>
+ -->
<servlet-mapping>
<servlet-name>MethodGateway</servlet-name>
<url-pattern>/MethodGateway</url-pattern>
@@ -156,6 +183,7 @@
<extension>inc</extension>
<mime-type>text/plain</mime-type>
</mime-mapping>
+ <!-- Axis2
<error-page>
<error-code>404</error-code>
<location>/axis2-web/Error/error404.jsp</location>
@@ -164,6 +192,7 @@
<error-code>500</error-code>
<location>/axis2-web/Error/error500.jsp</location>
</error-page>
+ -->
<security-constraint>
<web-resource-collection>
<web-resource-name>Forbidden</web-resource-name>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
