Changeset 2342

Timestamp:

08/13/09 11:40:59

Author:

douglm

Message:

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

Files:

• trunk (modified) (1 prop)
• trunk/bedework.importorder (copied) (copied from branches/douglm/bedework.importorder)
• trunk/build.xml (modified) (10 diffs)
• trunk/build/buildsh.xml (modified) (2 diffs)
• trunk/build/buildwar.xml (modified) (7 diffs)
• trunk/build/quickstart/build.xml (modified) (7 diffs)
• trunk/build/quickstart/linux/bw (modified) (1 diff)
• trunk/build/quickstart/run-activemq.xml (copied) (copied from branches/douglm/build/quickstart/run-activemq.xml)
• trunk/build/quickstart/run-crawler.xml (deleted)
• trunk/build/quickstart/run-hsqldb.xml (modified) (3 diffs)
• trunk/build/quickstart/run-indexer.xml (copied) (copied from branches/douglm/build/quickstart/run-crawler.xml) (6 diffs)
• trunk/build/quickstart/run-inoutscheduler.xml (copied) (copied from branches/douglm/build/quickstart/run-inoutscheduler.xml) (4 diffs)
• trunk/build/quickstart/run-logger.xml (copied) (copied from branches/douglm/build/quickstart/run-logger.xml) (2 diffs)
• trunk/build/quickstart/run-tomcat.xml (modified) (2 diffs)
• trunk/config/bwbuild/default/activemq.xml (copied) (copied from branches/douglm/config/bwbuild/default/activemq.xml) (2 diffs)
• trunk/config/bwbuild/default/build.properties (modified) (1 diff)
• trunk/config/bwbuild/default/cal.options.xml (modified) (3 diffs)
• trunk/config/bwbuild/default/cal.properties (modified) (2 diffs)
• trunk/config/bwbuild/default/context.xml (modified) (1 diff)
• trunk/config/bwbuild/default/jndi.properties (copied) (copied from branches/douglm/config/bwbuild/default/jndi.properties)
• trunk/deployment/appjars.xml (modified) (2 diffs)
• trunk/deployment/dumprestore/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/indexer (copied) (copied from branches/douglm/deployment/indexer)
• trunk/deployment/indexer/shellscr (copied) (copied from branches/douglm/deployment/indexer/shellscr)
• trunk/deployment/indexer/shellscr/appjars.xml (copied) (copied from branches/douglm/deployment/indexer/shellscr/appjars.xml) (1 diff)
• trunk/deployment/indexer/shellscr/build.xml (copied) (copied from branches/douglm/deployment/indexer/shellscr/build.xml) (1 diff)
• trunk/deployment/indexer/shellscr/resources (copied) (copied from branches/douglm/deployment/indexer/shellscr/resources)
• trunk/deployment/indexer/shellscr/resources/bwrun.bat (copied) (copied from branches/douglm/deployment/indexer/shellscr/resources/bwrun.bat)
• trunk/deployment/indexer/shellscr/resources/bwrun.sh (copied) (copied from branches/douglm/deployment/indexer/shellscr/resources/bwrun.sh)
• trunk/deployment/indexer/shellscr/resources/log4j.xml (copied) (copied from branches/douglm/deployment/indexer/shellscr/resources/log4j.xml) (1 diff)
• trunk/deployment/inoutsched (copied) (copied from branches/douglm/deployment/inoutsched)
• trunk/deployment/inoutsched/shellscr (copied) (copied from branches/douglm/deployment/inoutsched/shellscr)
• trunk/deployment/inoutsched/shellscr/appjars.xml (copied) (copied from branches/douglm/deployment/inoutsched/shellscr/appjars.xml)
• trunk/deployment/inoutsched/shellscr/build.xml (copied) (copied from branches/douglm/deployment/inoutsched/shellscr/build.xml)
• trunk/deployment/inoutsched/shellscr/resources (copied) (copied from branches/douglm/deployment/inoutsched/shellscr/resources)
• trunk/deployment/inoutsched/shellscr/resources/bwrun.bat (copied) (copied from branches/douglm/deployment/inoutsched/shellscr/resources/bwrun.bat)
• trunk/deployment/inoutsched/shellscr/resources/bwrun.sh (copied) (copied from branches/douglm/deployment/inoutsched/shellscr/resources/bwrun.sh)
• trunk/deployment/inoutsched/shellscr/resources/log4j.xml (copied) (copied from branches/douglm/deployment/inoutsched/shellscr/resources/log4j.xml) (1 diff)
• trunk/deployment/publiccaldav/webapp/appjars.xml (modified) (1 diff)
• trunk/deployment/sysevlog (copied) (copied from branches/douglm/deployment/sysevlog)
• trunk/deployment/sysevlog/shellscr (copied) (copied from branches/douglm/deployment/sysevlog/shellscr)
• trunk/deployment/sysevlog/shellscr/appjars.xml (copied) (copied from branches/douglm/deployment/sysevlog/shellscr/appjars.xml)
• trunk/deployment/sysevlog/shellscr/build.xml (copied) (copied from branches/douglm/deployment/sysevlog/shellscr/build.xml)
• trunk/deployment/sysevlog/shellscr/resources (copied) (copied from branches/douglm/deployment/sysevlog/shellscr/resources)
• trunk/deployment/sysevlog/shellscr/resources/bwrun.bat (copied) (copied from branches/douglm/deployment/sysevlog/shellscr/resources/bwrun.bat)
• trunk/deployment/sysevlog/shellscr/resources/bwrun.sh (copied) (copied from branches/douglm/deployment/sysevlog/shellscr/resources/bwrun.sh)
• trunk/deployment/sysevlog/shellscr/resources/log4j.xml (copied) (copied from branches/douglm/deployment/sysevlog/shellscr/resources/log4j.xml) (1 diff)
• trunk/deployment/testsuite/shellscr/appjars.xml (modified) (1 diff)
• trunk/deployment/testsuite/shellscr/resources/bwruntest.sh (modified) (1 diff)
• trunk/deployment/usercaldav/webapp/appjars.xml (modified) (1 diff)
• trunk/deployment/webadmin/webapp/appjars.xml (modified) (1 diff)
• trunk/deployment/webpublic/webapp/appjars.xml (modified) (1 diff)
• trunk/deployment/websubmit/webapp/appjars.xml (modified) (1 diff)
• trunk/deployment/webuser/webapp/appjars.xml (modified) (1 diff)
• trunk/docs/README (copied) (copied from branches/douglm/docs/README)
• trunk/docs/README.txt (copied) (copied from branches/douglm/docs/README.txt)

trunk/build.xml

@@ -35 +35 @@
-            location="${org.bedework.projects}/caldav" />
-
+  <property name="org.bedework.project.caldavimpl"
+            location="${org.bedework.projects}/caldavimpl" />
+
-  <property name="org.bedework.project.caldavTest"
-            location="${org.bedework.projects}/caldavTest" />
@@ -46 +49 @@
-  <property name="org.bedework.project.dumprestore"
-            location="${org.bedework.projects}/dumprestore" />
+
+  <property name="org.bedework.project.indexer"
+            location="${org.bedework.projects}/indexer" />
-
-  <property name="org.bedework.project.rpiutil"
@@ -105 +111 @@
-
-  <target name="init" >
-    <!-- Overriding this when invoking ant allows different user property
-         files to be included e.g.
-            ant -Dorg.bedework.user.build.properties=/home/me/bedework.properties ...
-            -->
-    <property name="org.bedework.user.build.properties"
-              location="${user.home}/bedework.build.properties" />
-
-    <echo level="info" message="Load user properties from ${org.bedework.user.build.properties}" />
-
@@ -203 +202 @@
-  <target name="build" depends="init.build,build.rpiutil,build.bwtzsvr,
-                                build.access,build.davutil,
+                                build.webdav,build.caldav,
-                                build.calendarapi,build.dumprestore,
-webdav,build.caldav,build.caldavTest
-
+caldavTest,build.caldavimpl
+build.indexer,
-                                build.testsuite,build.deployutil"
-          description="builds the project">
@@ -217 +217 @@
-                                clean.calendarapi,clean.dumprestore,
-                                clean.webdav,clean.caldav,clean.caldavTest,
-
+
+
-                                clean.testsuite"
-          description="Remove all generated files.">
@@ -228 +229 @@
-                                           clean.calendarapi,clean.dumprestore,
-                                           clean.webdav,clean.caldav,clean.caldavTest,
-
+
+
-                                           clean.testsuite"
-          description="partial clean up for quickstart.">
@@ -350 +352 @@
-    </ant>
-
+    <ant antfile="${org.bedework.project.caldavimpl}/build.xml" inheritall="false"
+         target="javadoc" >
+      <property name="destdir"
+                location="${org.bedework.projectdocs.home}/caldavimpl/api" />
+    </ant>
+
-    <ant antfile="${org.bedework.project.caldavTest}/build.xml" inheritall="false"
-         target="javadoc" >
@@ -360 +368 @@
-      <property name="destdir"
-                location="${org.bedework.projectdocs.home}/bwtools/api" />
+    </ant>
+
+    <ant antfile="${org.bedework.project.indexer}/build.xml" inheritall="false"
+         target="javadoc" >
+      <property name="destdir"
+                location="${org.bedework.projectdocs.home}/indexer/api" />
-    </ant>
-
@@ -464 +478 @@
-
-  <!-- .................................................................
+                          caldavimpl
+       .................................................................. -->
+  <target name="build.caldavimpl" depends="init"
+          description="builds the caldavimpl project">
+    <ant antfile="${org.bedework.project.caldavimpl}/build.xml" inheritall="false"
+       target="build-all"  >
+      <property name="org.bedework.libcache.dir"
+                location="${org.bedework.project.bedework}/libcache"/>
+    </ant>
+  </target>
+
+  <target name="clean.caldavimpl" depends="init"
+          description="clean the caldavimpl project">
+    <ant antfile="${org.bedework.project.caldavimpl}/build.xml" inheritall="false"
+         target="deep-clean" />
+  </target>
+
+  <target name="clean.build.caldavimpl" depends="clean.caldav,build.caldav"
+          description="clean builds the caldavimpl project"/>
+
+  <!-- .................................................................
-                          caldavTest
-       .................................................................. -->
@@ -546 +581 @@
-  <target name="clean.build.dumprestore" depends="clean.dumprestore,build.dumprestore"
-          description="builds the dumprestore project"/>
+
+  <!-- .................................................................
+                          indexer
+       .................................................................. -->
+  <target name="build.indexer" depends="init"
+          description="builds the indexer project">
+    <ant antfile="${org.bedework.project.indexer}/build.xml" inheritall="false"
+           target="build-all"  >
+      <property name="org.bedework.libcache.dir"
+                location="${org.bedework.project.bedework}/libcache"/>
+    </ant>
+  </target>
+
+  <target name="clean.indexer" depends="init"
+          description="clean the indexer project">
+    <ant antfile="${org.bedework.project.indexer}/build.xml" inheritall="false"
+           target="deep-clean" />
+  </target>
+
+  <target name="clean.build.indexer" depends="clean.indexer,build.indexer"
+          description="builds the indexer project"/>
-
-  <!-- .................................................................

trunk/build/buildsh.xml

@@ -62 +62 @@
-    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" />
-    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" />
+
+    <!-- jms support -->
+    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" />
+    <copy todir="${app.dest.lib}"
+          file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" />
+    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" />
-
-    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/>
@@ -128 +134 @@
-    </copy>
-
+    <copy tofile="${app.dest.classes}/jndi.properties"
+          file="${org.bedework.config.jndi.properties}" />
+
-    <copy todir="${app.dest.classes}" overwrite="yes" >
-      <fileset refid="org.bedework.extra.resources" />

trunk/build/buildwar.xml

@@ -71 +71 @@
-      </else>
-    </if>
+    <property name="app.dest.properties.old"
+              location="${app.dest.classes}/properties/calendar" />
-    <property name="app.dest.properties"
-/calendar
+
-  </target>
-
@@ -154 +156 @@
-         war and transformed by the above filter.
-         =============================================================== -->
+
+    <!-- Create the runtime options file -->
+    <mkdir dir="${app.dest.properties}" />
+
-    <if>
-      <available file="${app.sou.dir}/properties" type="dir" />
@@ -165 +171 @@
-    </if>
-
-    <copy todir="${app.dest.classes}">
-      <fileset dir="${app.sou.dir}/war/WEB-INF/classes"
-               includes="*"/>
-      <filterset refid="property.filters" />
-    </copy>
-
-    <!-- Create the runtime options file -->
-    <mkdir dir="${app.dest.properties}" />
-
-    <copy tofile="${app.dest.properties}/options.xml"
-          file="${org.bedework.config.options}" >
@@ -179 +176 @@
-        <filter token="RPI-DEBUG" value="${app.debug.val}"/>
-      </filterset>
+      <filterset refid="property.filters" />
+    </copy>
+
+        <!-- Temp do it again -->
+    <mkdir dir="${app.dest.properties.old}" />
+
+    <copy tofile="${app.dest.properties.old}/options.xml"
+          file="${org.bedework.config.options}" >
+      <filterset>
+        <filter token="RPI-DEBUG" value="${app.debug.val}"/>
+      </filterset>
+      <filterset refid="property.filters" />
+    </copy>
+
+    <copy todir="${app.dest.classes}">
+      <fileset dir="${app.sou.dir}/war/WEB-INF/classes"
+               includes="*"/>
-      <filterset refid="property.filters" />
-    </copy>
@@ -235 +249 @@
-    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" />
-    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" />
+
+        <!-- jms support -->
+    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" />
+    <copy todir="${app.dest.lib}"
+            file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" />
+    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" />
-
-    <antcall target="bexchange-stuff" inheritRefs="true" />
@@ -298 +318 @@
-
-  <target name="bexchange-stuff" if="org.bedework.build.caldav.bexchange">
-    <copy tofile="${app.dest.properties}/timezones.xml"
-          file="${org.bedework.project.bedework}/docs/bwtimezones.xml" />
-  </target>
-
-  <target name="domino-stuff" if="org.bedework.build.caldav.domino">
-    <copy tofile="${app.dest.properties}/timezones.xml"
-          file="${org.bedework.project.bedework}/docs/bwtimezones.xml" />
-  </target>
-
@@ -313 +329 @@
-      </fileset>
-    </copy>
-
-    <copy tofile="${app.dest.properties}/timezones.xml"
-          file="${org.bedework.project.bedework}/docs/bwtimezones.xml" />
-  </target>
-

trunk/build/quickstart/build.xml

@@ -16 +16 @@
-  <taskdef resource="net/sf/antcontrib/antcontrib.properties" />
-
+  <import file="${bedework.quickstart.basedir}/run-activemq.xml" />
-  <import file="${bedework.quickstart.basedir}/run-hsqldb.xml" />
-  <import file="${bedework.quickstart.basedir}/run-tomcat.xml" />
-  <import file="${bedework.quickstart.basedir}/run-dir.xml" />
-  <import file="${bedework.quickstart.basedir}/install.xml" />
+
+  <!-- Bedework services -->
+  <import file="${bedework.quickstart.basedir}/run-logger.xml" />
+  <import file="${bedework.quickstart.basedir}/run-indexer.xml" />
+  <import file="${bedework.quickstart.basedir}/run-inoutscheduler.xml" />
-
-  <target name="README" depends="init"
@@ -91 +97 @@
-    <property name="bedework.build.file"
-              location="${basedir}/bedework/build.xml" />
-    <property name="org.bedework.user.build.properties"
-              location="${user.home}/bedework.build.properties" />
-    <dirname property="org.bedework.configuration.location"
-             file="${org.bedework.user.build.properties}" />
@@ -102 +106 @@
-
-  <target name="run.init" depends="init" >
-    <property name="org.bedework.user.build.properties"
-              location="${user.home}/bedework.build.properties" />
-
-    <property name="org.bedework.appserver.dir"
-              location="${org.bedework.project.bedework}/../apache-tomcat-5.5.17" />
@@ -113 +114 @@
-    <property name="org.bedework.directory.dir"
-              location="${org.bedework.project.bedework}/../apacheds-1.5.3-fixed" />
+
+    <property name="org.bedework.activemq.dir"
+              location="${org.bedework.project.bedework}/../apache-activemq-5.2.0" />
-  </target>
-
@@ -239 +243 @@
-          description="Start quickstart system" >
-    <parallel>
+      <antcall target="activemq" inheritrefs="true" />
-      <antcall target="dirstart" inheritrefs="true" />
-      <antcall target="hsqldb" inheritrefs="true" />
+
-      <sequential>
+        <!-- wait for activemq -->
+        <waitfor maxwait="3" maxwaitunit="minute" checkevery="250">
+           <socket server="localhost" port="8161"/>
+        </waitfor>
+
+        <!-- wait for the directory server -->
-        <waitfor maxwait="3" maxwaitunit="minute" checkevery="250">
-           <socket server="localhost" port="10389"/>
-        </waitfor>
-
+
+
+
+
+
+
+
+
+
+
+
+
-      </sequential>
-    </parallel>
@@ -251 +274 @@
-
-  <!-- =================================================================
-all quickstart components except tomcat
+the quickstart infrastructure components
-       ================================================================= -->
-
@@ -257 +280 @@
-          description="Start quickstart system" >
-    <parallel>
+      <antcall target="activemq" inheritrefs="true" />
-      <antcall target="dirstart" inheritrefs="true" />
-      <antcall target="hsqldb" inheritrefs="true" />

trunk/build/quickstart/linux/bw

@@ -154 +154 @@
-fi
-
-
+_HOME

trunk/build/quickstart/run-hsqldb.xml

@@ -36 +36 @@
-  <target name="hsqldb" depends="hsql.init"
-          description="starts the hsqldb server">
+    <echo message="************************************************************"/>
-    <echo message="Starting hsqldb on port ${org.bedework.hsqldb.port}"/>
+    <echo message="************************************************************"/>
-
-    <java fork="true" dir="${basedir}" classname="org.hsqldb.Server">
@@ -120 +122 @@
-  <target name="hsqldb-test" depends="hsql.init"
-          description="starts the hsqldb server for testing">
+    <echo message="************************************************************"/>
-    <echo message="Starting hsqldb on port ${org.bedework.hsqldb.port}"/>
+    <echo message="************************************************************"/>
-
-    <delete dir="${org.bedework.hsqldb.dbdir}" />
@@ -137 +141 @@
-  <target name="hsqldb-test-trace" depends="hsql.init"
-          description="starts the hsqldb server for testing">
+    <echo message="************************************************************"/>
-    <echo message="Starting hsqldb on port ${org.bedework.hsqldb.port}"/>
+    <echo message="************************************************************"/>
-
-    <delete dir="${org.bedework.hsqldb.dbdir}" />

trunk/build/quickstart/run-indexer.xml

@@ -1 +1 @@
-<?xml version="1.0"?>
-
-crawl
+index
-
-     This is imported by the quickstart build.xml ensuring all changes to this file
@@ -11 +11 @@
--->
-
-crawler" default="start-crawl
+indexer" default="start-index
-  <!-- This target normally overriden by the importing build.xml -->
-  <target name="run.init">
@@ -18 +18 @@
-  </target>
-
-crawl
-crawl
-bwcrawl
+index
+index
+index
-
-    <path id="run.classpath">
-crawl
+index
-         <include name="*.jar"/>
-      </fileset>
-
+
+
-    </path>
-
@@ -33 +34 @@
-                 targetos="unix"  pathsep=":" />
-
-     
-bwcrawler.BwCrawl
+  
+indexer.BwIndex
-
-    <property name="org.bedework.run.appname"
-bwcrawl
+index
-  </target>
-
@@ -44 +45 @@
-       ================================================================= -->
-
-crawler" depends="crawl
-crawl
+indexer" depends="index
+index
-    <echo message="************************************************************"/>
-crawl
+index
-    <echo message="************************************************************"/>
-
@@ -58 +59 @@
-      <arg value="${org.bedework.run.appname}"/>
-
-
+-
-    </java>
-  </target>

trunk/build/quickstart/run-inoutscheduler.xml

@@ -18 +18 @@
-  </target>
-
-       
+  
-  <target name="inoutscheduler.init" depends="run.init">
-    <property name="org.bedework.inoutscheduler.dir"
@@ -28 +28 @@
-      </fileset>
-      <pathelement path="${org.bedework.inoutscheduler.dir}/classes"/>
+      <pathelement location="${org.bedework.inoutscheduler.dir}/resources"/>
-    </path>
-
@@ -34 +35 @@
-                 targetos="unix"  pathsep=":" />
-
-     
+  
-              value="org.bedework.inoutsched.InoutSched" />
-
@@ -59 +60 @@
-      <arg value="${org.bedework.run.appname}"/>
-
-
+-
-    </java>
-  </target>

trunk/build/quickstart/run-logger.xml

@@ -27 +27 @@
-      </fileset>
-      <pathelement path="${org.bedework.logger.dir}/classes"/>
+      <pathelement location="${org.bedework.logger.dir}/resources"/>
-    </path>
-
@@ -33 +34 @@
-                 targetos="unix"  pathsep=":" />
-
-     
+  
-              value="org.bedework.sysevents.listeners.LogListener" />
-

trunk/build/quickstart/run-tomcat.xml

@@ -17 +17 @@
-    <property name="org.bedework.appserver.dir"
-              location="${org.bedework.project.bedework}/../apache-tomcat-5.5.17" />
+
+    <property name="org.bedework.activemq.dir"
+              location="${org.bedework.project.bedework}/../apache-activemq-5.2.0" />
-  </target>
-
@@ -64 +67 @@
-      <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
-      <jvmarg value="-Dfile.encoding=UTF-8"/>
+
+      <jvmarg value="-Dactivemq.base=${org.bedework.activemq.dir}"/>
+      <jvmarg value="-Dwebconsole.type=jndi"/>
+
-      <arg value="start"/>
-    </java>

trunk/config/bwbuild/default/activemq.xml

@@ -199 +199 @@
-  **
-  ** http://activemq.apache.org/enterprise-integration-patterns.html
-
+
-  <camelContext id="camel" xmlns="http://activemq.apache.org/camel/schema/spring">
-
-!-
--
+ ! - 
+ - 
-    <package>org.foo.bar</package>
-
-!-- You can use Spring XML syntax to define the routes here using the <route> element --
+ ! - - You can use Spring XML syntax to define the routes here using the <route> element - - 
-    <route>
-      <from uri="activemq:example.A"/>
@@ -212 +212 @@
-    </route>
-  </camelContext>
+  -->
-
-  <!--

trunk/config/bwbuild/default/build.properties

@@ -21 +21 @@
-org.bedework.config.properties=${env.BEDEWORK_CONFIG}/cal.properties
-org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml
+
+org.bedework.config.jndi.properties=${env.BEDEWORK_CONFIG}/jndi.properties
+
-org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml
-

trunk/config/bwbuild/default/cal.options.xml

@@ -351 +351 @@
-                          User CalDAV server UserCalDAV
-             ================================================================== -->
-facade.configs
+dav.util
-          <appType>usercaldav</appType>
-
+
+
+
-          <guestMode>false</guestMode>
-
@@ -373 +375 @@
-                          Public (unauthenticated) CalDAV server PublicCalDAV
-             ================================================================== -->
-facade.configs
+dav.util
-          <appType>publiccaldav</appType>
-
+
+
+
-          <guestMode>true</guestMode>
-
@@ -421 +425 @@
-          <defaultPublicCalPath>/public/Other Events/Other</defaultPublicCalPath>
-        </dumpres>
+
+        <!-- ==================================================================
+                          Crawler program
+             ================================================================== -->
+        <indexer classname="org.bedework.calfacade.configs.BwCrawlerConfig">
+          <debug>true</debug>
+          <appType>indexer</appType>
+          <guestMode>true</guestMode>
+          <debugEntity>false</debugEntity>
+        </indexer>
+
+        <!-- ==================================================================
+                          System events logger program
+             ================================================================== -->
+        <sysevlog classname="org.bedework.calfacade.configs.BwCrawlerConfig">
+          <debug>true</debug>
+          <appType>sysevlog</appType>
+          <guestMode>true</guestMode>
+          <debugEntity>false</debugEntity>
+        </sysevlog>
+
+        <!-- ==================================================================
+                          In/outbox scheduler program
+             ================================================================== -->
+        <iosched classname="org.bedework.calfacade.configs.BwCrawlerConfig">
+          <debug>true</debug>
+          <appType>inoutsched</appType>
+          <guestMode>true</guestMode>
+          <debugEntity>false</debugEntity>
+        </iosched>
-      </app>
-    </bedework>

trunk/config/bwbuild/default/cal.properties

@@ -17 +17 @@
-#
-# Define the names of the applications we want to build
-
+
+
+
-
-#
@@ -384 +386 @@
-org.bedework.app.dumpres.schema.delimiter=;
-
+#
+# --------------------------------------------------------------------
+#
+# Crawler
+#
+
+org.bedework.app.indexer.project=indexer
+org.bedework.app.indexer.sou.dir=
+org.bedework.app.indexer.shellscr.name=bwrun
+org.bedework.app.indexer.batscr.name=bwrun.bat
+org.bedework.app.indexer.zip.name=indexer
+org.bedework.app.indexer.description=Bedework indexer application
+
+#
+# --------------------------------------------------------------------
+#
+# Server events logger
+#
+
+org.bedework.app.sysevlog.project=calendarapi
+org.bedework.app.sysevlog.sou.dir=
+org.bedework.app.sysevlog.shellscr.name=bwrun
+org.bedework.app.sysevlog.batscr.name=bwrun.bat
+org.bedework.app.sysevlog.zip.name=bwsysevlog
+org.bedework.app.sysevlog.description=Bedework system events logger application
+
+#
+# --------------------------------------------------------------------
+#
+# In/outbox scheduler
+#
+
+org.bedework.app.iosched.project=calendarapi
+org.bedework.app.iosched.sou.dir=
+org.bedework.app.iosched.shellscr.name=bwrun
+org.bedework.app.iosched.batscr.name=bwrun.bat
+org.bedework.app.iosched.zip.name=bwiosched
+org.bedework.app.iosched.description=Bedework In/outbox scheduler application
+

trunk/config/bwbuild/default/context.xml

@@ -1 +1 @@
-<Context path="@CONTEXT-ROOT@" reloadable="false">
-  <!-- Resource referenced by web.xml -->
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  <!-- Disables restart persistence of sessions -->

trunk/deployment/appjars.xml

@@ -184 +184 @@
-              name="commons-ssl" />
-
+      <!-- Jms support -->
+
+      <getJar lib="${org.bedework.app.lib}"
+              name="activemq-core" version="5.2.0" />
+
+      <getJar lib="${org.bedework.app.lib}"
+              name="geronimo-j2ee-management_1.0_spec" version="1.0" />
+
+      <getJar lib="${org.bedework.app.lib}"
+              name="jms" version="1.1" />
+
-      <!-- Various apis -->
-
@@ -229 +240 @@
-
-      <getJar lib="${org.bedework.app.lib}"
-5
+6
-               projecthome="${bw.project.home}/projects/calendarapi" />
-
-      <getJar lib="${org.bedework.app.lib}"
-5
+6
-               projecthome="${bw.project.home}/projects/calendarapi" />
-
-      <getJar lib="${org.bedework.app.lib}"
-5
-
-
-
-5
-
-
-
-5
-
-
-
-5
+6
+
+
+
+6
+
+
+
+6
+
+
+
+6
-               projecthome="${bw.project.home}/projects/calendarapi" />
-
-      <getJar lib="${org.bedework.app.lib}"
-5
-
-
-
-5
-
-
-
-5
-
-
-
-5
-
-
-
-5
-
-
-
-5
+6
+
+
+
+6
+
+
+
+6
+
+
+
+6
+
+
+
+6
+
+
+
+6
-              projecthome="${bw.project.home}/projects/calendarapi" />
-

trunk/deployment/dumprestore/shellscr/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
+              name="bw-cdvutil" version="3.6"
+              projecthome="${bw.project.home}/projects/caldav" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
-              name="bw-dumpres" version="3.5"
-              projecthome="${bw.project.home}/projects/dumprestore" />

trunk/deployment/indexer/shellscr/appjars.xml

@@ -17 +17 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-crawl
-bwcrawl
+index
+index
-    </sequential>
- </macrodef>

trunk/deployment/indexer/shellscr/build.xml

@@ -2 +2 @@
-
-<!-- ===================================================================
-Crawl
+Index
-     =================================================================== -->
-
-bwcrawl
+index
-  <import file="${org.bedework.deployment.base}/deployprops.xml" />
-

trunk/deployment/indexer/shellscr/resources/log4j.xml

@@ -25 +25 @@
-   <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-      <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
-dumpres
+logs/indexer
-      <param name="Append" value="true"/>
-

trunk/deployment/inoutsched/shellscr/resources/log4j.xml

@@ -25 +25 @@
-   <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-      <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
-dumpres
+logs/inoutsched
-      <param name="Append" value="true"/>
-

trunk/deployment/publiccaldav/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-
+
+
+
+
+
+
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-5
+6
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-5
+6
-              projecthome="${bw.project.home}/projects/webdav" />
-    </sequential>

trunk/deployment/sysevlog/shellscr/resources/log4j.xml

@@ -25 +25 @@
-   <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
-      <errorHandler class="org.apache.log4j.helpers.OnlyOnceErrorHandler"/>
-dumpres
+logs/sysev
-      <param name="Append" value="true"/>
-

trunk/deployment/testsuite/shellscr/appjars.xml

@@ -10 +10 @@
-      <mkdir dir="${org.bedework.temp.extrajars.dir}" />
-
-
+
+
-              name="junit" version="4.4" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
+              name="bw-cdvutil" version="3.6"
+              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"

trunk/deployment/testsuite/shellscr/resources/bwruntest.sh

@@ -29 +29 @@
-    ;;
-  *)
+    echo "valid parameters:"
+    echo "  apitest"
+    echo "     run the tests"
+    echo "  apitest.debug"
+    echo "     run the tests with debugging on"
-esac

trunk/deployment/usercaldav/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-
+
+
+
+
+
+
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-5
+6
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-5
+6
-              projecthome="${bw.project.home}/projects/webdav" />
-    </sequential>

trunk/deployment/webadmin/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
+              name="bw-cdvutil" version="3.6"
+              projecthome="${bw.project.home}/projects/caldav" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
-              name="bw-webcommon" version="3.5"
-              projecthome="${bw.project.home}/projects/webapps" />

trunk/deployment/webpublic/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
+              name="bw-cdvutil" version="3.6"
+              projecthome="${bw.project.home}/projects/caldav" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
-              name="bw-webcommon" version="3.5"
-              projecthome="${bw.project.home}/projects/webapps" />

trunk/deployment/websubmit/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
+              name="bw-cdvutil" version="3.6"
+              projecthome="${bw.project.home}/projects/caldav" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
-              name="bw-webcommon" version="3.5"
-              projecthome="${bw.project.home}/projects/webapps" />

trunk/deployment/webuser/webapp/appjars.xml

@@ -12 +12 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
+              name="bw-cdvutil" version="3.6"
+              projecthome="${bw.project.home}/projects/caldav" />
+
+      <getJar lib="${org.bedework.temp.extrajars.dir}"
+              libcache="${org.bedework.libcache.dir}"
-              name="bw-webcommon" version="3.5"
-              projecthome="${bw.project.home}/projects/webapps" />