# # ChangeLog for /trunk/build # # Generated by Trac 0.9.3 # 05/24/13 08:54:26 # 10/16/10 22:14:09 douglm [3011] * trunk/build/quickstart/linux/bw: Add excgsynch target 10/07/10 15:27:05 bleibson [3006] * trunk/build/quickstart/linux/bw: Add -deployaddressbook to usage statement. 10/07/10 15:16:39 bleibson [3005] * trunk/build/quickstart/linux/bw: new target for bw script: -deployaddressbook. Invoking bw with that argument executes a script that copies the javascript client to the jboss default server root. 09/04/10 22:34:59 douglm [3001] * trunk/build/buildfilters.xml: * trunk/config/bwbuild/jboss-h2/cal.options.xml: * trunk/config/bwbuild/jboss-h2/cal.properties: * trunk/config/bwbuild/jboss-mysql/cal.options.xml: * trunk/config/bwbuild/jboss-mysql/cal.properties: * trunk/config/bwbuild/jboss-postgresql/cal.options.xml: * trunk/config/bwbuild/jboss-postgresql/cal.properties: * trunk/config/bwbuild/jboss/cal.options.xml: * trunk/config/bwbuild/jboss/cal.properties: * trunk/deployment/genkeys: * trunk/deployment/genkeys/shellscr: * trunk/deployment/genkeys/shellscr/META-INF: * trunk/deployment/genkeys/shellscr/META-INF/jboss-service.xml: * trunk/deployment/genkeys/shellscr/META-INF/jboss-structure.xml: * trunk/deployment/genkeys/shellscr/appjars.xml: * trunk/deployment/genkeys/shellscr/build.xml: * trunk/deployment/genkeys/shellscr/resources: * trunk/deployment/genkeys/shellscr/resources/log4j.xml: New key generator service available from jmx console 08/25/10 16:26:19 douglm [2989] * trunk/build/quickstart/linux/startjboss: Method of setting filtering log levels doesn't work. Use a simpler approach - needs an update to jboss-log4j.xml 08/20/10 11:01:03 douglm [2983] * trunk/build/quickstart/linux/startjboss: * trunk/build/quickstart/windows/startjboss.bat: * trunk/config/bwbuild/jboss-h2/activemq-broker-config.xml: * trunk/config/bwbuild/jboss-h2/activemq-jms-ds.xml: * trunk/config/bwbuild/jboss-h2/activemq-ra.xml: * trunk/config/bwbuild/jboss-mysql/activemq-broker-config.xml: * trunk/config/bwbuild/jboss-mysql/activemq-jms-ds.xml: * trunk/config/bwbuild/jboss-mysql/activemq-ra.xml: * trunk/config/bwbuild/jboss-postgresql/activemq-broker-config.xml: * trunk/config/bwbuild/jboss-postgresql/activemq-jms-ds.xml: * trunk/config/bwbuild/jboss-postgresql/activemq-ra.xml: * trunk/config/bwbuild/jboss/activemq-broker-config.xml: * trunk/config/bwbuild/jboss/activemq-jms-ds.xml: * trunk/config/bwbuild/jboss/activemq-ra.xml: Use a system variable to set activemq bedework broker uri - changes all configs Change startjboss scripts to allow setting of activemquri at startup. Also allow setting of portoffset 08/10/10 00:16:23 douglm [2973] * trunk/build/buildsh.xml: Small fixes: Ensure access settings are not trnaferred on copy as per WebDAV ACL Fixes to schedule-change Larger fix: UpdateCalendarAction change to ensure topical area switch gets saved 07/20/10 11:46:17 douglm [2955] * trunk/build/platforms/jbossService.xml: * trunk/build/platforms/jbossWar.xml: * trunk/build/platforms/runnableService.xml: * trunk/config/bwbuild/jboss-postgresql/cal.options.xml: * trunk/config/bwbuild/jboss-postgresql/carddav.options.xml: * trunk/deployment/appjars.xml: Updates to handle vcard driven preferences Add vcard to the libraries so we can process vcards from carddav Update carddav options. Change directory info to include new properties and link to it from the principal object Add directory methods to get the information Add a carddav client and provide a method to get the card for a principal Fix to webdav - generating bad hrefs Undo bad change to attendees.jsp 06/29/10 10:32:06 douglm [2938] * trunk/build/platforms/jbossService.xml: * trunk/config/bwbuild/jboss-postgresql/bedework-card-ds.xml: * trunk/config/bwbuild/jboss-postgresql/cal.properties: * trunk/config/bwbuild/jboss-postgresql/carddav.options.xml: * trunk/config/bwbuild/jboss/bedework-card-ds.xml: * trunk/config/bwbuild/jboss/cal.properties: * trunk/deployment/caldavTest/shellscr/resources/bwruntest.sh: Skip a couple of jars in jbossService.xml Add a carddav datasource definition to configurations and update properties appropriately Fix up prefixing in caldav test so that it can be used to test carddav. Add some carddav tests Comment out the javadocs group definitions for calendarapi - it was breaking. 06/15/10 23:23:44 douglm [2936] * trunk/build/platforms/jboss.xml: Missing jar file in 3.6 build. Also small comment fix 06/04/10 01:22:43 douglm [2929] * trunk/build/platforms/jbossService.xml: * trunk/build/platforms/jbossWar.xml: * trunk/build/platforms/runnableService.xml: * trunk/build/platforms/tomcat5War.xml: * trunk/deployment/appjars.xml: Update to latest version of ical4j + some local changes. Exposed a bug in SysIntfReader. Use ical4j calculateRecurrenceSet instead of copied and modified code. Added a copy of ical4j CalendarBuilder to allow bedework handling of timezones More fixes to recurrences - especially all day. Recurrenceids are stored incorrectly. Will take a schema change and dump/restore to fix them. Leave till 3.7 really does branch out. Applied a temp patch to make things better. Fixed a small bug that showed up in the collections cache. Minor change to ChangeTable to try to fix some discrepencies with attendees - not working. Also supress checking of recurring fields for overrides. Bit of refactoring of scheduling code - moved organizer specific code into OrganizerSchedulingHandler 05/31/10 22:01:08 douglm [2924] * trunk/build/quickstart/linux/bw: * trunk/build/quickstart/windows/bw.bat: log4j on the classpath caused problems for windows users. Take off the classpath for now. 04/23/10 00:37:43 douglm [2876] * trunk/build/buildwar.xml: Disable inclusion of any classes in skeleton war 03/05/10 14:46:22 douglm [2849] * trunk/build/quickstart/linux/startjboss: * trunk/build/quickstart/windows/startjboss.bat: Reduce default head and newgen sizes for jboss start 03/01/10 10:45:58 douglm [2829] * trunk/build/platforms/geronimo.xml: * trunk/build/platforms/jboss.xml: * trunk/build/platforms/jbossWar.xml: * trunk/build/platforms/tomcat5.xml: * trunk/config/bwbuild/jboss/bedework-ds.xml: * trunk/config/bwbuild/jboss/cal.properties: * trunk/deployment/build.xml: * trunk/deployment/termination/build.xml: Create new platform specific termination build files. Move some stuff out of the web termination and the deployment build.xml into the termination build files. Allow the bedework ds config to be supplied in the configuration directory and copied into the server 02/18/10 11:29:13 douglm [2786] * trunk/build/quickstart/linux/startjboss: Add debugging parameters to the start script 02/12/10 15:25:25 johnsa [2783] * trunk/build/quickstart/linux/startjboss: * trunk/build/quickstart/windows/startjboss.bat: port startjboss script enhancements to windows (ability to set JVM settings) and update usage text 02/12/10 14:09:21 douglm [2780] * trunk/build/quickstart/linux/startjboss: Minor fix to usage 02/12/10 13:52:55 douglm [2779] * trunk/build/quickstart/linux/startjboss: -- 02/05/10 20:33:03 douglm [2770] * trunk/build.xml: * trunk/build/dirTools.xml: Make sure we preserve libraries in quickstart for the directory tools Fix dirTools.xml to use them 02/02/10 15:23:44 johnsa [2751] * trunk/build/quickstart/linux/bw: * trunk/build/quickstart/windows/bw.bat: DONE 496: Port bw and runjboss script to Windows http://www.bedework.org/trac/bedework/ticket/496 01/29/10 15:15:21 douglm [2740] * trunk/build/buildsh.xml: * trunk/deployment/caldavTest/shellscr/build.xml: * trunk/deployment/dumprestore/shellscr/build.xml: Fix build - shellscr data test doesn't work 01/29/10 13:35:04 johnsa [2738] * trunk/build/quickstart/windows/startjboss.bat: startjboss.bat script comleted - 496: Port bw and startjboss script to Windows http://www.bedework.org/trac/bedework/ticket/496 01/28/10 23:14:26 douglm [2735] * trunk/build/quickstart/linux/startjboss: * trunk/config/bwbuild/jboss/cal.properties: * trunk/deployment/dumprestore/shellscr/META-INF/jboss-service.xml: * trunk/deployment/dumprestore/shellscr/build.xml: Further fixes to startjboss Copy init data into the jboss data directory 01/28/10 16:45:08 douglm [2734] * trunk/build/quickstart/linux/startjboss: Comment change 01/28/10 16:25:18 douglm [2733] * trunk/build/quickstart/linux/startjboss: Allow port shifting 01/27/10 13:40:56 douglm [2719] * trunk/build/platforms/jbossWar.xml: * trunk/config/bwbuild/default/cal.properties: * trunk/config/bwbuild/jboss/activemq-broker-config.xml: * trunk/config/bwbuild/jboss/activemq-jms-ds.xml: * trunk/config/bwbuild/jboss/activemq-ra.xml: * trunk/config/bwbuild/jboss/activemq.xml: * trunk/config/bwbuild/jboss/cal.properties: Update the activemq configuration from files in the config directory. Add feeder app to build 01/27/10 00:48:44 douglm [2718] * trunk/build/platforms/jbossWar.xml: * trunk/build/quickstart/linux/startjboss: Fix trivial problem that had me stalled all day 01/26/10 15:04:20 douglm [2717] * trunk/build/quickstart/linux/startjboss: * trunk/deployment/build.xml: Some fixes to broken build. Also a startjboss script 01/26/10 10:27:16 douglm [2716] * trunk/build/platforms/jbossService.xml: * trunk/build/platforms/runnableService.xml: * trunk/build/platforms/tomcat5Service.xml: * trunk/config/bwbuild/jboss/cal.properties: Allow components to be marked as runnable - only test suites are affected. 01/25/10 22:42:42 douglm [2714] * trunk/build/platforms/jbossService.xml: * trunk/config/bwbuild/jboss/cal.properties: * trunk/deployment/build.xml: * trunk/deployment/dumprestore/shellscr/build.xml: * trunk/deployment/indexer/shellscr/build.xml: * trunk/deployment/sysevlog/shellscr/build.xml: deploy target for jboss now copies sars and ear into a new deploy directory 01/25/10 16:07:25 douglm [2711] * trunk/build/platforms/tomcat5War.xml: * trunk/config/bwbuild/default/cal.properties: * trunk/config/bwbuild/default/sysevents.properties: * trunk/config/bwbuild/jboss/cal.properties: * trunk/config/bwbuild/jboss/sysevents.properties: * trunk/config/bwbuild/liferay5/cal.properties: * trunk/config/bwbuild/liferay5/sysevents.properties: * trunk/config/bwbuild/mysql/cal.properties: * trunk/config/bwbuild/mysql/sysevents.properties: * trunk/config/bwbuild/oracle10g/cal.properties: * trunk/config/bwbuild/oracle10g/sysevents.properties: * trunk/deployment/build.xml: * trunk/deployment/sysevlog/shellscr/META-INF/jboss-service.xml: Now appears to build a deployable and runnable tomcat5 version as well as a bedework version. system events logger is now working. 01/22/10 11:32:19 douglm [2698] * trunk/build/buildwar.xml: * trunk/build/platforms/geronimoWar.xml: * trunk/build/platforms/jbossWar.xml: * trunk/build/platforms/tomcat5War.xml: * trunk/config/bwbuild/jboss/cal.properties: * trunk/deployment/build.xml: * trunk/deployment/feeder/jboss: * trunk/deployment/feeder/portlet: * trunk/deployment/feeder/webapp/build.xml: * trunk/deployment/publiccaldav/webapp/build.xml: * trunk/deployment/termination/shellscr/build.xml: * trunk/deployment/termination/webapp/build.xml: * trunk/deployment/tzsvr/webapp/build.xml: * trunk/deployment/usercaldav/webapp/build.xml: * trunk/deployment/webadmin/webapp/build.xml: * trunk/deployment/webconfig/webapp/build.xml: * trunk/deployment/webpublic/webapp/build.xml: * trunk/deployment/websubmit/webapp/build.xml: * trunk/deployment/webuser/webapp/build.xml: Rework the build process to make war/ear differences part of the imported platform specific build files. Added a resource reference to the web.xml files for jms and updated the jboss-web files to link that in to a jboss resource. This probably needs some more parameterization. 01/20/10 15:22:47 douglm [2695] * trunk/build/buildfilters.xml: * trunk/build/buildsh.xml: * trunk/build/platforms/geronimoService.xml: * trunk/build/platforms/jbossService.xml: * trunk/build/platforms/jbossWar.xml: * trunk/build/platforms/tomcat5Service.xml: * trunk/config/bwbuild/default/cal.options.xml: * trunk/config/bwbuild/default/cal.properties: * trunk/config/bwbuild/default/sysevents.properties: * trunk/config/bwbuild/jboss/activemq.xml: * trunk/config/bwbuild/jboss/cal.options.xml: * trunk/config/bwbuild/jboss/cal.properties: * trunk/config/bwbuild/jboss/sysevents.properties: * trunk/config/bwbuild/liferay5/sysevents.properties: * trunk/config/bwbuild/mysql/cal.options.xml: * trunk/config/bwbuild/mysql/sysevents.properties: * trunk/config/bwbuild/oracle10g/cal.options.xml: * trunk/config/bwbuild/oracle10g/sysevents.properties: * trunk/deployment/caldavTest/shellscr/META-INF: * trunk/deployment/caldavTest/shellscr/META-INF/jboss-service.xml: * trunk/deployment/dumprestore/shellscr/META-INF: * trunk/deployment/dumprestore/shellscr/META-INF/jboss-service.xml: * trunk/deployment/dumprestore/shellscr/build.xml: * trunk/deployment/indexer/shellscr/META-INF: * trunk/deployment/indexer/shellscr/META-INF/jboss-service.xml: * trunk/deployment/indexer/shellscr/build.xml: * trunk/deployment/inoutsched/shellscr/META-INF: * trunk/deployment/inoutsched/shellscr/META-INF/jboss-service.xml: * trunk/deployment/inoutsched/shellscr/build.xml: * trunk/deployment/sysevlog/shellscr/META-INF: * trunk/deployment/sysevlog/shellscr/META-INF/jboss-service.xml: * trunk/deployment/sysevlog/shellscr/build.xml: * trunk/deployment/testsuite/shellscr/META-INF: * trunk/deployment/testsuite/shellscr/META-INF/jboss-service.xml: * trunk/deployment/testsuite/shellscr/build.xml: JBoss support. First stage in deploying applications as services in jboss. Restructure shell script builds to provide platform specific options. Use that feature to create jboss services (sar files) that can be deployed within the server. All this work is based on jboss 5.1.0.GA In addition there is some partial support for geronimo. This is not complete 01/17/10 18:57:07 douglm [2680] * trunk/build/platforms/geronimoWar.xml: * trunk/config/bwbuild/geronimo: * trunk/config/bwbuild/geronimo/activemq.xml: * trunk/config/bwbuild/geronimo/build.properties: * trunk/config/bwbuild/geronimo/cal.options.xml: * trunk/config/bwbuild/geronimo/cal.properties: * trunk/config/bwbuild/geronimo/carddav.options.xml: * trunk/config/bwbuild/geronimo/context.xml: * trunk/config/bwbuild/geronimo/sysevents.properties: Take a look at running under geronimo - discovered block to progress 01/15/10 15:18:24 douglm [2675] * trunk/build/build.xml: Need to create bedework/lib directory for new installs of source 01/12/10 16:18:49 douglm [2655] * trunk/build.properties: * trunk/build.xml: * trunk/build/build.xml: * trunk/build/platforms/tomcat5War.xml: * trunk/build/quickstart/antlib/rpiutil-3.6.jar: * trunk/build/src: * trunk/build/src/org: * trunk/build/src/org/bedework: * trunk/build/src/org/bedework/build: * trunk/build/src/org/bedework/build/BuildBw.java: * trunk/util/svncopy.sh: Attempt at a building program. Small comment change to tomcat build. Update of svncopy script 01/08/10 15:20:19 bleibson [2649] * trunk/build/quickstart/linux/bw: o cachedfeeder-1.0 is now cachedfeeder in the quickstart. 01/08/10 15:02:41 bleibson [2648] * trunk/build/quickstart/linux/bw: o add -deployurlbuilder target 01/05/10 16:33:07 douglm [2629] * trunk/build/quickstart/linux/bw: Add -client option to script so we can build and run the client application. 01/05/10 13:49:25 douglm [2625] * trunk/build.properties: * trunk/build.xml: * trunk/build/quickstart/linux/bw: * trunk/deployutil/build.xml: More fixes after separatng out tzsvr 12/30/09 14:13:59 bleibson [2591] * trunk/build/quickstart/linux/bw: o make sure the help and the code agree. 12/29/09 23:02:33 douglm [2588] * trunk/build/platforms/jbossWar.xml: * trunk/config/bwbuild/jboss/build.properties: * trunk/config/bwbuild/jboss/cal.properties: * trunk/config/bwbuild/liferay5/build.properties: Jboss build was broken - platform set incorrectly 12/29/09 10:04:38 bleibson [2577] * trunk/build/quickstart/linux/bw: o added build support for the web page caching system. 12/28/09 16:27:54 johnsa [2572] * trunk/build/quickstart/windows/bw.bat: typo 12/28/09 14:27:34 johnsa [2564] * trunk/build/quickstart/windows/bw.bat: begin porting windows scripts 12/28/09 11:54:31 douglm [2563] * trunk/build/quickstart/linux/bw: Add option to display the build information from the tz server. 12/28/09 01:28:09 douglm [2562] * trunk/build/quickstart/linux/bw: Add builtTime to generated tz data and use as etag value 12/27/09 19:35:43 douglm [2560] * trunk/build/quickstart/build.xml: * trunk/build/quickstart/linux/bw: Build script to generate the tzdata.zip file needed for the timezones server. Execute with command of form ./bw -zoneinfo -version 2009t -tzdata /home/douglm/drop2/calendar/timezones/olson/tzdata2009t.tar.gz 12/23/09 11:55:33 douglm [2540] * trunk/build/quickstart/build.xml: * trunk/build/quickstart/run-indexer.xml: * trunk/config/bwbuild/default/cal.properties: * trunk/config/bwbuild/jboss/cal.properties: * trunk/config/bwbuild/mysql/cal.properties: * trunk/config/bwbuild/oracle10g/cal.properties: Handle entity and collection deletion in indexer 12/21/09 14:44:04 douglm [2524] * trunk/build/quickstart/linux/bw: Add a -reindex option to the bw script to reindex the data from the quickstart. Changes to the indexer to index as the owner of collections - to allow access control to limit access correctly. Fix the indexer factory - was missing a "/" in the path 12/14/09 16:28:11 douglm [2484] * trunk/build/quickstart/linux/bw: Add monitor to the bw build script 12/09/09 00:30:57 douglm [2430] * trunk/build/buildwar.xml: Fix build after removing unnecessary WEB-INF/classes 12/08/09 21:51:34 douglm [2429] * trunk/build/buildwar.xml: Create a servlet.properties file in buildwar.xml We cannot have multiple servlet.properties files in a ear file as they all end up on the same classpath 11/16/09 16:17:42 douglm [2407] * trunk/build.xml: * trunk/build/quickstart/build.xml: Add a test, fix a test New test to ensure instances keep track of start/end dates of master 09/29/09 00:53:37 johnsa [2390] * trunk/build/quickstart/windows/bw.bat: correct bw.bat user home variable 08/23/09 19:36:39 douglm [2370] * trunk/build/quickstart/linux/bw: Use bw script to build separate sub-projects 08/21/09 11:39:42 douglm [2368] * trunk/build/buildsh.xml: * trunk/build/buildwar.xml: * trunk/config/bwbuild/default/build.properties: * trunk/config/bwbuild/default/sysevents.properties: Use a separate properties file for activemq jndi configuration. Avoid issues with systems with their own jndi config. 08/13/09 11:40:59 douglm [2342] * trunk: * trunk/bedework.importorder: * trunk/build.xml: * trunk/build/buildsh.xml: * trunk/build/buildwar.xml: * trunk/build/quickstart/build.xml: * trunk/build/quickstart/linux/bw: * trunk/build/quickstart/run-activemq.xml: * trunk/build/quickstart/run-crawler.xml: * trunk/build/quickstart/run-hsqldb.xml: * trunk/build/quickstart/run-indexer.xml: * trunk/build/quickstart/run-inoutscheduler.xml: * trunk/build/quickstart/run-logger.xml: * trunk/build/quickstart/run-tomcat.xml: * trunk/config/bwbuild/default/activemq.xml: * trunk/config/bwbuild/default/build.properties: * trunk/config/bwbuild/default/cal.options.xml: * trunk/config/bwbuild/default/cal.properties: * trunk/config/bwbuild/default/context.xml: * trunk/config/bwbuild/default/jndi.properties: * trunk/deployment/appjars.xml: * trunk/deployment/dumprestore/shellscr/appjars.xml: * trunk/deployment/indexer: * trunk/deployment/indexer/shellscr: * trunk/deployment/indexer/shellscr/appjars.xml: * trunk/deployment/indexer/shellscr/build.xml: * trunk/deployment/indexer/shellscr/resources: * trunk/deployment/indexer/shellscr/resources/bwrun.bat: * trunk/deployment/indexer/shellscr/resources/bwrun.sh: * trunk/deployment/indexer/shellscr/resources/log4j.xml: * trunk/deployment/inoutsched: * trunk/deployment/inoutsched/shellscr: * trunk/deployment/inoutsched/shellscr/appjars.xml: * trunk/deployment/inoutsched/shellscr/build.xml: * trunk/deployment/inoutsched/shellscr/resources: * trunk/deployment/inoutsched/shellscr/resources/bwrun.bat: * trunk/deployment/inoutsched/shellscr/resources/bwrun.sh: * trunk/deployment/inoutsched/shellscr/resources/log4j.xml: * trunk/deployment/publiccaldav/webapp/appjars.xml: * trunk/deployment/sysevlog: * trunk/deployment/sysevlog/shellscr: * trunk/deployment/sysevlog/shellscr/appjars.xml: * trunk/deployment/sysevlog/shellscr/build.xml: * trunk/deployment/sysevlog/shellscr/resources: * trunk/deployment/sysevlog/shellscr/resources/bwrun.bat: * trunk/deployment/sysevlog/shellscr/resources/bwrun.sh: * trunk/deployment/sysevlog/shellscr/resources/log4j.xml: * trunk/deployment/testsuite/shellscr/appjars.xml: * trunk/deployment/testsuite/shellscr/resources/bwruntest.sh: * trunk/deployment/usercaldav/webapp/appjars.xml: * trunk/deployment/webadmin/webapp/appjars.xml: * trunk/deployment/webpublic/webapp/appjars.xml: * trunk/deployment/websubmit/webapp/appjars.xml: * trunk/deployment/webuser/webapp/appjars.xml: * trunk/docs/README: * trunk/docs/README.txt: Import of a number of features under development into the trunk. This is the start of development for version 3.6 CalDAV: Now has no dependencies on core bedework classes. Involved a significant amount of refactoring. CalDAV implementations: are now a separate project. This project does have dependencies, as it should. JMS: Bedework now emits system events on a JMS notification queue. A number of listeners are being developed to move certain bedework functions outboard of the core engine. Currently we havea logging listener, the inbox/outbox scheduler and a partially built indexer. The JMS implementation is Apache activemq The detailed comments from the merged code follow: ------------------------------------------------------------------------------------------------------------------ CalDAV refactor: Remove BwDateTime from SysIntf Rename calfacade TimeRange to BwTimeRange Changed getFreeBusy to use ical4j Period Subsequent changes: New package org.bedework.caldav.util and class ParseUtil - copy of calfacade....util.cml.CalDavParseUtil Change all the SysIntf implementations to use the new parameters Also change CaldavBwIntf to use TimeRange for the freebusy url Move CalDAVConfig into the caldav code - remove from CalFacade New options factory class in caldav Move options file up a level into classes/properties from classes/calendar/properties Options don't fail if class not found - just warn Increment build version on CalDAV and WebDAV Add method to SysIntf to convert an iCal4j Calendar to its String form. Also move ComponentWrapper into rpiutil to make it available to CalDAV Remove use of BwDateTime from RetrievalMode and subclasses Add a test. Moved CalDAV implementations into a separate project - allowing CalDAV to be built separately from the bedework core. Move timnezones support out of CalFacade and into edu.rpi package Move some filtering classes and interfaces out of the bedework core and into external libraries and the CalDAV project. Entity type definitions: CalFacadeDefs and CalDAVEvent had competing definitions. Added the CalFacadeDefs version to edu.rpi.cmt.calendar.IcalDefs. Removed the CalDAVEvent versions. This means the values change for CalDAV but hey aren't stored anywhere. Make PropertyInfo separate class from PropertyInfoIndex. Move PropertyIndex into edu.rpi.cmt.calendar. Also move some of the information out of ProeprtyInfo into PropertyInfoIndex Moved most filter classes into caldav.util Copied a number of CalFacade filter classes into caldav.util.filter, renamed the Filter class to Filterhandler Misinterpreted tzid: All timeranges are expressed in UTC. The optional timezone following the filter is used for local (floating) datetime values. Requires access to timezone conversion - moved CalTimezones and CalTimezonesImpl into rpi util package. Created new project caldavimpl Moved google, domino, exchage and bedework implementations into that project ------------------------------------------------------------------------------------------------------------------ JMS Listeners Add new indexer project Add some administrative support methods to the core system. These provide paged retrieval of child name/paths for collections allowing crawlers and the like to wander around the data structure. Also add some options for the new indexer project which makes use of these Simplify notification classes and implement a jms notifications handler. This requires activemq to be running Implement a jms consumer which acts as a system events logger Redo in/outbox scheduler as a listener on a JMS queue Create a new deployable module for it. Change startup to start each separate module as well as the 'infrastructure' components. activemq run script now copies the activemq config out of the bedework build configuration ------------------------------------------------------------------------------------------------------------------ Indexing changes - many already in 3.5: When publishing, unindex the event from the user index and reindex in the public index. Further changes to fix lucene indexing of overrides. SIgnificant changes to indexing to handle issues with recurrence overides. Associated fix to BwEventAnnotation to fix bug with handling of overridden collections. ------------------------------------------------------------------------------------------------------------------ Other changes - many already in 3.5: subversion copy utility was adding timezones as a project. Remove unwanted project Remove above project from externals Fix new bug in CoreEvents - not checking for null timezone. Updated system parameters code to use and maintain a cached copy of the settings Add a refresh timeout to the syspars get Fix missing null check in CalFacadeUtil.eqobjval Fix bug renaming or moving collection objects. Fix bad owner check in CalSvcDb Fix problem setting cost in admin and submit client Fix 500 problem with freebusy url when no access to user Need a cdata around alias url when emitting collection for jsp/xml Fix search bug for user client. Not setting principal Set disabled flag for bad url in subscription Fix access routines - not correctly handling NONE access. - also add extra test Fix null-pointer in export action CalDAV: Better exception handling for getPrincipal synch around put/get in EvaluatedAccessCache Fix CalDAV so that references to an alias are filtered correctly Disable caching of collections in the hbm files. When deployed as separate aplications this is causing delays and invalid relations to appear. It may be possible to enable this if all applications share a common cache - e.g. jboss ear or with hibernate as part of the container. Remove unneccessary check on calendar access check in coreEvents.getEvent Remove use of <user-home>/bedework.build.properties 08/12/09 13:36:06 douglm [2331] * trunk/build/quickstart/run-activemq.xml: * trunk/build/quickstart/run-crawler.xml: * trunk/build/quickstart/run-inoutscheduler.xml: * trunk/build/quickstart/run-logger.xml: Prepare for merge from douglm development branch 04/25/09 11:38:19 johnsa [2146] * trunk/build/quickstart/windows/addgroup.bat: * trunk/build/quickstart/windows/addgroupmember.bat: * trunk/build/quickstart/windows/adduser.bat: * trunk/build/quickstart/windows/initdir.bat: fixing up windows bat files to account for spaces in paths 04/22/09 11:32:28 johnsa [2142] * trunk/build/quickstart/windows/bw.bat: fix up quoting in windows bat file to account for spaces in directory paths 04/20/09 14:46:57 douglm [2141] * trunk/build/buildsh.xml: * trunk/build/buildwar.xml: * trunk/deployment/appjars.xml: Noticed tha event annotations were getting updated even when no actual updates were taking place. Determined it was hibernate bug http://opensource.atlassian.com/projects/hibernate/browse/HHH-2606 Upgraded to hibernate 3.3.1 - not a bad thing anyway. Discovered the hadn't fixed the bug even though it's about 2years old now. Modified annotation class to use String fro the emptyFlags property instead of the more appropriate char[]. XMl schema changed but not the db schema. 03/12/09 16:04:42 douglm [2107] * trunk/build/quickstart/build.xml: Change to use waitFor instead of sleep. Peter DiCamillo noted that OsX and others exhibited problems at startup and created and tested the change 03/02/09 15:44:03 douglm [2085] * trunk/build/quickstart/run-tomcat.xml: More access class immutability. Caching of ACEs to try to reduce jvm churn. Increase permgen space in quickstart - was still set to default. Fix logging in access tests 02/12/09 12:21:02 douglm [2062] * trunk/build/buildwar.xml: * trunk/deployment/appjars.xml: xalan seemed to be broken. Replaced jar in downloads and added serializer.jar 02/12/09 00:33:19 douglm [2060] * trunk/build/quickstart/build.xml: Add event failing when adding to aliased calendar. hadn't dereffed the alias. 02/10/09 16:51:32 douglm [2053] * trunk/build/loadDeployConfig.xml: * trunk/build/quickstart/linux/bw: * trunk/config/bwbuild/default/build.properties: * trunk/config/bwbuild/default/carddav.options.xml: * trunk/config/bwbuild/jboss/carddav.options.xml: * trunk/config/bwbuild/liferay5/carddav.options.xml: * trunk/deployment/appjars.xml: Allow carddav to be built from the bw script 02/09/09 22:23:42 douglm [2052] * trunk/build.xml: * trunk/build/buildsh.xml: * trunk/build/buildwar.xml: * trunk/deployment/appjars.xml: Extract notifications code from within calintf and calsvc and make it a separate package. No real functional difference as yet 01/30/09 15:59:42 douglm [2051] * trunk/build/quickstart/build.xml: Put delay into start target so that dir server gets running before tomcat starts 01/28/09 17:39:55 johnsa [2049] * trunk/build/quickstart/linux/adduser: * trunk/build/quickstart/windows/adduser.bat: public and user clients: - add xproperties to all event output - change display subscriptions (aliases) instead of calendar in general views - add some xsl utilities scripts: - update windows adduser script 01/28/09 12:13:28 douglm [2048] * trunk/build/dirTools.xml: * trunk/build/quickstart/linux/install: * trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkAttendees.js: * trunk/docs/quickstart.odt: Fixes to install script, some docs and address widget 01/27/09 21:15:32 douglm [2046] * trunk/build/dirTools.xml: * trunk/build/quickstart/linux/adduser: Add caladdr parameter to adduser 01/27/09 15:02:45 douglm [2044] * trunk/build.xml: * trunk/build/dirTools.xml: Fix up adduser target 01/16/09 11:48:11 douglm [2025] * trunk/build.xml: * trunk/build/quickstart/antlib/log4j-1.2.8.jar: * trunk/build/quickstart/build.xml: New runnable tool to allow manipulation of large amounts of data, e.g. move all events from one calendar to another. 01/15/09 22:13:14 douglm [2024] * trunk/build.xml: * trunk/build/quickstart/antlib: * trunk/build/quickstart/antlib/log4j.xml: * trunk/build/quickstart/build.xml: * trunk/build/quickstart/linux/bw: Try different loggers and listeners for ant Set level for echo task 01/14/09 23:32:42 douglm [2022] * trunk/build/quickstart/linux/addgroup: * trunk/build/quickstart/linux/addgroupmember: * trunk/build/quickstart/linux/adduser: * trunk/build/quickstart/linux/initdir: More move calendar changes - can now move content Chack JAVA_HOME early in some scripts 01/06/09 11:43:16 douglm [2012] * trunk/build/quickstart/install.xml: * trunk/build/quickstart/linux/install: Install now runs to completion with a fresh empty system installed 01/05/09 23:04:34 douglm [2011] * trunk/build.xml: * trunk/build/quickstart/linux/adduser: * trunk/build/quickstart/linux/install: Fix install script and dirtools so that we can add a user 01/05/09 15:46:38 douglm [2008] * trunk/build/quickstart/install.xml: * trunk/build/quickstart/linux/bw: * trunk/build/quickstart/linux/install: Changes to timezones had brokena clean build. Split CalTimeZones into an abstract class + implementation. Changed annotation build to skip the above implemtnation. Fix to restore to skip owner info in timezones. Changed DirToll to allow deletion of ldap hierarchies. Fixes to the install process. 12/17/08 15:53:02 douglm [1988] * trunk/build.xml: * trunk/build/buildfilters.xml: * trunk/config/bwbuild/default/cal.options.xml: * trunk/config/bwbuild/default/cal.properties: * trunk/config/configs/democal.options.xml: * trunk/deployment/appjars.xml: Updated version of ical4j Further changes to support draft 06 of CalDAV sched This update requires schema changes to support some new scheduling properties 11/14/08 14:37:04 douglm [1969] * trunk/build/buildsh.xml: Comment change 11/14/08 01:39:17 douglm [1968] * trunk/build/buildsh.xml: * trunk/build/buildwar.xml: * trunk/build/quickstart/linux/install: * trunk/deployment/appjars.xml: 1. Move options classes into rpiutil to make them availabkle to other packages. 2. Make changes to the WebDAV classes to facilitate building of extra WebDAV based services (such as CardDAV) 11/07/08 16:19:05 douglm [1953] * trunk/build.xml: * trunk/build/quickstart/linux/install: * trunk/config/build.xml: * trunk/deployutil/build.xml: Move some build stuff into its own repository. Change build files ot use same properties throughout 11/07/08 11:21:56 douglm [1952] * trunk/build.xml: * trunk/build/buildjar.xml: * trunk/build/getJar.xml: * trunk/deployment/build.xml: Set things up so we use a common cache for all quickstart jars 11/07/08 10:32:13 douglm [1951] * trunk: * trunk/build.properties: * trunk/build.xml: * trunk/build/buildjar.xml: * trunk/build/getJar.xml: * trunk/build/quickstart/install.xml: * trunk/build/quickstart/linux/install: * trunk/build/quickstart/run-dir.xml: * trunk/deployment/appjars.xml: Changes to the build process an adding some install scripts 11/05/08 16:47:52 johnsa [1950] * trunk/build/quickstart/windows/adduser.bat: last update for adduser batch file 11/05/08 11:49:37 johnsa [1949] * trunk/build/quickstart/windows/addgroup.bat: * trunk/build/quickstart/windows/addgroupmember.bat: * trunk/build/quickstart/windows/adduser.bat: final fixes to windows directory batch files 11/05/08 11:15:54 johnsa [1948] * trunk/build/quickstart/linux/addgroup: * trunk/build/quickstart/linux/addgroupmember: * trunk/build/quickstart/linux/adduser: * trunk/build/quickstart/linux/bw: * trunk/build/quickstart/linux/initdir: * trunk/build/quickstart/windows/addgroup.bat: * trunk/build/quickstart/windows/addgroupmember.bat: * trunk/build/quickstart/windows/adduser.bat: * trunk/build/quickstart/windows/bw.bat: * trunk/build/quickstart/windows/initdir.bat: windows directory batch files almost complete 11/04/08 15:19:36 johnsa [1947] * trunk/build/quickstart/linux/addgroup: * trunk/build/quickstart/windows/addgroup.bat: adding addgroup batch file 11/04/08 00:31:16 douglm [1946] * trunk/build.xml: * trunk/build/quickstart/install.xml: * trunk/build/quickstart/run-dir.xml: More install script 11/03/08 16:44:51 johnsa [1945] * trunk/build/quickstart/windows/initdir.bat: adding batch file equivalent for initdir 11/03/08 16:13:45 douglm [1944] * trunk/build.xml: * trunk/build/buildsh.xml: * trunk/build/quickstart/build.xml: * trunk/build/quickstart/install.xml: * trunk/build/quickstart/linux/addgroup: * trunk/build/quickstart/linux/addgroupmember: * trunk/build/quickstart/linux/adduser: * trunk/build/quickstart/linux/initdir: * trunk/build/quickstart/run-dir.xml: * trunk/config/bwbuild/default/build.properties: * trunk/config/bwbuild/default/cal.properties: * trunk/config/bwbuild/jboss/democal.properties: * trunk/config/bwbuild/liferay5/cal.properties: * trunk/config/configs/democal.properties: * trunk/deployment/build.xml: Changes to get an install script working 11/02/08 21:30:43 douglm [1943] * trunk/build/quickstart/linux: * trunk/build/quickstart/linux/addgroup: * trunk/build/quickstart/linux/addgroupmember: * trunk/build/quickstart/linux/adduser: * trunk/build/quickstart/linux/bw: * trunk/build/quickstart/linux/initdir: * trunk/build/quickstart/windows: * trunk/build/quickstart/windows/bw.bat: move scripts 10/30/08 17:21:01 johnsa [1940] * trunk/build/bw.bat: bedework build file for windows 10/30/08 15:52:37 douglm [1939] * trunk/build/platforms/tomcat5War.xml: Minor build fixes 10/30/08 15:35:48 douglm [1938] * trunk/build/buildwar.xml: * trunk/build/loadDeployConfig.xml: * trunk/build/platforms: * trunk/build/platforms/jbossWar.xml: * trunk/build/platforms/tomcat5War.xml: * trunk/build/portals/jetspeed2War.xml: * trunk/config/bwbuild/.platform: * trunk/config/bwbuild/.platform/ear.properties: * trunk/config/bwbuild/.platform/standalone.properties: * trunk/config/bwbuild/.portal/common-resources/jetspeed2-portlet.psml: * trunk/config/bwbuild/default/build.properties: * trunk/config/bwbuild/default/cal.properties: * trunk/config/bwbuild/jboss/democal.properties: * trunk/config/bwbuild/liferay5/cal.properties: * trunk/config/configs/democal.properties: * trunk/config/configs/metadata.xml: * trunk/deployment/build.xml: * trunk/deployment/deployprops.xml: * trunk/deployment/freebusyAggregator/jboss: * trunk/deployment/freebusyAggregator/webapp/build.xml: * trunk/deployment/publiccaldav/jboss: * trunk/deployment/publiccaldav/webapp/build.xml: * trunk/deployment/resources/build.xml: * trunk/deployment/resources/common-context/WEB-INF/web.xml: * trunk/deployment/termination/jboss: * trunk/deployment/termination/webapp/build.xml: * trunk/deployment/usercaldav/jboss: * trunk/deployment/usercaldav/webapp/build.xml: * trunk/deployment/webadmin/jboss: * trunk/deployment/webadmin/portlet/jetspeed2-portlet.psml: * trunk/deployment/webadmin/webapp/build.xml: * trunk/deployment/webconfig/jboss: * trunk/deployment/webconfig/webapp/build.xml: * trunk/deployment/webpublic/portlet/jetspeed2-portlet.psml: * trunk/deployment/webpublic/webapp/build.xml: * trunk/deployment/websubmit/jboss: * trunk/deployment/websubmit/portlet/jetspeed2-portlet.psml: * trunk/deployment/websubmit/webapp/build.xml: * trunk/deployment/webuser/jboss: * trunk/deployment/webuser/portlet/jetspeed2-portlet.psml: * trunk/deployment/webuser/portlet/portlet.xml: * trunk/deployment/webuser/webapp/build.xml: Try to do the same for platforms (jboss, tomcat etc) as I just did for portals. The deployment directories are much simplified and the build process seems a bit clearer. 10/29/08 17:29:30 douglm [1937] * trunk/build/buildfilters.xml: * trunk/build/buildwar.xml: * trunk/build/loadDeployConfig.xml: * trunk/build/portals: * trunk/build/portals/jetspeed2War.xml: * trunk/build/portals/liferay4War.xml: * trunk/build/portals/liferay5War.xml: * trunk/build/portals/uportal2War.xml: * trunk/build/quickstart/build.xml: * trunk/build/quickstart/hsqldb.properties: * trunk/build/quickstart/run-hsqldb.xml: * trunk/config/bwbuild/.portal: * trunk/config/bwbuild/.portal/common-resources: * trunk/config/bwbuild/.portal/liferay4: * trunk/config/bwbuild/.portal/liferay4/portal.properties: * trunk/config/bwbuild/.portal/liferay5: * trunk/config/bwbuild/.portal/liferay5/portal.properties: * trunk/config/bwbuild/.portal/uportal2: * trunk/config/bwbuild/.portal/uportal2/portal.properties: * trunk/config/bwbuild/.standalone: * trunk/config/bwbuild/.standalone/standalone.properties: * trunk/config/bwbuild/default/build.properties: * trunk/config/bwbuild/default/cal.options.xml: * trunk/config/bwbuild/default/cal.properties: * trunk/config/bwbuild/jboss/democal.options.xml: * trunk/config/bwbuild/jboss/democal.properties: * trunk/config/bwbuild/liferay5: * trunk/config/bwbuild/liferay5/build.properties: * trunk/config/bwbuild/liferay5/cal.options.xml: * trunk/config/bwbuild/liferay5/cal.properties: * trunk/config/configs/democal.options.xml: * trunk/config/configs/democal.properties: * trunk/config/configs/freebusy: * trunk/deployment/appjars.xml: * trunk/deployment/build.xml: * trunk/deployment/resources/build.xml: * trunk/deployment/termination/jetspeed: * trunk/deployment/termination/liferay4: * trunk/deployment/termination/liferay5: * trunk/deployment/termination/uportal2: * trunk/deployment/webadmin/jetspeed: * trunk/deployment/webadmin/liferay4: * trunk/deployment/webadmin/liferay5: * trunk/deployment/webadmin/portlet/jetspeed2-portlet.psml: * trunk/deployment/webadmin/portlet/liferay4-display.xml: * trunk/deployment/webadmin/portlet/liferay4-portlet.xml: * trunk/deployment/webadmin/portlet/liferay5-display.xml: * trunk/deployment/webadmin/portlet/liferay5-portlet.xml: * trunk/deployment/webadmin/uportal2: * trunk/deployment/webadmin/webapp/build.xml: * trunk/deployment/webconfig/webapp/build.xml: * trunk/deployment/webpublic/jetspeed: * trunk/deployment/webpublic/liferay4: * trunk/deployment/webpublic/liferay5: * trunk/deployment/webpublic/portlet/jetspeed2-portlet.psml: * trunk/deployment/webpublic/portlet/liferay4-display.xml: * trunk/deployment/webpublic/portlet/liferay4-portlet.xml: * trunk/deployment/webpublic/portlet/liferay5-display.xml: * trunk/deployment/webpublic/portlet/liferay5-portlet.xml: * trunk/deployment/webpublic/uportal2: * trunk/deployment/webpublic/webapp/build.xml: * trunk/deployment/websubmit/jetspeed: * trunk/deployment/websubmit/liferay4: * trunk/deployment/websubmit/liferay5: * trunk/deployment/websubmit/portlet/jetspeed2-portlet.psml: * trunk/deployment/websubmit/portlet/liferay4-display.xml: * trunk/deployment/websubmit/portlet/liferay4-portlet.xml: * trunk/deployment/websubmit/portlet/liferay5-display.xml: * trunk/deployment/websubmit/portlet/liferay5-portlet.xml: * trunk/deployment/websubmit/uportal2: * trunk/deployment/websubmit/webapp/build.xml: * trunk/deployment/webuser/jetspeed: * trunk/deployment/webuser/liferay4: * trunk/deployment/webuser/liferay5: * trunk/deployment/webuser/portlet/jetspeed2-portlet.psml: * trunk/deployment/webuser/portlet/liferay4-display.xml: * trunk/deployment/webuser/portlet/liferay4-portlet.xml: * trunk/deployment/webuser/portlet/liferay5-display.xml: * trunk/deployment/webuser/portlet/liferay5-portlet.xml: * trunk/deployment/webuser/uportal2: * trunk/deployment/webuser/webapp/build.xml: * trunk/deployutil/src/org/bedework/deployment/ForEachAppTask.java: Major reorganization of the build process mostly affecting handling of portal builds. Removed portal specific directories from teh deployment directory. Removed portal sepcific code from buildwar.xml and added new portal specific files to be imported. These are in a section of teh bwbuild config directory. All portal customization is now part of building the war file. 10/28/08 22:58:10 douglm [1935] * trunk/build/buildsh.xml: * trunk/build/buildwar.xml: * trunk/build/libjars.properties: * trunk/build/loadDeployConfig.xml: * trunk/build/quickstart/build.xml: * trunk/build/quickstart/run-tomcat.xml: * trunk/config/bwbuild/default/cal.options.xml: * trunk/config/bwbuild/default/cal.properties: * trunk/config/bwbuild/jboss/democal.options.xml: * trunk/config/bwbuild/jboss/democal.properties: * trunk/config/configs/democal.options.xml: * trunk/config/configs/democal.properties: * trunk/deployment/appjars.xml: * trunk/deployment/build.xml: * trunk/deployment/resources/build.xml: * trunk/lib/ant-1.7.0.jar: * trunk/lib/commons: * trunk/lib/geronimo-stax-api_1.0_spec-1.0.jar: * trunk/lib/google: * trunk/lib/hibernate-3.2.5.ga: * trunk/lib/hsqldb-1.7.3.3.jar: * trunk/lib/ical4j-head.jar: * trunk/lib/jakarta-oro-2.0.8.jar: * trunk/lib/javamail-1.4: * trunk/lib/junit-4.4.jar: * trunk/lib/licences/google: * trunk/lib/licences/google/COPYING: * trunk/lib/liferay4: * trunk/lib/liferay4.2: * trunk/lib/log4j-1.2.8.jar: * trunk/lib/lucene-core-2.0.0.jar: * trunk/lib/lucene-misc-2.0.0.jar: * trunk/lib/portals-bridges-1.0/portals-bridges-common-1.0.jar: * trunk/lib/portals-bridges-1.0/portals-bridges-struts-1.2.7-1.0.jar: * trunk/lib/struts-1.2.9/struts-1.2.9.jar: * trunk/lib/wstx-asl-3.9.0.jar: * trunk/lib/xalan-2-6-0.jar: Further changes to the build. Delete (most of) the jar files from the lib directory - we are downloading them from bedework.org at build time. Use a macro to load the deployment properties adn define some deployment proeprties based on the run time options. 10/28/08 10:12:28 douglm [1933] * trunk/build/buildfilters.xml: * trunk/build/buildwar.xml: * trunk/build/getJar.xml: * trunk/build/quickstart/run-hsqldb.xml: * trunk/config/bwbuild/default/cal.options.xml: * trunk/config/bwbuild/default/cal.properties: * trunk/config/bwbuild/jboss/democal.options.xml: * trunk/config/bwbuild/jboss/democal.properties: * trunk/config/configs/democal.options.xml: * trunk/config/configs/democal.properties: * trunk/config/properties: * trunk/deployment/appjars.xml: * trunk/deployment/freebusyAggregator/uportal2/build.xml: * trunk/deployment/freebusyAggregator/webapp/build.xml: * trunk/deployment/termination/liferay5: * trunk/deployment/termination/liferay5/build.xml: * trunk/deployment/termination/liferay5/liferay-portlet.tld: * trunk/deployment/webadmin/jetspeed/build.xml: * trunk/deployment/webadmin/liferay4/build.xml: * trunk/deployment/webadmin/liferay5: * trunk/deployment/webadmin/liferay5/build.xml: * trunk/deployment/webadmin/uportal2/build.xml: * trunk/deployment/webconfig/webapp/build.xml: * trunk/deployment/webpublic/jetspeed/build.xml: * trunk/deployment/webpublic/liferay4/build.xml: * trunk/deployment/webpublic/liferay5: * trunk/deployment/webpublic/liferay5/build.xml: * trunk/deployment/webpublic/uportal2/build.xml: * trunk/deployment/webpublic/webapp/build.xml: * trunk/deployment/websubmit/jetspeed/build.xml: * trunk/deployment/websubmit/liferay4/build.xml: * trunk/deployment/websubmit/liferay5: * trunk/deployment/websubmit/liferay5/build.xml: * trunk/deployment/websubmit/uportal2/build.xml: * trunk/deployment/websubmit/webapp/build.xml: * trunk/deployment/webuser/jetspeed/build.xml: * trunk/deployment/webuser/liferay4/build.xml: * trunk/deployment/webuser/liferay5: * trunk/deployment/webuser/liferay5/build.xml: * trunk/deployment/webuser/portlet/resources/demoskins: * trunk/deployment/webuser/uportal2/build.xml: * trunk/deployment/webuser/webapp/build.xml: Two distinct sets of updates here. 1. Add some support (not fully working yet) for liferay5. Some old unused stylesheets were deleted to tidy up and while working on this decided the second set of updates were needed asa first step to simplification 2. Ensure that only the option xml file is used at run time. Some properties were moved into the xml file and code was adjusted to refer to the xml config objects. CalEnv, CalEnvI, CalEnvFactory were removed. Following properties were moved into options.xml org.bedework.app.X.nogroupallowed org.bedework.app.X.publicadmin org.bedework.app.X.guestmode sysintfimpl (caldav) org.bedework.global.system.name --> globals.systemName org.bedework.app.X.run.as.user --> runAsUser org.bedework.app.CalAdmin.admingroupsidprefix=agrp_ Removed remaining run-time references to org.bedework.app.X.name org.bedework.app.X.root