Author: michiel Date: 2010-07-12 17:00:12 +0200 (Mon, 12 Jul 2010) New Revision: 42871
Added: mmweb/trunk/jetty-env.xml mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml mmweb/trunk/src/main/webapp/WEB-INF/config/log/tomcat.xml Removed: mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml Modified: mmweb/trunk/pom.xml Log: jetty configuration Added: mmweb/trunk/jetty-env.xml =================================================================== --- mmweb/trunk/jetty-env.xml (rev 0) +++ mmweb/trunk/jetty-env.xml 2010-07-12 15:00:12 UTC (rev 42871) @@ -0,0 +1,62 @@ +<?xml version="1.0"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd";> +<!--This resouce configuration points to the test database--> +<Configure class="org.mortbay.jetty.webapp.WebAppContext"> + + <New class="org.mortbay.jetty.plus.naming.EnvEntry"> + <Arg type="java.lang.String">mmbase/mmbaseroot/database</Arg> + <Arg type="java.lang.String">hsqldb_csv</Arg> + <Arg type="boolean">true</Arg> + </New> + + <New class="org.mortbay.jetty.plus.naming.EnvEntry"> + <Arg type="java.lang.String">mmbase/mmbaseroot/datasource</Arg> + <Arg type="java.lang.String">jdbc/MMBase</Arg> + <Arg type="boolean">true</Arg> + </New> + + <New class="org.mortbay.jetty.plus.naming.Resource"> + <Arg>jdbc/MMBase</Arg> + <Arg> + <New class="com.mchange.v2.c3p0.ComboPooledDataSource"> + <Set name="driverClass">org.hsqldb.jdbcDriver</Set> + <Set name="jdbcUrl"><SystemProperty name="jdbcUrl" default="jdbc:hsqldb:file:data/mmbase" /></Set> + <Set name="user">sa</Set> + <Set name="password"></Set> + </New> + </Arg> + </New> + + + <!-- + Put all mmbase data files there too. + --> + <New class="org.mortbay.jetty.plus.naming.EnvEntry"> + <Arg type="java.lang.String">mmbase/mmbaseroot/datadir</Arg> + <Arg type="java.lang.String">data</Arg> + <Arg type="boolean">true</Arg> + </New> + + <New class="org.mortbay.jetty.plus.naming.Resource"> + <Arg>mail/Session</Arg> + <Arg> + <New class="org.mortbay.naming.factories.MailSessionReference"> + <Set name="user">[email protected]</Set> + <Set name="password">mmbase</Set> + <Set name="properties"> + <New class="java.util.Properties"> + <Put name="mail.smtp.host">smtp.gmail.com</Put> + <Put name="mail.smtp.port">465</Put> + <Put name="mail.smtp.auth">true</Put> + <Put name="mail.smtp.starttls.enable">true</Put> + <Put name="mail.smtp.socketFactory.class">javax.net.ssl.SSLSocketFactory</Put> + + </New> + </Set> + </New> + </Arg> + </New> + + +</Configure> + Modified: mmweb/trunk/pom.xml =================================================================== --- mmweb/trunk/pom.xml 2010-07-12 14:58:11 UTC (rev 42870) +++ mmweb/trunk/pom.xml 2010-07-12 15:00:12 UTC (rev 42871) @@ -13,6 +13,7 @@ <properties> <mmbase.version>1.9-SNAPSHOT</mmbase.version> + <jdbcUrl>jdbc:hsqldb:file:data/mmbase</jdbcUrl> </properties> @@ -45,31 +46,15 @@ <version>${mmbase.version}</version> <type>war</type> </dependency> - + <dependency> <groupId>org.mmbase</groupId> <artifactId>mmbase-email</artifactId> <version>${mmbase.version}</version> <type>war</type> </dependency> - -<!-- - <dependency> - <groupId>org.mmbase</groupId> - <artifactId>mmbase-principletracker</artifactId> - <version>${mmbase.version}</version> - <type>war</type> - </dependency> - --> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>opensymphony</groupId> <artifactId>oscache</artifactId> <version>2.4</version> @@ -149,6 +134,41 @@ </executions> </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>7.0.0.pre5</version> + <configuration> + <jettyEnvXml>${basedir}/jetty-env.xml</jettyEnvXml> + <systemProperties> + <systemProperty> + <name>com.sun.management.jmxremote</name> + <value>true</value> + </systemProperty> + <systemProperty> + <name>jdbcUrl</name> + <value>${jdbcUrl}</value> + </systemProperty> + <systemProperty> + <name>java.awt.headless</name> + <value>true</value> + </systemProperty> + </systemProperties> + </configuration> + <dependencies> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.1.2</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.7</version> + </dependency> + </dependencies> + </plugin> </plugins> </build> @@ -184,9 +204,9 @@ </activation> <dependencies> <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1</version> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1</version> </dependency> </dependencies> </profile> Deleted: mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml =================================================================== --- mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml 2010-07-12 14:58:11 UTC (rev 42870) +++ mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml 2010-07-12 15:00:12 UTC (rev 42871) @@ -1,78 +0,0 @@ -<?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/mmweb_" > -]> - -<!-- - 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="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 %-7p %c{4} %M.%L %x - %m%n" /> - <!-- very slow! Don't use for production!! --> - </layout> - </appender> - - <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 %-5p %c{4} %M.%L %x - %m%n" /> - <!-- very slow! Don't use for production!! --> - </layout> - </appender> - - <!-- 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{ISO8601} PAGE %c{4} - %m%n" /> - </layout> - </appender> - - <appender name="errormailer" class="org.apache.log4j.net.SMTPAppender" > - <param name="To" value="[email protected]" /> - <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> - -<!-- - <logger name="org.mmbase.module.builders.Properties"> - <level class="&mmlevel;" value="debug" /> - </logger> - --> - - <logger name="org.mmbase.PAGE"> - <level class="&mmlevel;" value="info" /> - </logger> - - <!-- categories --> -<!-- - <logger name="MMBASE-PAGE" additivity="false" > - <level class="&mmlevel;" value="info" /> - <appender-ref ref="pagedebug" /> - </logger> - --> - - <root> - <level class="&mmlevel;" value="info" /> - <appender-ref ref="logfile" /> - <appender-ref ref="errorfile" /> - </root> - -</log4j:configuration> Added: mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml =================================================================== --- mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml (rev 0) +++ mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml 2010-07-12 15:00:12 UTC (rev 42871) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd" [ + <!ENTITY mmlevel "org.mmbase.util.logging.log4j.Log4jLevel" > +]> + +<!-- + Example with an extra log file for only the warnings and worse. +--> + + +<log4j:configuration> +<!-- appenders --> + + <appender name="logfile" class="org.apache.log4j.ConsoleAppender" > + <param name="DatePattern" value="'.'yyyy-MM-dd" /> + <param name="Append" value="true" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-7p %c{4} %M.%L %x - %m%n" /> + <!-- very slow! Don't use for production!! --> + </layout> + </appender> + + + <root> + <level class="&mmlevel;" value="info" /> + <appender-ref ref="logfile" /> + </root> + +</log4j:configuration> Copied: mmweb/trunk/src/main/webapp/WEB-INF/config/log/tomcat.xml (from rev 42870, mmweb/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml) =================================================================== --- mmweb/trunk/src/main/webapp/WEB-INF/config/log/tomcat.xml (rev 0) +++ mmweb/trunk/src/main/webapp/WEB-INF/config/log/tomcat.xml 2010-07-12 15:00:12 UTC (rev 42871) @@ -0,0 +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/mmweb_" > +]> + +<!-- + 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="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 %-7p %c{4} %M.%L %x - %m%n" /> + <!-- very slow! Don't use for production!! --> + </layout> + </appender> + + <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 %-5p %c{4} %M.%L %x - %m%n" /> + <!-- very slow! Don't use for production!! --> + </layout> + </appender> + + <!-- 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{ISO8601} PAGE %c{4} - %m%n" /> + </layout> + </appender> + + <appender name="errormailer" class="org.apache.log4j.net.SMTPAppender" > + <param name="To" value="[email protected]" /> + <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> + +<!-- + <logger name="org.mmbase.module.builders.Properties"> + <level class="&mmlevel;" value="debug" /> + </logger> + --> + + <logger name="org.mmbase.PAGE"> + <level class="&mmlevel;" value="info" /> + </logger> + + <!-- categories --> +<!-- + <logger name="MMBASE-PAGE" additivity="false" > + <level class="&mmlevel;" value="info" /> + <appender-ref ref="pagedebug" /> + </logger> + --> + + <root> + <level class="&mmlevel;" value="info" /> + <appender-ref ref="logfile" /> + <appender-ref ref="errorfile" /> + </root> + +</log4j:configuration> _______________________________________________ Cvs mailing list [email protected] http://lists.mmbase.org/mailman/listinfo/cvs
