[Bedework-commit] caldavTest r172 - in trunk: . resources
svnadmin at bedework.org
svnadmin at bedework.org
Sat Mar 12 00:00:11 EST 2011
Author: douglm
Date: 2011-03-12 00:00:06 -0500 (Sat, 12 Mar 2011)
New Revision: 172
Added:
trunk/.classpath
trunk/.project
trunk/appjars.xml
trunk/resources/
trunk/resources/bwruntest.bat
trunk/resources/bwruntest.sh
trunk/resources/log4j.xml
Removed:
trunk/deployment/
Modified:
trunk/build.xml
Log:
caldavTest now an external project
Added: trunk/.classpath
===================================================================
--- trunk/.classpath (rev 0)
+++ trunk/.classpath 2011-03-12 05:00:06 UTC (rev 172)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/bw-davio-3.7.jar"/>
+ <classpathentry kind="lib" path="lib/commons-httpclient-3.0.jar"/>
+ <classpathentry kind="lib" path="lib/commons-ssl.jar"/>
+ <classpathentry kind="output" path="trunk"/>
+</classpath>
Added: trunk/.project
===================================================================
--- trunk/.project (rev 0)
+++ trunk/.project 2011-03-12 05:00:06 UTC (rev 172)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>caldavTest</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+ <linkedResources>
+ <link>
+ <name>trunk</name>
+ <type>2</type>
+ <location>/home/douglm/eclipse-build/caldavTest/trunk</location>
+ </link>
+ </linkedResources>
+</projectDescription>
Added: trunk/appjars.xml
===================================================================
--- trunk/appjars.xml (rev 0)
+++ trunk/appjars.xml 2011-03-12 05:00:06 UTC (rev 172)
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+ Fetch or define extra jars for this application
+ =================================================================== -->
+<project name="extraJars" basedir="." default="">
+ <macrodef name="getExtraJars">
+ <sequential>
+ <delete dir="${org.bedework.temp.extrajars.dir}" />
+ <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+ <property name="bedework.home"
+ location="${project.home}/../bedework" />
+
+ <!-- Generated by this project -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="caldavtest" version="${org.bedework.caldavtest.version}"
+ projecthome="${project.home}" />
+
+ <!-- ====================== Bedework jars ============================ -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-davio" version="${org.bedework.davutil.version}"
+ projecthome="${bedework.home}/projects/davutil" />
+
+ <!-- ======================= Commons jars ============================ -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-lang" version="2.1"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-codec" version="1.3"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-httpclient" version="3.0"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-ssl"/>
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="commons-logging" />
+
+ <!-- ========================== Misc jars ============================ -->
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="log4j" version="1.2.8"/>
+ </sequential>
+ </macrodef>
+</project>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2011-03-10 05:32:48 UTC (rev 171)
+++ trunk/build.xml 2011-03-12 05:00:06 UTC (rev 172)
@@ -8,14 +8,19 @@
Authors: Mike Douglass douglm rpi.edu
-->
-<project name="caldavtest" default="build">
+<project name="caldavtest" default="deploy">
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+
<property environment="env"/>
<dirname property="project.home" file="${ant.file}"/>
+ <property name="org.bedework.project.caldavTest"
+ location="${project.home}" />
+
<property file="${project.home}/build.properties" />
<property name="bedework.home"
- location="${project.home}/../.." />
+ location="${project.home}/../bedework" />
<property name="build.dir" location="${bedework.home}/build"/>
@@ -24,31 +29,86 @@
<deftasks/>
<projectDefs name="${org.bedework.package.name}"
- version="${org.bedework.caldavtest.version}"
- subproject="true" />
+ version="${org.bedework.caldavtest.version}"/>
+ <import file="${build.dir}/loadDeployConfig.xml"/>
+
+ <import file="${project.home}/appjars.xml" />
+
+ <property name="app.resources.dir" location="${project.home}/resources"/>
+
<!-- =================================================================
init:
================================================================= -->
<target name="init">
<projectInit/>
+
+ <property name="org.bedework.project.bedework"
+ location="${project.home}/../bedework" />
+
+ <loadDeployConfig/>
- <getJar name="commons-httpclient" version="3.0" />
- <getJar name="commons-ssl" />
-
- <getJar name="bw-davio" version="${org.bedework.davutil.version}"
- project="davutil" />
-
<property name="generated.jar.file"
location="${dist.home}/${org.bedework.caldavtest.jar}-${project.version}.jar" />
</target>
+
+ <target name="build-init" depends="init">
+ <property name="org.bedework.getjar.property.prefix"
+ value="org.bedework.appjar" />
- <target name="build-source">
+ <getJar name="commons-httpclient" version="3.0" />
+ <getJar name="commons-ssl" />
+
+ <getJar name="bw-davio" version="${org.bedework.davutil.version}"
+ projecthome="${project.home}/../bedework/projects/davutil" />
+ </target>
+
+ <target name="deploy-init" depends="init">
+ <deployInit ear-name="" />
+ </target>
+
+ <target name="build-source" depends="build-init" >
<build-jar module-base="${project.home}"
jar-file="${generated.jar.file}" />
</target>
+ <target name="deploy" depends="deploy-init,build"
+ description="Deploy generated files">
+ <getExtraJars/>
+
+ <forApp name="caldavTest"
+ prefix="org.bedework.deploy"
+ appPrefix="org.bedework.app"
+ projectPrefix="org.bedework.project">
+ <sequential>
+ <property name="app.sou.dir"
+ location="${org.bedework.deploy.app.sou}" />
+
+ <propertyset id="deploy-pub-app-properties">
+ <propertyref prefix="org.bedework.app.${org.bedework.deploy.name}"/>
+ <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*"
+ to="propval.app.*"/>
+ </propertyset>
+
+ <ant antfile="${buildsh}" target="build" inheritRefs="true" >
+ <property name="app.run.shellscr"
+ location="${app.resources.dir}/bwruntest.sh" />
+
+ <property name="app.run.batscr"
+ location="${app.resources.dir}/bwruntest.bat" />
+
+ <property name="org.bedework.runsh.log4j.xml"
+ location="${app.resources.dir}/log4j.xml" />
+
+ <property name="app.global.properties.dir"
+ location="${org.bedework.carddav.tools.base}/resources" />
+ <propertyset refid="deploy-pub-app-properties" />
+ </ant>
+ </sequential>
+ </forApp>
+ </target>
+
<!-- =================================================================
javadoc.
================================================================= -->
Added: trunk/resources/bwruntest.bat
===================================================================
--- trunk/resources/bwruntest.bat (rev 0)
+++ trunk/resources/bwruntest.bat 2011-03-12 05:00:06 UTC (rev 172)
@@ -0,0 +1,33 @@
+:: Run the bedework caldav test program
+
+:: JAVA_HOME needs to be defined
+
+ at echo off
+setlocal
+
+if not "%JAVA_HOME%"=="" goto noJavaWarn
+ECHO
+ECHO
+ECHO ***************************************************************************
+ECHO Warning: JAVA_HOME is not set - results unpredictable
+ECHO ***************************************************************************
+ECHO
+ECHO
+:noJavaWarn
+
+SET cp=@CP@
+
+SET RUNCMD="%JAVA_HOME%/bin/java" -cp %cp% @CALDAVTEST-CLASS@
+
+SET APPNAME=@BW-APP-NAME@
+
+ECHO.
+ECHO.
+ECHO Bedework CalDAV test
+ECHO --------------------
+ECHO.
+
+ ECHO %RUNCMD% %2 %3 %4 %5 %6 %7 %8 %9
+ %DUMPCMD% %2 %3 %4 %5 %6 %7 %8 %9
+ECHO.
+ECHO.
Added: trunk/resources/bwruntest.sh
===================================================================
--- trunk/resources/bwruntest.sh (rev 0)
+++ trunk/resources/bwruntest.sh 2011-03-12 05:00:06 UTC (rev 172)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Run the bedework caldav test program
+
+# JAVA_HOME needs to be defined
+
+cp=.:./classes:./resources
+
+for i in lib/*
+ do
+ cp=$cp:$i
+done
+
+RUNCMD="$JAVA_HOME/bin/java -cp $cp @CALDAVTEST-CLASS@"
+
+APPNAME=@BW-APP-NAME@
+
+echo $RUNCMD $*
+$RUNCMD $*
+
Added: trunk/resources/log4j.xml
===================================================================
--- trunk/resources/log4j.xml (rev 0)
+++ trunk/resources/log4j.xml 2011-03-12 05:00:06 UTC (rev 172)
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration for testing -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.2 2005/08/16 17:19:01 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="${user.home}/logs/test.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="${test.base}/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 category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="httpclient.wire.content">
+ <priority value="INFO"/>
+ </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>
+
+ <!-- Hide all the hibernate stuff - below are some finer categories -->
+ <category name="org.hibernate">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.hibernate.type">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.hibernate.engine">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.hibernate.impl.BatcherImpl">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.hibernate.cfg">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Set bedework categories -->
+ <category name="org.bedework">
+ <priority value="DEBUG"/>
+ </category>
+
+ <!-- Set rpi categories -->
+ <category name="edu.rpi">
+ <priority value="DEBUG"/>
+ </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 ="DEBUG" />
+ <appender-ref ref="FILE"/>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+</log4j:configuration>
More information about the Bedework-commit
mailing list