Index: trunk/build/loadDeployConfig.xml
===================================================================
--- trunk/build/loadDeployConfig.xml (revision 1938)
+++ trunk/build/loadDeployConfig.xml (revision 2053)
@@ -18,8 +18,10 @@
       <property file="${org.bedework.user.build.properties}" />
 
+      <!-- These should already be defined in the above file
       <property name="org.bedework.config.properties"
                 location="${org.bedework.config.base}/configs/democal.properties" />
       <property name="org.bedework.config.options"
                 location="${org.bedework.config.base}/configs/democal.options.xml" />
+                -->
 
       <echo message="==========================================================" />
@@ -31,4 +33,7 @@
 
       <xmlproperty file="${org.bedework.config.options}"/>
+
+      <!-- Load the CardDAV options -->
+      <xmlproperty file="${org.bedework.carddav.options}"/>
 
       <if>
Index: trunk/build/quickstart/linux/bw
===================================================================
--- trunk/build/quickstart/linux/bw (revision 2024)
+++ trunk/build/quickstart/linux/bw (revision 2053)
@@ -30,5 +30,6 @@
   echo "     -bwchome     Specify path to configurations"
   echo "     -bwc         Specify configuration name"
-  echo "     -offline     Build without atempting to retrieve library jars"
+  echo "     -offline     Build without attempting to retrieve library jars"
+  echo "     -carddav     Target is for the CardDAV build, otherwise it's a calendar build"
   echo "     target       Ant target to execute"
   echo ""
@@ -59,4 +60,7 @@
 saveddir=`pwd`
 
+trap 'cd $saveddir' 0
+trap "exit 2" 1 2 3 15
+
 export QUICKSTART_HOME=$saveddir
 
@@ -68,4 +72,5 @@
 offline=
 quickstart=
+carddav=
 
 if [ "$1" = "" ] ; then
@@ -86,4 +91,8 @@
     -quickstart)
       quickstart="yes"
+      shift
+      ;;
+    -carddav)
+      carddav="yes"
       shift
       ;;
@@ -140,3 +149,8 @@
 CLASSPATH=$CLASSPATH:$QUICKSTART_HOME/bedework/applib/log4j-1.2.8.jar
 
+
+if [ "$carddav" != "" ] ; then
+  cd $QUICKSTART_HOME/bedework-carddav
+fi
+
 $JAVA_HOME/bin/java -classpath $CLASSPATH $ant_xmllogfile $offline -Dant.home=$ANT org.apache.tools.ant.launch.Launcher $BWCONFIG $ant_listener $ant_logger $*
Index: trunk/config/bwbuild/default/build.properties
===================================================================
--- trunk/config/bwbuild/default/build.properties (revision 1944)
+++ trunk/config/bwbuild/default/build.properties (revision 2053)
@@ -21,4 +21,5 @@
 org.bedework.config.properties=${env.BEDEWORK_CONFIG}/cal.properties
 org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml
+org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml
 
 # Enable/disable replacement of log4j config during deployment
Index: trunk/config/bwbuild/default/carddav.options.xml
===================================================================
---  (revision )
+++ trunk/config/bwbuild/default/carddav.options.xml (revision 2053)
@@ -1,0 +1,192 @@
+<!-- This provides run time options for the CardDAV server.
+  -->
+<bedework-options>
+  <org>
+    <bedework>
+      <global>
+        <version>3.5</version>
+        <dirhandlers>
+          <!-- handle the principal hierarchy.
+               This could be a read-only interface if we don't intend to allow
+               modification of the enterprise directory.
+
+               However, we may need to merge in subsidiary information to handle
+               principal properties. That may mean maintaining a shadow
+               principal hierarchy in the local server.
+            -->
+          <principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/principals</pathPrefix>
+            <className>org.bedework.carddav.server.dirHandlers.LdapPrincipalDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+            <baseDn>dc=bedework, dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <!-- We need to get operational attributes from the directory.
+               This requires us to explicitly name all attributes on fetch.
+               This element allows us to name EXTRA attributes from the default
+               list provided by the impleemntation.
+              -->
+            <attrIds></attrIds>
+
+            <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+
+            <debug>true</debug>
+          </principal-dirHandler>
+
+          <user-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/principals/users</pathPrefix>
+            <addressBook>true</addressBook>
+
+            <className>org.bedework.carddav.server.dirHandlers.LdapPrincipalDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+            <baseDn>ou=accounts,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <cardKind>individual</cardKind>
+
+            <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+            <addressbookEntryIdAttr>uid</addressbookEntryIdAttr>
+
+            <principalIdAttr>uid</principalIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+
+            <debug>true</debug>
+          </user-principal-dirHandler>
+
+          <group-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/principals/groups</pathPrefix>
+            <addressBook>true</addressBook>
+
+            <className>org.bedework.carddav.server.dirHandlers.LdapPrincipalDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+
+            <baseDn>ou=groups,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <cardKind>group</cardKind>
+
+            <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass>
+            <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+            <principalIdAttr>cn</principalIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+
+            <debug>true</debug>
+          </group-principal-dirHandler>
+
+          <!-- handle the user address book hierarchy -->
+          <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/user</pathPrefix>
+            <className>org.bedework.carddav.server.dirHandlers.LdapAddrBookDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+
+            <baseDn>ou=users,ou=addrbooks,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <folderObjectClass>organizationalUnit</folderObjectClass>
+            <folderIdAttr>ou</folderIdAttr>
+
+            <addressbookObjectClass>addressBook</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+            <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+            <debug>true</debug>
+          </user-dirHandler>
+
+          <!-- handle the public (enterprise) address book hierarchy -->
+          <public-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/public</pathPrefix>
+            <className>org.bedework.carddav.server.dirHandlers.LdapAddrBookDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+
+            <baseDn>ou=public,ou=addrbooks,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <folderObjectClass>organizationalUnit</folderObjectClass>
+            <addressbookObjectClass>addressBook</addressbookObjectClass>
+            <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+
+            <folderIdAttr>ou</folderIdAttr>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+            <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+            <debug>true</debug>
+          </public-dirHandler>
+        </dirhandlers>
+      </global>
+
+      <app>
+        <usercarddav classname="org.bedework.carddav.util.CardDAVConfig" >
+          <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+          <webaddrServiceURI>/find</webaddrServiceURI>
+          <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+          <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+          <defaultAddressbook>address-book</defaultAddressbook>
+        </usercarddav>
+
+        <pubcarddav>
+          <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+          <webaddrServiceURI>/find</webaddrServiceURI>
+          <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+          <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+          <defaultAddressbook>address-book</defaultAddressbook>
+
+          <principalRoot>/principals</principalRoot>
+          <userPrincipalRoot>/principals/users</userPrincipalRoot>
+          <groupPrincipalRoot>/principals/groups</groupPrincipalRoot>
+          <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot>
+          <venuePrincipalRoot>/principals/locations</venuePrincipalRoot>
+          <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot>
+          <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
+        </pubcarddav>
+      </app>
+    </bedework>
+  </org>
+</bedework-options>
Index: trunk/config/bwbuild/jboss/carddav.options.xml
===================================================================
---  (revision )
+++ trunk/config/bwbuild/jboss/carddav.options.xml (revision 2053)
@@ -1,0 +1,192 @@
+<!-- This provides run time options for each of the configured applications.
+  -->
+<bedework-options>
+  <org>
+    <bedework>
+      <global>
+        <version>3.5</version>
+        <dirhandlers>
+          <!-- handle the principal hierarchy.
+               This could be a read-only interface if we don't intend to allow
+               modification of the enterprise directory.
+
+               However, we may need to merge in subsidiary information to handle
+               principal properties. That may mean maintaining a shadow
+               principal hierarchy in the local server.
+            -->
+          <principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/principals</pathPrefix>
+            <className>org.bedework.carddav.server.dirHandlers.LdapPrincipalDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+            <baseDn>dc=bedework, dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <!-- We need to get operational attributes from the directory.
+               This requires us to explicitly name all attributes on fetch.
+               This element allows us to name EXTRA attributes from the default
+               list provided by the impleemntation.
+              -->
+            <attrIds></attrIds>
+
+            <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+
+            <debug>true</debug>
+          </principal-dirHandler>
+
+          <user-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/principals/users</pathPrefix>
+            <addressBook>true</addressBook>
+
+            <className>org.bedework.carddav.server.dirHandlers.LdapPrincipalDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+            <baseDn>ou=accounts,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <cardKind>individual</cardKind>
+
+            <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+            <addressbookEntryIdAttr>uid</addressbookEntryIdAttr>
+
+            <principalIdAttr>uid</principalIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+
+            <debug>true</debug>
+          </user-principal-dirHandler>
+
+          <group-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/principals/groups</pathPrefix>
+            <addressBook>true</addressBook>
+
+            <className>org.bedework.carddav.server.dirHandlers.LdapPrincipalDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+
+            <baseDn>ou=groups,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <cardKind>group</cardKind>
+
+            <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass>
+            <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+            <principalIdAttr>cn</principalIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+
+            <debug>true</debug>
+          </group-principal-dirHandler>
+
+          <!-- handle the user address book hierarchy -->
+          <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/user</pathPrefix>
+            <className>org.bedework.carddav.server.dirHandlers.LdapAddrBookDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+
+            <baseDn>ou=users,ou=addrbooks,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <folderObjectClass>organizationalUnit</folderObjectClass>
+            <folderIdAttr>ou</folderIdAttr>
+
+            <addressbookObjectClass>addressBook</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+            <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+            <debug>true</debug>
+          </user-dirHandler>
+
+          <!-- handle the public (enterprise) address book hierarchy -->
+          <public-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/public</pathPrefix>
+            <className>org.bedework.carddav.server.dirHandlers.LdapAddrBookDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+
+            <baseDn>ou=public,ou=addrbooks,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <folderObjectClass>organizationalUnit</folderObjectClass>
+            <addressbookObjectClass>addressBook</addressbookObjectClass>
+            <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+
+            <folderIdAttr>ou</folderIdAttr>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+            <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+            <debug>true</debug>
+          </public-dirHandler>
+        </dirhandlers>
+      </global>
+
+      <app>
+        <usercarddav classname="org.bedework.carddav.util.CardDAVConfig" >
+          <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+          <webaddrServiceURI>/find</webaddrServiceURI>
+          <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+          <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+          <defaultAddressbook>address-book</defaultAddressbook>
+        </usercarddav>
+
+        <pubcarddav>
+          <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+          <webaddrServiceURI>/find</webaddrServiceURI>
+          <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+          <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+          <defaultAddressbook>address-book</defaultAddressbook>
+
+          <principalRoot>/principals</principalRoot>
+          <userPrincipalRoot>/principals/users</userPrincipalRoot>
+          <groupPrincipalRoot>/principals/groups</groupPrincipalRoot>
+          <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot>
+          <venuePrincipalRoot>/principals/locations</venuePrincipalRoot>
+          <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot>
+          <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
+        </pubcarddav>
+      </app>
+    </bedework>
+  </org>
+</bedework-options>
Index: trunk/config/bwbuild/liferay5/carddav.options.xml
===================================================================
---  (revision )
+++ trunk/config/bwbuild/liferay5/carddav.options.xml (revision 2053)
@@ -1,0 +1,192 @@
+<!-- This provides run time options for each of the configured applications.
+  -->
+<bedework-options>
+  <org>
+    <bedework>
+      <global>
+        <version>3.5</version>
+        <dirhandlers>
+          <!-- handle the principal hierarchy.
+               This could be a read-only interface if we don't intend to allow
+               modification of the enterprise directory.
+
+               However, we may need to merge in subsidiary information to handle
+               principal properties. That may mean maintaining a shadow
+               principal hierarchy in the local server.
+            -->
+          <principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/principals</pathPrefix>
+            <className>org.bedework.carddav.server.dirHandlers.LdapPrincipalDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+            <baseDn>dc=bedework, dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <!-- We need to get operational attributes from the directory.
+               This requires us to explicitly name all attributes on fetch.
+               This element allows us to name EXTRA attributes from the default
+               list provided by the impleemntation.
+              -->
+            <attrIds></attrIds>
+
+            <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+
+            <debug>true</debug>
+          </principal-dirHandler>
+
+          <user-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/principals/users</pathPrefix>
+            <addressBook>true</addressBook>
+
+            <className>org.bedework.carddav.server.dirHandlers.LdapPrincipalDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+            <baseDn>ou=accounts,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <cardKind>individual</cardKind>
+
+            <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+            <addressbookEntryIdAttr>uid</addressbookEntryIdAttr>
+
+            <principalIdAttr>uid</principalIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+
+            <debug>true</debug>
+          </user-principal-dirHandler>
+
+          <group-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/principals/groups</pathPrefix>
+            <addressBook>true</addressBook>
+
+            <className>org.bedework.carddav.server.dirHandlers.LdapPrincipalDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+
+            <baseDn>ou=groups,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <cardKind>group</cardKind>
+
+            <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <addressbookEntryObjectClass>groupOfUniqueNames</addressbookEntryObjectClass>
+            <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+            <principalIdAttr>cn</principalIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+
+            <debug>true</debug>
+          </group-principal-dirHandler>
+
+          <!-- handle the user address book hierarchy -->
+          <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/user</pathPrefix>
+            <className>org.bedework.carddav.server.dirHandlers.LdapAddrBookDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+
+            <baseDn>ou=users,ou=addrbooks,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <folderObjectClass>organizationalUnit</folderObjectClass>
+            <folderIdAttr>ou</folderIdAttr>
+
+            <addressbookObjectClass>addressBook</addressbookObjectClass>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+
+            <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+            <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+            <debug>true</debug>
+          </user-dirHandler>
+
+          <!-- handle the public (enterprise) address book hierarchy -->
+          <public-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+            <pathPrefix>/public</pathPrefix>
+            <className>org.bedework.carddav.server.dirHandlers.LdapAddrBookDirHandler</className>
+
+            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+            <providerUrl>ldap://localhost:10389/</providerUrl>
+
+            <baseDn>ou=public,ou=addrbooks,dc=bedework,dc=org</baseDn>
+
+            <queryLimit>1000</queryLimit>
+
+            <attrIds></attrIds>
+
+            <folderObjectClass>organizationalUnit</folderObjectClass>
+            <addressbookObjectClass>addressBook</addressbookObjectClass>
+            <addressbookEntryObjectClass>inetOrgPerson</addressbookEntryObjectClass>
+
+            <folderIdAttr>ou</folderIdAttr>
+            <addressbookIdAttr>ou</addressbookIdAttr>
+            <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+            <authDn>uid=admin,ou=system</authDn>
+            <authPw>secret</authPw>
+            <debug>true</debug>
+          </public-dirHandler>
+        </dirhandlers>
+      </global>
+
+      <app>
+        <usercarddav classname="org.bedework.carddav.util.CardDAVConfig" >
+          <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+          <webaddrServiceURI>/find</webaddrServiceURI>
+          <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+          <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+          <defaultAddressbook>address-book</defaultAddressbook>
+        </usercarddav>
+
+        <pubcarddav>
+          <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+          <webaddrServiceURI>/find</webaddrServiceURI>
+          <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+          <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+          <defaultAddressbook>address-book</defaultAddressbook>
+
+          <principalRoot>/principals</principalRoot>
+          <userPrincipalRoot>/principals/users</userPrincipalRoot>
+          <groupPrincipalRoot>/principals/groups</groupPrincipalRoot>
+          <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot>
+          <venuePrincipalRoot>/principals/locations</venuePrincipalRoot>
+          <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot>
+          <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
+        </pubcarddav>
+      </app>
+    </bedework>
+  </org>
+</bedework-options>
Index: trunk/deployment/appjars.xml
===================================================================
--- trunk/deployment/appjars.xml (revision 2052)
+++ trunk/deployment/appjars.xml (revision 2053)
@@ -311,5 +311,5 @@
 
       <getJar lib="${org.bedework.app.lib}"
-              name="xalan" version="2.6.0" />
+              name="xalan" version="2.7.1" />
       <getJar lib="${org.bedework.app.lib}"
               name="hsqldb" version="1.7.3.3" />