[Bedework-commit] bedework r3186 - in releases/bedework-3.7:
config/bwbuild/default config/bwbuild/jboss-h2
config/bwbuild/jboss-mysql config/bwbuild/jboss-postgresql
config/bwbuild/liferay5 config/bwbuild/oracle10g
deployment/genkeys/shellscr/META-INF
svnadmin at bedework.org
svnadmin at bedework.org
Fri Feb 18 10:17:10 EST 2011
Author: douglm
Date: 2011-02-18 10:17:09 -0500 (Fri, 18 Feb 2011)
New Revision: 3186
Modified:
releases/bedework-3.7/config/bwbuild/default/cal.options.xml
releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml
releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml
releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml
releases/bedework-3.7/config/bwbuild/liferay5/cal.options.xml
releases/bedework-3.7/config/bwbuild/oracle10g/cal.options.xml
releases/bedework-3.7/deployment/genkeys/shellscr/META-INF/jboss-service.xml
Log:
Fix privkeys/pubkeys locations.
Modified: releases/bedework-3.7/config/bwbuild/default/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/default/cal.options.xml 2011-02-18 15:16:23 UTC (rev 3185)
+++ releases/bedework-3.7/config/bwbuild/default/cal.options.xml 2011-02-18 15:17:09 UTC (rev 3186)
@@ -43,8 +43,8 @@
<timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
<!-- Public/private key locations -->
- <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
- <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
+ <privKeys>@DATA_DIR@/privkeys</privKeys>
+ <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
<systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
<principalRoot>/principals</principalRoot>
Modified: releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml 2011-02-18 15:16:23 UTC (rev 3185)
+++ releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml 2011-02-18 15:17:09 UTC (rev 3186)
@@ -43,8 +43,8 @@
<timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
<!-- Public/private key locations -->
- <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
- <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
+ <privKeys>@DATA_DIR@/privkeys</privKeys>
+ <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
<systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
<principalRoot>/principals</principalRoot>
Modified: releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml 2011-02-18 15:16:23 UTC (rev 3185)
+++ releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml 2011-02-18 15:17:09 UTC (rev 3186)
@@ -43,8 +43,8 @@
<timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
<!-- Public/private key locations -->
- <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
- <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
+ <privKeys>@DATA_DIR@/privkeys</privKeys>
+ <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
<systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
<principalRoot>/principals</principalRoot>
Modified: releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml 2011-02-18 15:16:23 UTC (rev 3185)
+++ releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml 2011-02-18 15:17:09 UTC (rev 3186)
@@ -43,8 +43,8 @@
<timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
<!-- Public/private key locations -->
- <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
- <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
+ <privKeys>@DATA_DIR@/privkeys</privKeys>
+ <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
<systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
<principalRoot>/principals</principalRoot>
Modified: releases/bedework-3.7/config/bwbuild/liferay5/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/liferay5/cal.options.xml 2011-02-18 15:16:23 UTC (rev 3185)
+++ releases/bedework-3.7/config/bwbuild/liferay5/cal.options.xml 2011-02-18 15:17:09 UTC (rev 3186)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+
<!-- This provides run time options for each of the configured applications.
-->
<bedework-options>
@@ -4,7 +6,7 @@
<org>
<bedework>
<global>
- <version>3.6</version>
+ <version>3.7</version>
<!-- This property is how the running system finds the system settings.
In theory we could have multiple settings with different names
@@ -29,13 +31,22 @@
<personalCalendarUri>/ucal</personalCalendarUri>
<!-- CardDAV server locations -->
- <publicCardDAVUri>http://localhost:8080/carddav</publicCardDAVUri>
- <personalCardDAVUri>http://localhost:8080/ucarddav</personalCardDAVUri>
+ <publicCardDAVHost>localhost</publicCardDAVHost>
+ <publicCardDAVPort>8080</publicCardDAVPort>
+ <publicCardDAVContext>/pubcarddav</publicCardDAVContext>
+
+ <personalCardDAVHost>localhost</personalCardDAVHost>
+ <personalCardDAVPort>8080</personalCardDAVPort>
+ <personalCardDAVContext>/ucarddav</personalCardDAVContext>
<!-- Timezone server locations -->
<timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
- <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
+ <!-- Public/private key locations -->
+ <privKeys>@DATA_DIR@/privkeys</privKeys>
+ <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
+
+ <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
<principalRoot>/principals</principalRoot>
<userPrincipalRoot>/principals/users</userPrincipalRoot>
<groupPrincipalRoot>/principals/groups</groupPrincipalRoot>
@@ -46,6 +57,313 @@
<hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
</systemRoots>
+ <!-- To enable mapping of calendar addresses e.g. mailto:fred at example.org
+ on to principals we need to either do a directory lookup or have
+ some sort of pattern map.
+
+ Setting a caladdr prefix enables pattern mapping. By default
+ calendar addresses are users -->
+
+ <!--
+ <caladdrPrefixes classname="org.bedework.calfacade.configs.CalAddrPrefixes">
+ <location>loc_</location>
+ </caladdrPrefixes>
+ -->
+
+ <!-- ===============================================================
+ CardDAV directory handlers
+ =============================================================== -->
+
+ <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.
+
+ Each element name below must be unique.
+ -->
+ <principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/principals</pathPrefix>
+ <className>org.bedework.carddav.server.dirHandlers.ldap.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 implementation.
+ -->
+ <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>
+
+ <!-- The cardPathPrefix is used to manufacture a path to a card for
+ the principal. If it is set we take the path
+
+ <principal-root>/<account>
+
+ and transform it to
+
+ <cardPathPrefix>/<account>.vcf
+
+ If it is not set we try the cardPathPrefixes supplied globally.
+ If they are not supplied we don't give any path. The client will
+ have to fall back to a query.
+ -->
+ <cardPathPrefix>/public/people</cardPathPrefix>
+
+ <cardPathPrefixes>/public/people,loc_:/public/locations</cardPathPrefixes>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.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.ldap.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>
+
+ <location-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/principals/locations</pathPrefix>
+ <addressBook>true</addressBook>
+ <cardPathPrefix>/public/locations</cardPathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+
+ <baseDn>ou=locations,dc=bedework,dc=org</baseDn>
+
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <cardKind>location</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>
+ </location-principal-dirHandler>
+
+ <!-- handle the public (enterprise) people address book hierarchy -->
+ <public-people-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/public/people</pathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className>
+
+ <!-- manufacture an owner for public entities -->
+ <ownerHref>/principals/users/admin</ownerHref>
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+ <baseDn>ou=people,ou=public,dc=bedework,dc=org</baseDn>
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <folderObjectClass>organizationalUnit</folderObjectClass>
+ <addressbookObjectClass>organizationalUnit</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-people-dirHandler>
+
+
+ <!-- handle the user address book hierarchy -->
+
+ <user-dirHandler classname="org.bedework.carddav.util.DbDirHandlerConfig" >
+ <pathPrefix>/user</pathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.db.DbAddrBookDirHandler</className>
+
+ <queryLimit>1000</queryLimit> <!-- unimplemented -->
+
+ <!-- This is the access set at the root. I'll do this as XML soon -->
+ <rootAccess>WONyA WANyFyS </rootAccess>
+
+ <!-- This is the owner of the user root and user home -->
+ <rootOwner>/principals/users/root</rootOwner>
+
+ <debug>true</debug>
+ </user-dirHandler>
+
+ <!-- handle the user address book hierarchy
+ How it might be done with ldap
+ <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/user</pathPrefix>
+ <className>org.bedework.carddav.server.dirHandlers.ldap.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>
+ -->
+
+ <public-locations-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/public/locations</pathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className>
+
+ <!-- manufacture an owner for public entities -->
+ <ownerHref>/principals/users/admin</ownerHref>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+ <baseDn>ou=locations,ou=public,dc=bedework,dc=org</baseDn>
+
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <cardKind>location</cardKind>
+
+ <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+ <addressbookIdAttr>ou</addressbookIdAttr>
+
+ <addressbookEntryObjectClass>CalendarResource</addressbookEntryObjectClass>
+ <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+ <principalIdAttr>calcaladruri</principalIdAttr>
+
+ <authDn>uid=admin,ou=system</authDn>
+ <authPw>secret</authPw>
+
+ <debug>true</debug>
+ </public-locations-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.ldap.LdapAddrBookDirHandler</className>
+
+ <!-- manufacture an owner for public entities -->
+ <ownerHref>/principals/users/admin</ownerHref>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+
+ <baseDn>ou=public,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>
+
+ <!-- ===============================================================
+ Calendar system modules
+ =============================================================== -->
+
<module>
<!-- A dummy module with no directory. -->
<dir-config classname="org.bedework.calfacade.configs.DirConfigProperties">
@@ -98,14 +416,6 @@
<dummymail classname="org.bedework.mail.MailConfigProperties">
<disabled>false</disabled>
</dummymail>
-
- <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
- <privKeys>@QUICKSTART_DIR@/data/bedework/privkeys</privKeys>
- <pubKeys>@QUICKSTART_DIR@/data/bedework/pubkeys</pubKeys>
-
- <debug>true</debug>
- <verbose>true</verbose>
- </default-pwencrypt>
</module>
</global>
@@ -161,27 +471,35 @@
</syspars>
<app>
- <!-- ==================================================================
+ <!-- ===============================================================
Timezones server
- ================================================================== -->
- <tzsvr classname="org.bedework.calfacade.configs.ConfigCommon">
+ =============================================================== -->
+ <tzsvr classname="org.bedework.timezones.common.TzsvrConfig">
<appType>tzsvr</appType>
- <publicAdmin>false</publicAdmin>
- <guestMode>true</guestMode>
+
+ <!-- Property defining location of the registry -->
+ <tzdataUrl>http://localhost:8080/tzdata.zip</tzdataUrl>
+
+ <!-- Property defining long seconds refetch interval for data -->
+ <refetchInterval>6000</refetchInterval>
+
+ <cacheName>vtz</cacheName>
+
+ <postId>12345abcde</postId>
</tzsvr>
- <!-- ==================================================================
+ <!-- ===============================================================
Config web client
- ================================================================== -->
+ =============================================================== -->
<bwconfig classname="org.bedework.calfacade.configs.ConfigCommon">
<appType>webconfig</appType>
<publicAdmin>false</publicAdmin>
<guestMode>false</guestMode>
</bwconfig>
- <!-- ==================================================================
+ <!-- ===============================================================
Admin web client CalAdmin
- ================================================================== -->
+ =============================================================== -->
<CalAdmin classname="org.bedework.calfacade.configs.AdminConfig">
<autoCreateContacts>false</autoCreateContacts>
<autoDeleteContacts>false</autoDeleteContacts>
@@ -212,7 +530,11 @@
<minIncrement>5</minIncrement>
<logPrefix>PubEventsAdmin</logPrefix>
-
+
+ <!-- Where the browser finds css and other resources -->
+ <browserResourceRoot>http://localhost:8080/caladminrsrc</browserResourceRoot>
+
+ <!-- Where the server finds xsl etc -->
<appRoot>http://localhost:8080/caladminrsrc</appRoot>
</CalAdmin>
@@ -242,6 +564,10 @@
<logPrefix>EventSubmit</logPrefix>
+ <!-- Where the browser finds css and other resources -->
+ <browserResourceRoot>http://localhost:8080/eventsubmitrsrc</browserResourceRoot>
+
+ <!-- Where the server finds xsl etc -->
<appRoot>http://localhost:8080/eventsubmitrsrc</appRoot>
<refreshAction>setup.do</refreshAction>
@@ -274,6 +600,10 @@
<logPrefix>PubEvents</logPrefix>
+ <!-- Where the browser finds css and other resources -->
+ <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot>
+
+ <!-- Where the server finds xsl etc -->
<appRoot>http://localhost:8080/calrsrc</appRoot>
<refreshAction>setup.do</refreshAction>
@@ -282,8 +612,6 @@
<calSuite>MainCampus</calSuite>
</Events>
-
-
<!-- ==================================================================
Feed Service
================================================================== -->
@@ -310,6 +638,10 @@
<logPrefix>Feeder</logPrefix>
+ <!-- Where the browser finds css and other resources -->
+ <browserResourceRoot>http://localhost:8080/calfeedrsrc</browserResourceRoot>
+
+ <!-- Where the server finds xsl etc -->
<appRoot>http://localhost:8080/calfeedrsrc</appRoot>
<refreshAction>setup.do</refreshAction>
@@ -344,6 +676,10 @@
<logPrefix>SoEDept</logPrefix>
+ <!-- Where the browser finds css and other resources -->
+ <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot>
+
+ <!-- Where the server finds xsl etc -->
<appRoot>http://localhost:8080/calrsrc</appRoot>
<refreshAction>setup.do</refreshAction>
@@ -375,15 +711,19 @@
<logPrefix>PersonalCalendar</logPrefix>
+ <!-- Where the browser finds css and other resources -->
+ <browserResourceRoot>http://localhost:8080/ucalrsrc</browserResourceRoot>
+
+ <!-- Where the server finds xsl etc -->
<appRoot>http://localhost:8080/ucalrsrc</appRoot>
<refreshAction>setup.do</refreshAction>
<refreshInterval>300</refreshInterval>
</UserCal>
- <!-- ==================================================================
+ <!-- ===============================================================
User CalDAV server UserCalDAV
- ================================================================== -->
+ =============================================================== -->
<Usercaldav classname="org.bedework.caldav.util.CalDAVConfig">
<appType>usercaldav</appType>
<!--
@@ -436,6 +776,32 @@
</Pubcaldav>
<!-- ==================================================================
+ User CalWS server Usercalws
+ ================================================================== -->
+ <Usercalws classname="org.bedework.caldav.util.CalDAVConfig">
+ <appType>usercalws</appType>
+ <!--
+ <publicAdmin>false</publicAdmin>
+ -->
+ <guestMode>false</guestMode>
+
+ <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+ </Usercalws>
+
+ <!-- ==================================================================
+ Public (unauthenticated) CalWS server Pubcalws
+ ================================================================== -->
+ <Pubcalws classname="org.bedework.caldav.util.CalDAVConfig">
+ <appType>publiccalws</appType>
+ <!--
+ <publicAdmin>false</publicAdmin>
+ -->
+ <guestMode>true</guestMode>
+
+ <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+ </Pubcalws>
+
+ <!-- ==================================================================
CalDAV test suite
================================================================== -->
<caldavTest classname="org.bedework.calfacade.configs.ConfigCommon">
@@ -486,6 +852,26 @@
</sysevlog>
<!-- ==================================================================
+ System events monitor program
+ ================================================================== -->
+ <monitor classname="org.bedework.calfacade.configs.BwCrawlerConfig">
+ <debug>true</debug>
+ <appType>monitor</appType>
+ <guestMode>true</guestMode>
+ <debugEntity>false</debugEntity>
+ </monitor>
+
+ <!-- ==================================================================
+ System key generator
+ ================================================================== -->
+ <genkeys classname="org.bedework.calfacade.configs.BwCrawlerConfig">
+ <debug>true</debug>
+ <appType>genkeys</appType>
+ <guestMode>true</guestMode>
+ <debugEntity>false</debugEntity>
+ </genkeys>
+
+ <!-- ==================================================================
In/outbox scheduler program
================================================================== -->
<iosched classname="org.bedework.calfacade.configs.BwCrawlerConfig">
@@ -494,6 +880,97 @@
<guestMode>true</guestMode>
<debugEntity>false</debugEntity>
</iosched>
+
+ <!-- ==================================================================
+ Exchange synch
+ ================================================================== -->
+ <Exsynch classname="org.bedework.exchgsynch.ExsynchConfig">
+ <appType>exsynch</appType>
+
+ <!-- location of the WSDL - modified to include server element -->
+ <exchangeWSDLURI>http://localhost:8080/exchange/Services.wsdl</exchangeWSDLURI>
+
+ <!-- Exchange sync callback. Comment out for no service -->
+ <exchangeWsPushURI>http://128.113.124.221/exsynch/</exchangeWsPushURI>
+
+ <!-- Path to keystore - comment out to use default -->
+ <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore>
+
+ <!-- location of the WSDL for the remote web service -->
+ <remoteWSDLURI>http://localhost:8080/exchange/wssvc.wsdl</remoteWSDLURI>
+
+ <remoteWsURL>http://localhost:8080/pubcaldav/exsynchws/</remoteWsURL>
+
+ <!-- seconds -->
+ <remoteKeepAliveInterval>60</remoteKeepAliveInterval>
+ </Exsynch>
+
+ <!-- ===============================================================
+ User CardDAV server usercarddav
+ =============================================================== -->
+ <usercarddav classname="org.bedework.carddav.util.CardDAVConfig" >
+ <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+
+ <webaddrServiceURI>/find</webaddrServiceURI>
+ <webaddrServicePropertiesList>fn,email,note,org</webaddrServicePropertiesList>
+ <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+ <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+ <defaultAddressbook>addressbook</defaultAddressbook>
+
+ <!-- This will act as the root for the file system -->
+ <addressBookHandlerPrefix>/user</addressBookHandlerPrefix>
+
+ <!-- Needed for access calculations -->
+ <userHomeRoot>/user</userHomeRoot>
+
+ <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>
+ </usercarddav>
+
+ <!-- ===============================================================
+ Public CardDAV server pubcarddav
+ =============================================================== -->
+ <pubcarddav classname="org.bedework.carddav.util.CardDAVConfig" >
+ <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+
+ <webaddrServiceURI>/find</webaddrServiceURI>
+ <webaddrServicePropertiesList>fn,note,org</webaddrServicePropertiesList>
+ <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+ <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+ <defaultAddressbook>addressbook</defaultAddressbook>
+
+ <addressBookHandlerPrefix>/public</addressBookHandlerPrefix>
+
+ <!-- Needed for access calculations -->
+ <userHomeRoot>/user</userHomeRoot>
+
+ <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>
+
+ <!-- ==================================================================
+ CardDAV importer
+ ================================================================== -->
+ <carddavImp classname="org.bedework.carddav.util.CardDAVConfig">
+ <appType>carddavimp</appType>
+ <!--
+ <publicAdmin>false</publicAdmin> -->
+ <guestMode>false</guestMode>
+ </carddavImp>
</app>
</bedework>
</org>
Modified: releases/bedework-3.7/config/bwbuild/oracle10g/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/oracle10g/cal.options.xml 2011-02-18 15:16:23 UTC (rev 3185)
+++ releases/bedework-3.7/config/bwbuild/oracle10g/cal.options.xml 2011-02-18 15:17:09 UTC (rev 3186)
@@ -1,3 +1,5 @@
+<?xml version="1.0"?>
+
<!-- This provides run time options for each of the configured applications.
-->
<bedework-options>
@@ -29,13 +31,22 @@
<personalCalendarUri>/ucal</personalCalendarUri>
<!-- CardDAV server locations -->
- <publicCardDAVUri>http://localhost:8080/carddav</publicCardDAVUri>
- <personalCardDAVUri>http://localhost:8080/ucarddav</personalCardDAVUri>
+ <publicCardDAVHost>localhost</publicCardDAVHost>
+ <publicCardDAVPort>8080</publicCardDAVPort>
+ <publicCardDAVContext>/pubcarddav</publicCardDAVContext>
+
+ <personalCardDAVHost>localhost</personalCardDAVHost>
+ <personalCardDAVPort>8080</personalCardDAVPort>
+ <personalCardDAVContext>/ucarddav</personalCardDAVContext>
<!-- Timezone server locations -->
<timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
- <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
+ <!-- Public/private key locations -->
+ <privKeys>@DATA_DIR@/privkeys</privKeys>
+ <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
+
+ <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
<principalRoot>/principals</principalRoot>
<userPrincipalRoot>/principals/users</userPrincipalRoot>
<groupPrincipalRoot>/principals/groups</groupPrincipalRoot>
@@ -46,6 +57,313 @@
<hostPrincipalRoot>/principals/hosts</hostPrincipalRoot>
</systemRoots>
+ <!-- To enable mapping of calendar addresses e.g. mailto:fred at example.org
+ on to principals we need to either do a directory lookup or have
+ some sort of pattern map.
+
+ Setting a caladdr prefix enables pattern mapping. By default
+ calendar addresses are users -->
+
+ <!--
+ <caladdrPrefixes classname="org.bedework.calfacade.configs.CalAddrPrefixes">
+ <location>loc_</location>
+ </caladdrPrefixes>
+ -->
+
+ <!-- ===============================================================
+ CardDAV directory handlers
+ =============================================================== -->
+
+ <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.
+
+ Each element name below must be unique.
+ -->
+ <principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/principals</pathPrefix>
+ <className>org.bedework.carddav.server.dirHandlers.ldap.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 implementation.
+ -->
+ <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>
+
+ <!-- The cardPathPrefix is used to manufacture a path to a card for
+ the principal. If it is set we take the path
+
+ <principal-root>/<account>
+
+ and transform it to
+
+ <cardPathPrefix>/<account>.vcf
+
+ If it is not set we try the cardPathPrefixes supplied globally.
+ If they are not supplied we don't give any path. The client will
+ have to fall back to a query.
+ -->
+ <cardPathPrefix>/public/people</cardPathPrefix>
+
+ <cardPathPrefixes>/public/people,loc_:/public/locations</cardPathPrefixes>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.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.ldap.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>
+
+ <location-principal-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/principals/locations</pathPrefix>
+ <addressBook>true</addressBook>
+ <cardPathPrefix>/public/locations</cardPathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapPrincipalDirHandler</className>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+
+ <baseDn>ou=locations,dc=bedework,dc=org</baseDn>
+
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <cardKind>location</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>
+ </location-principal-dirHandler>
+
+ <!-- handle the public (enterprise) people address book hierarchy -->
+ <public-people-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/public/people</pathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className>
+
+ <!-- manufacture an owner for public entities -->
+ <ownerHref>/principals/users/admin</ownerHref>
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+ <baseDn>ou=people,ou=public,dc=bedework,dc=org</baseDn>
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <folderObjectClass>organizationalUnit</folderObjectClass>
+ <addressbookObjectClass>organizationalUnit</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-people-dirHandler>
+
+
+ <!-- handle the user address book hierarchy -->
+
+ <user-dirHandler classname="org.bedework.carddav.util.DbDirHandlerConfig" >
+ <pathPrefix>/user</pathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.db.DbAddrBookDirHandler</className>
+
+ <queryLimit>1000</queryLimit> <!-- unimplemented -->
+
+ <!-- This is the access set at the root. I'll do this as XML soon -->
+ <rootAccess>WONyA WANyFyS </rootAccess>
+
+ <!-- This is the owner of the user root and user home -->
+ <rootOwner>/principals/users/root</rootOwner>
+
+ <debug>true</debug>
+ </user-dirHandler>
+
+ <!-- handle the user address book hierarchy
+ How it might be done with ldap
+ <user-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/user</pathPrefix>
+ <className>org.bedework.carddav.server.dirHandlers.ldap.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>
+ -->
+
+ <public-locations-dirHandler classname="org.bedework.carddav.util.LdapDirHandlerConfig" >
+ <pathPrefix>/public/locations</pathPrefix>
+
+ <className>org.bedework.carddav.server.dirHandlers.ldap.LdapAddrBookDirHandler</className>
+
+ <!-- manufacture an owner for public entities -->
+ <ownerHref>/principals/users/admin</ownerHref>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+ <baseDn>ou=locations,ou=public,dc=bedework,dc=org</baseDn>
+
+ <queryLimit>1000</queryLimit>
+
+ <attrIds></attrIds>
+
+ <cardKind>location</cardKind>
+
+ <addressbookObjectClass>organizationalUnit</addressbookObjectClass>
+ <addressbookIdAttr>ou</addressbookIdAttr>
+
+ <addressbookEntryObjectClass>CalendarResource</addressbookEntryObjectClass>
+ <addressbookEntryIdAttr>cn</addressbookEntryIdAttr>
+
+ <principalIdAttr>calcaladruri</principalIdAttr>
+
+ <authDn>uid=admin,ou=system</authDn>
+ <authPw>secret</authPw>
+
+ <debug>true</debug>
+ </public-locations-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.ldap.LdapAddrBookDirHandler</className>
+
+ <!-- manufacture an owner for public entities -->
+ <ownerHref>/principals/users/admin</ownerHref>
+
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://localhost:10389/</providerUrl>
+
+ <baseDn>ou=public,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>
+
+ <!-- ===============================================================
+ Calendar system modules
+ =============================================================== -->
+
<module>
<!-- A dummy module with no directory. -->
<dir-config classname="org.bedework.calfacade.configs.DirConfigProperties">
@@ -98,14 +416,6 @@
<dummymail classname="org.bedework.mail.MailConfigProperties">
<disabled>false</disabled>
</dummymail>
-
- <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
- <privKeys>@QUICKSTART_DIR@/data/bedework/privkeys</privKeys>
- <pubKeys>@QUICKSTART_DIR@/data/bedework/pubkeys</pubKeys>
-
- <debug>true</debug>
- <verbose>true</verbose>
- </default-pwencrypt>
</module>
</global>
@@ -161,27 +471,35 @@
</syspars>
<app>
- <!-- ==================================================================
+ <!-- ===============================================================
Timezones server
- ================================================================== -->
- <tzsvr classname="org.bedework.calfacade.configs.ConfigCommon">
+ =============================================================== -->
+ <tzsvr classname="org.bedework.timezones.common.TzsvrConfig">
<appType>tzsvr</appType>
- <publicAdmin>false</publicAdmin>
- <guestMode>true</guestMode>
+
+ <!-- Property defining location of the registry -->
+ <tzdataUrl>http://localhost:8080/tzdata.zip</tzdataUrl>
+
+ <!-- Property defining long seconds refetch interval for data -->
+ <refetchInterval>6000</refetchInterval>
+
+ <cacheName>vtz</cacheName>
+
+ <postId>12345abcde</postId>
</tzsvr>
- <!-- ==================================================================
+ <!-- ===============================================================
Config web client
- ================================================================== -->
+ =============================================================== -->
<bwconfig classname="org.bedework.calfacade.configs.ConfigCommon">
<appType>webconfig</appType>
<publicAdmin>false</publicAdmin>
<guestMode>false</guestMode>
</bwconfig>
- <!-- ==================================================================
+ <!-- ===============================================================
Admin web client CalAdmin
- ================================================================== -->
+ =============================================================== -->
<CalAdmin classname="org.bedework.calfacade.configs.AdminConfig">
<autoCreateContacts>false</autoCreateContacts>
<autoDeleteContacts>false</autoDeleteContacts>
@@ -294,8 +612,6 @@
<calSuite>MainCampus</calSuite>
</Events>
-
-
<!-- ==================================================================
Feed Service
================================================================== -->
@@ -405,9 +721,9 @@
<refreshInterval>300</refreshInterval>
</UserCal>
- <!-- ==================================================================
+ <!-- ===============================================================
User CalDAV server UserCalDAV
- ================================================================== -->
+ =============================================================== -->
<Usercaldav classname="org.bedework.caldav.util.CalDAVConfig">
<appType>usercaldav</appType>
<!--
@@ -460,6 +776,32 @@
</Pubcaldav>
<!-- ==================================================================
+ User CalWS server Usercalws
+ ================================================================== -->
+ <Usercalws classname="org.bedework.caldav.util.CalDAVConfig">
+ <appType>usercalws</appType>
+ <!--
+ <publicAdmin>false</publicAdmin>
+ -->
+ <guestMode>false</guestMode>
+
+ <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+ </Usercalws>
+
+ <!-- ==================================================================
+ Public (unauthenticated) CalWS server Pubcalws
+ ================================================================== -->
+ <Pubcalws classname="org.bedework.caldav.util.CalDAVConfig">
+ <appType>publiccalws</appType>
+ <!--
+ <publicAdmin>false</publicAdmin>
+ -->
+ <guestMode>true</guestMode>
+
+ <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+ </Pubcalws>
+
+ <!-- ==================================================================
CalDAV test suite
================================================================== -->
<caldavTest classname="org.bedework.calfacade.configs.ConfigCommon">
@@ -510,6 +852,26 @@
</sysevlog>
<!-- ==================================================================
+ System events monitor program
+ ================================================================== -->
+ <monitor classname="org.bedework.calfacade.configs.BwCrawlerConfig">
+ <debug>true</debug>
+ <appType>monitor</appType>
+ <guestMode>true</guestMode>
+ <debugEntity>false</debugEntity>
+ </monitor>
+
+ <!-- ==================================================================
+ System key generator
+ ================================================================== -->
+ <genkeys classname="org.bedework.calfacade.configs.BwCrawlerConfig">
+ <debug>true</debug>
+ <appType>genkeys</appType>
+ <guestMode>true</guestMode>
+ <debugEntity>false</debugEntity>
+ </genkeys>
+
+ <!-- ==================================================================
In/outbox scheduler program
================================================================== -->
<iosched classname="org.bedework.calfacade.configs.BwCrawlerConfig">
@@ -518,6 +880,97 @@
<guestMode>true</guestMode>
<debugEntity>false</debugEntity>
</iosched>
+
+ <!-- ==================================================================
+ Exchange synch
+ ================================================================== -->
+ <Exsynch classname="org.bedework.exchgsynch.ExsynchConfig">
+ <appType>exsynch</appType>
+
+ <!-- location of the WSDL - modified to include server element -->
+ <exchangeWSDLURI>http://localhost:8080/exchange/Services.wsdl</exchangeWSDLURI>
+
+ <!-- Exchange sync callback. Comment out for no service -->
+ <exchangeWsPushURI>http://128.113.124.221/exsynch/</exchangeWsPushURI>
+
+ <!-- Path to keystore - comment out to use default -->
+ <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore>
+
+ <!-- location of the WSDL for the remote web service -->
+ <remoteWSDLURI>http://localhost:8080/exchange/wssvc.wsdl</remoteWSDLURI>
+
+ <remoteWsURL>http://localhost:8080/pubcaldav/exsynchws/</remoteWsURL>
+
+ <!-- seconds -->
+ <remoteKeepAliveInterval>60</remoteKeepAliveInterval>
+ </Exsynch>
+
+ <!-- ===============================================================
+ User CardDAV server usercarddav
+ =============================================================== -->
+ <usercarddav classname="org.bedework.carddav.util.CardDAVConfig" >
+ <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+
+ <webaddrServiceURI>/find</webaddrServiceURI>
+ <webaddrServicePropertiesList>fn,email,note,org</webaddrServicePropertiesList>
+ <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+ <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+ <defaultAddressbook>addressbook</defaultAddressbook>
+
+ <!-- This will act as the root for the file system -->
+ <addressBookHandlerPrefix>/user</addressBookHandlerPrefix>
+
+ <!-- Needed for access calculations -->
+ <userHomeRoot>/user</userHomeRoot>
+
+ <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>
+ </usercarddav>
+
+ <!-- ===============================================================
+ Public CardDAV server pubcarddav
+ =============================================================== -->
+ <pubcarddav classname="org.bedework.carddav.util.CardDAVConfig" >
+ <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl>
+
+ <webaddrServiceURI>/find</webaddrServiceURI>
+ <webaddrServicePropertiesList>fn,note,org</webaddrServicePropertiesList>
+ <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook>
+
+ <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed>
+
+ <defaultAddressbook>addressbook</defaultAddressbook>
+
+ <addressBookHandlerPrefix>/public</addressBookHandlerPrefix>
+
+ <!-- Needed for access calculations -->
+ <userHomeRoot>/user</userHomeRoot>
+
+ <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>
+
+ <!-- ==================================================================
+ CardDAV importer
+ ================================================================== -->
+ <carddavImp classname="org.bedework.carddav.util.CardDAVConfig">
+ <appType>carddavimp</appType>
+ <!--
+ <publicAdmin>false</publicAdmin> -->
+ <guestMode>false</guestMode>
+ </carddavImp>
</app>
</bedework>
</org>
Modified: releases/bedework-3.7/deployment/genkeys/shellscr/META-INF/jboss-service.xml
===================================================================
--- releases/bedework-3.7/deployment/genkeys/shellscr/META-INF/jboss-service.xml 2011-02-18 15:16:23 UTC (rev 3185)
+++ releases/bedework-3.7/deployment/genkeys/shellscr/META-INF/jboss-service.xml 2011-02-18 15:17:09 UTC (rev 3186)
@@ -8,10 +8,10 @@
<mbean code="org.bedework.calfacade.security.GenKeys"
name="org.bedework:service=GenKeys">
<attribute name="PrivKeyFileName"
- >${jboss.server.data.dir}/bedework/privkeys</attribute>
+ >@DATA_DIR@/privkeys</attribute>
<attribute name="PublicKeyFileName"
- >${jboss.server.data.dir}/bedework/pubkeys</attribute>
+ >@DATA_DIR@/pubkeys</attribute>
</mbean>
</server>
More information about the Bedework-commit
mailing list