[Bedework-commit] timezones r24 - in trunk: . lib lib/classes
tzutil/src/org/bedework/timezones/tzutil
svnadmin at bedework.org
svnadmin at bedework.org
Tue Apr 15 16:23:51 EDT 2008
Author: douglm
Date: 2008-04-15 16:23:49 -0400 (Tue, 15 Apr 2008)
New Revision: 24
Added:
trunk/lib/classes/
trunk/lib/classes/log4j.xml
Modified:
trunk/build.xml
trunk/tzutil/src/org/bedework/timezones/tzutil/VtoXml.java
Log:
Make this a self-contained project - add a few targets
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-04-15 19:26:38 UTC (rev 23)
+++ trunk/build.xml 2008-04-15 20:23:49 UTC (rev 24)
@@ -60,6 +60,9 @@
<property name="tzsvr.jar"
location="${dist.home}/${org.bedework.timezonessvr.jar}-${project.version}.jar" />
+ <!-- Name of our war file -->
+ <property name="propval.app.war.name" value="tzsvr" />
+
<!-- ==================== Compilation Classpath ==================== -->
<path id="compile.classpath">
@@ -145,12 +148,49 @@
<ant antfile="${build.dir}/buildwar.xml" inheritrefs="true"
target="build" >
<property name="app.sou.dir" location="${org.bedework.tzsvr.base}" />
- <property name="propval.app.war.name" value="tzsvr" />
<property name="propval.app.display.name"
value="Timezones service" />
</ant>
</target>
+ <!-- ===================== deploy Target ===============================
+ This target deploys a war file to our app server.
+ =================================================================== -->
+
+ <target name="deploy" depends="build-war" >
+ <delete dir="${deploy.dir}/${propval.app.war.name}" />
+ <delete file="${deploy.dir}/${propval.app.war.name}.war" />
+ <copy todir="${deploy.dir}"
+ file="${dist.home}/${propval.app.war.name}.war" />
+ </target>
+
+ <!-- ===================== populate Target ===============================
+ This target populates the database with timezone definitions.
+ =================================================================== -->
+
+ <target name="populate" depends="build-source" >
+ <java fork="true" dir="${basedir}"
+ classname="org.bedework.timezones.tzutil.VtoXml">
+ <classpath>
+ <pathelement path="${lib.dir}/classes"/>
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${dist.home}">
+ <include name="**/*.jar"/>
+ </fileset>
+ </classpath>
+ <arg value="-dir" />
+ <arg value="${quickstart.home}/olson/vzic-1.3/zoneinfo"/>
+ <arg value="-dsh" />
+ <arg value="${quickstart.home}/derbyhome"/>
+ <arg value="-prefix" />
+ <arg value="/OLSON"/>
+ <arg value="-init"/>
+ <arg value="-update"/>
+ </java>
+ </target>
+
<!-- ==================== Javadoc Target ===============================
The "javadoc" target creates Javadoc API documentation for the Java
classes included in your application. Normally, this is only required
Added: trunk/lib/classes/log4j.xml
===================================================================
--- trunk/lib/classes/log4j.xml (rev 0)
+++ trunk/lib/classes/log4j.xml 2008-04-15 20:23:49 UTC (rev 24)
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.5 2005/01/18 02:55:05 rpical Exp $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | website: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
+ debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+ <param name="File" value="tz.log"/>
+ <param name="Append" value="true"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- A size based file rolling appender
+ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- Set Threshold to INFO/DEBUG -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="DEBUG"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="JSR77" class="org.apache.log4j.FileAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+ <param name="Append" value="false"/>
+ <param name="File" value="${tomcat.home}/logs/jsr77.log"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ====================== -->
+ <!-- More Appender examples -->
+ <!-- ====================== -->
+
+ <!-- Buffer events and log them asynchronously
+ <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+ <appender-ref ref="FILE"/>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="SMTP"/>
+ </appender>
+ -->
+
+ <!-- EMail events to an administrator
+ <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="To" value="admin at myhost.domain.com"/>
+ <param name="From" value="nobody at myhost.domain.com"/>
+ <param name="Subject" value="JBoss Sever Errors"/>
+ <param name="SMTPHost" value="localhost"/>
+ <param name="BufferSize" value="10"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Syslog events
+ <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+ <param name="Facility" value="LOCAL7"/>
+ <param name="FacilityPrinting" value="true"/>
+ <param name="SyslogHost" value="localhost"/>
+ </appender>
+ -->
+
+ <!-- Log events to JMS (requires a topic to be created)
+ <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+ <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+ </appender>
+ -->
+
+ <!-- Log events through SNMP
+ <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
+ <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
+ <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
+ <param name="ManagementHost" value="127.0.0.1"/>
+ <param name="ManagementHostTrapListenPort" value="162"/>
+ <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
+ <param name="LocalIPAddress" value="127.0.0.1"/>
+ <param name="LocalTrapSendPort" value="161"/>
+ <param name="GenericTrapType" value="6"/>
+ <param name="SpecificTrapType" value="12345678"/>
+ <param name="CommunityString" value="public"/>
+ <param name="ForwardStackTraceWithTrap" value="true"/>
+ <param name="Threshold" value="DEBUG"/>
+ <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <appender name="CHAINSAW_CLIENT" class="org.apache.log4j.net.SocketAppender">
+ <param name="RemoteHost" value="localhost"/>
+ <param name="Port" value="4445"/>
+ <param name="LocationInfo" value="true"/>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Limit the org.apache stuff -->
+ <!--
+ <category name="org.apache.commons">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.apache.catalina.startup.TldConfig">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.apache.jasper">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.apache.struts">
+ <priority value="INFO"/>
+ </category>
+ -->
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <!--
+ <category name="org.apache.commons.digester">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <!--
+ <category name="org.apache.commons.beanutils">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!-- ical4j is noisy -->
+ <category name="net.fortuna.ical4j">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- caching is noisy too -->
+ <category name="net.sf.ehcache">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- hibernate is noisy too -->
+ <category name="org.hibernate">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Set rpi categories -->
+<!--
+ <category name="edu.rpi">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <category name="edu.rpi.cmt.access.Acl">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.bedework.calcore.AccessUtil">
+ <priority value="INFO"/>
+ </category>
+
+ <!--
+ | An example of enabling the custom TRACE level priority that is used
+ | by the JBoss internals to diagnose low level details. This example
+ | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+ | subpackages. This will produce A LOT of logging output.
+ <category name="org.jboss.system">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ <category name="org.jboss.ejb.plugins">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <priority value ="TRACE" />
+ <appender-ref ref="FILE"/>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+</log4j:configuration>
Property changes on: trunk/lib/classes/log4j.xml
___________________________________________________________________
Name: svn:eol-style
+ LF
Modified: trunk/tzutil/src/org/bedework/timezones/tzutil/VtoXml.java
===================================================================
--- trunk/tzutil/src/org/bedework/timezones/tzutil/VtoXml.java 2008-04-15 19:26:38 UTC (rev 23)
+++ trunk/tzutil/src/org/bedework/timezones/tzutil/VtoXml.java 2008-04-15 20:23:49 UTC (rev 24)
@@ -116,6 +116,10 @@
}
void close(boolean ok) throws Throwable {
+ if (tzutil == null) {
+ return;
+ }
+
if (initDb && ok) {
// We were updating a prefix
tzutil.commit();
More information about the Bedework-commit
mailing list