[Bedework-commit] bedework r2053 - in trunk: build
build/quickstart/linux config/bwbuild/default
config/bwbuild/jboss config/bwbuild/liferay5 deployment
svnadmin at bedework.org
svnadmin at bedework.org
Tue Feb 10 16:51:33 EST 2009
Author: douglm
Date: 2009-02-10 16:51:32 -0500 (Tue, 10 Feb 2009)
New Revision: 2053
Added:
trunk/config/bwbuild/default/carddav.options.xml
trunk/config/bwbuild/jboss/carddav.options.xml
trunk/config/bwbuild/liferay5/carddav.options.xml
Modified:
trunk/build/loadDeployConfig.xml
trunk/build/quickstart/linux/bw
trunk/config/bwbuild/default/build.properties
trunk/deployment/appjars.xml
Log:
Allow carddav to be built from the bw script
Modified: trunk/build/loadDeployConfig.xml
===================================================================
--- trunk/build/loadDeployConfig.xml 2009-02-10 03:23:42 UTC (rev 2052)
+++ trunk/build/loadDeployConfig.xml 2009-02-10 21:51:32 UTC (rev 2053)
@@ -17,10 +17,12 @@
<!-- Load user property definition overrides -->
<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="==========================================================" />
<echo message="Use config properties ${org.bedework.config.properties}" />
@@ -31,6 +33,9 @@
<xmlproperty file="${org.bedework.config.options}"/>
+ <!-- Load the CardDAV options -->
+ <xmlproperty file="${org.bedework.carddav.options}"/>
+
<if>
<isset property="bedework-options.org.bedework.global.portal.platform"/>
<then>
Modified: trunk/build/quickstart/linux/bw
===================================================================
--- trunk/build/quickstart/linux/bw 2009-02-10 03:23:42 UTC (rev 2052)
+++ trunk/build/quickstart/linux/bw 2009-02-10 21:51:32 UTC (rev 2053)
@@ -29,7 +29,8 @@
echo " -quickstart Use the current quickstart configurations "
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 ""
echo " Invokes ant to build or deploy the Bedework system. Uses a configuration"
@@ -58,6 +59,9 @@
saveddir=`pwd`
+trap 'cd $saveddir' 0
+trap "exit 2" 1 2 3 15
+
export QUICKSTART_HOME=$saveddir
# Default some parameters
@@ -67,6 +71,7 @@
BWCONFIG=
offline=
quickstart=
+carddav=
if [ "$1" = "" ] ; then
usage
@@ -87,6 +92,10 @@
quickstart="yes"
shift
;;
+ -carddav)
+ carddav="yes"
+ shift
+ ;;
-usage | -help | -? | ?)
usage
exit
@@ -139,4 +148,9 @@
CLASSPATH=$CLASSPATH:$QUICKSTART_HOME/bedework/build/quickstart/antlib
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 $*
Modified: trunk/config/bwbuild/default/build.properties
===================================================================
--- trunk/config/bwbuild/default/build.properties 2009-02-10 03:23:42 UTC (rev 2052)
+++ trunk/config/bwbuild/default/build.properties 2009-02-10 21:51:32 UTC (rev 2053)
@@ -20,6 +20,7 @@
org.bedework.config.home=${env.BEDEWORK_CONFIG}
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
org.bedework.deploy.log4j.config=no
Added: trunk/config/bwbuild/default/carddav.options.xml
===================================================================
--- trunk/config/bwbuild/default/carddav.options.xml (rev 0)
+++ trunk/config/bwbuild/default/carddav.options.xml 2009-02-10 21:51:32 UTC (rev 2053)
@@ -0,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>
Added: trunk/config/bwbuild/jboss/carddav.options.xml
===================================================================
--- trunk/config/bwbuild/jboss/carddav.options.xml (rev 0)
+++ trunk/config/bwbuild/jboss/carddav.options.xml 2009-02-10 21:51:32 UTC (rev 2053)
@@ -0,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>
Added: trunk/config/bwbuild/liferay5/carddav.options.xml
===================================================================
--- trunk/config/bwbuild/liferay5/carddav.options.xml (rev 0)
+++ trunk/config/bwbuild/liferay5/carddav.options.xml 2009-02-10 21:51:32 UTC (rev 2053)
@@ -0,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>
Modified: trunk/deployment/appjars.xml
===================================================================
--- trunk/deployment/appjars.xml 2009-02-10 03:23:42 UTC (rev 2052)
+++ trunk/deployment/appjars.xml 2009-02-10 21:51:32 UTC (rev 2053)
@@ -310,7 +310,7 @@
name="servletapi" version="2.4" />
<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" />
</sequential>
More information about the Bedework-commit
mailing list