[Bedework-commit] bedework r3191 - in trunk: build build/buildTools
build/quickstart/linux build/quickstart/windows
config/bwbuild/default config/bwbuild/jboss-h2
config/bwbuild/jboss-mysql config/bwbuild/jboss-postgresql
config/bwbuild/liferay5 config/bwbuild/oracle10g deployment util
svnadmin at bedework.org
svnadmin at bedework.org
Tue Feb 22 13:27:48 EST 2011
Author: douglm
Date: 2011-02-22 13:27:46 -0500 (Tue, 22 Feb 2011)
New Revision: 3191
Removed:
trunk/config/bwbuild/liferay5/carddav.options.xml
trunk/config/bwbuild/oracle10g/carddav.options.xml
trunk/config/bwbuild/oracle10g/context.xml
Modified:
trunk/build/buildTools/wsimport.xml
trunk/build/bw-deployutil-3.7.jar
trunk/build/quickstart/linux/bw
trunk/build/quickstart/windows/bw.bat
trunk/config/bwbuild/default/build.properties
trunk/config/bwbuild/default/cal.properties
trunk/config/bwbuild/jboss-h2/build.properties
trunk/config/bwbuild/jboss-h2/cal.properties
trunk/config/bwbuild/jboss-mysql/build.properties
trunk/config/bwbuild/jboss-mysql/cal.properties
trunk/config/bwbuild/jboss-postgresql/build.properties
trunk/config/bwbuild/jboss-postgresql/cal.options.xml
trunk/config/bwbuild/jboss-postgresql/cal.properties
trunk/config/bwbuild/liferay5/build.properties
trunk/config/bwbuild/liferay5/cal.properties
trunk/config/bwbuild/oracle10g/build.properties
trunk/config/bwbuild/oracle10g/cal.properties
trunk/deployment/bw-core-appjars.xml
trunk/util/svncopy.sh
Log:
Changes to introduce bwxml project - all xml schemas now located in this project built separately.
Other projects with a dependency now build this project.
Also fixed a few java warnings that surfaced from the noise.
Added an updateall action to bw
Modified: trunk/build/buildTools/wsimport.xml
===================================================================
--- trunk/build/buildTools/wsimport.xml 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/build/buildTools/wsimport.xml 2011-02-22 18:27:46 UTC (rev 3191)
@@ -23,29 +23,25 @@
<project name="do.wsimport" basedir="." default="">
<macrodef name="wsimport">
<attribute name="wsdl"/>
+ <attribute name="wsdllocation" />
<attribute name="module-base"/>
<attribute name="jar-file"/>
<attribute name="bindingsdir" default="" />
<sequential>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
- <property name="sourcedestdir" location="@{module-base}/src" />
-
+ <var name="sourcedestdir" value="@{module-base}/src" />
<dirname property="org.bedework.wsdl.dir" file="@{wsdl}"/>
<if>
- <available file="${sourcedestdir}" type="dir" />
- <then>
+ <and>
+ <available file="${sourcedestdir}" type="dir" />
<uptodate property="org.bedework.wsimport.uptodate"
targetfile="@{jar-file}" >
<srcfiles dir="${org.bedework.wsdl.dir}" />
</uptodate>
- </then>
- </if>
-
- <if>
- <isset property="org.bedework.wsimport.uptodate"/>
+ </and>
<then>
<noisyMsg message="**** @{jar.file} is up to date" />
</then>
@@ -115,7 +111,7 @@
<debugCpid idpar="wsimport.classpath" />
- <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
+ <taskdef name="wsimportTask" classname="com.sun.tools.ws.ant.WsImport">
<classpath refid="wsimport.classpath" />
</taskdef>
@@ -128,22 +124,24 @@
<if>
<equals arg1="@{bindingsdir}" arg2="" />
<then>
- <wsimport keep="true"
- sourcedestdir="${sourcedestdir}"
- destdir="${wsimport.dest}"
- wsdl="@{wsdl}"
- xendorsed="true" >
- </wsimport>
+ <wsimportTask keep="true"
+ sourcedestdir="${sourcedestdir}"
+ destdir="${wsimport.dest}"
+ wsdl="@{wsdl}"
+ wsdllocation="@{wsdllocation}"
+ xendorsed="true" >
+ </wsimportTask>
</then>
<else>
- <wsimport keep="true"
- sourcedestdir="${sourcedestdir}"
- destdir="${wsimport.dest}"
- wsdl="@{wsdl}"
- xendorsed="true" >
+ <wsimportTask keep="true"
+ sourcedestdir="${sourcedestdir}"
+ destdir="${wsimport.dest}"
+ wsdl="@{wsdl}"
+ wsdllocation="@{wsdllocation}"
+ xendorsed="true" >
<binding dir="@{bindingsdir}" includes="*.xml">
</binding>
- </wsimport>
+ </wsimportTask>
</else>
</if>
Modified: trunk/build/bw-deployutil-3.7.jar
===================================================================
(Binary files differ)
Modified: trunk/build/quickstart/linux/bw
===================================================================
--- trunk/build/quickstart/linux/bw 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/build/quickstart/linux/bw 2011-02-22 18:27:46 UTC (rev 3191)
@@ -19,6 +19,9 @@
ant_loglevel="-quiet"
bw_loglevel=""
+# Projects we need to update
+updateProjects="bwxml bedework bedework-carddav bwtzsvr cachedfeeder"
+
echo ""
echo " Bedework Calendar System"
echo " ------------------------"
@@ -27,11 +30,23 @@
PRG="$0"
usage() {
+ echo " $PRG ACTION"
echo " $PRG [CONFIG-SOURCE] [CONFIG] [PROJECT] [ -offline ] [LOG_LEVEL] [ target ] "
- echo " $PRG ACTION"
echo ""
echo " where:"
echo ""
+ echo " ACTION defines an action to take usually in the context of the quickstart."
+ echo " In a deployed system many of these actions are handled directly by a"
+ echo " deployed application. ACTION may be one of"
+ echo " -updateall Does an svn update of all projects"
+ echo " -reindex runs the indexer directly out of the quickstart bedework"
+ echo " dist directory to rebuild the lucene indexes"
+ echo " -zoneinfo builds zoneinfo data for the timezones server"
+ echo " requires -version and -tzdata parameters. NOTE: build depends on glib2"
+ echo " -buildwebcache builds webcache"
+ echo " -deploywebcache deploys webcache"
+ echo " -deployurlbuilder deploys url/widget builder"
+ echo ""
echo " CONFIG-SOURCE optionally defines the location of configurations and"
echo " is one or none of "
echo " -quickstart to use the configurations within the quickstart"
@@ -54,6 +69,7 @@
echo " target Ant target to execute"
echo ""
echo " PROJECT optionally defines the package to build and is none or more of"
+ echo " -bwxml Target is for the Bedework XML schemas build"
echo " -carddav Target is for the CardDAV build"
echo " -exsynch Target is for the Exchange synch build"
echo " -client Target is for the bedework client application build"
@@ -74,17 +90,6 @@
echo " The environment variable BEDEWORK_CONFIG contains the path to the current"
echo " configuration directory and can be used to build a path to the other files."
echo ""
- echo " ACTION defines an action to take usually in the context of the quickstart."
- echo " In a deployed system many of these actions are handled directly by a"
- echo " deployed application. ACTION may be one of"
- echo " -reindex runs the indexer directly out of the quickstart bedework"
- echo " dist directory to rebuild the lucene indexes"
- echo " -zoneinfo builds zoneinfo data for the timezones server"
- echo " requires -version and -tzdata parameters. NOTE: build depends on glib2"
- echo " -buildwebcache builds webcache"
- echo " -deploywebcache deploys webcache"
- echo " -deployurlbuilder deploys url/widget builder"
- echo ""
}
errorUsage() {
@@ -100,6 +105,21 @@
}
# ----------------------------------------------------------------------------
+# Update the projects
+# ----------------------------------------------------------------------------
+actionUpdateall() {
+ for project in $updateProjects
+ do
+ echo "*********************************************************************"
+ echo "Updating project $project"
+ echo "*********************************************************************"
+ svn update $project
+ done
+
+ exit 0
+}
+
+# ----------------------------------------------------------------------------
# Reindex the data
# ----------------------------------------------------------------------------
actionReindex() {
@@ -242,7 +262,7 @@
# Projects we will build
pkgdefault=yes
bedework=
-bwxmlschema=
+bwxml=
carddav=
caldav=
client=
@@ -261,6 +281,10 @@
# look for actions first
+if [ "$1" = "-updateall" ] ; then
+ actionUpdateall
+fi
+
if [ "$1" = "-reindex" ] ; then
actionReindex
fi
@@ -348,7 +372,7 @@
;;
# ------------------------Projects
-bwxml)
- bwxmlschema="yes"
+ bwxml="yes"
pkgdefault=
shift
;;
@@ -433,8 +457,8 @@
echo "BWCONFIGS=$BWCONFIGS"
echo "BWCONFIG=$BWCONFIG"
-if [ "$bwxmlschema" != "" ] ; then
- cd $QUICKSTART_HOME/bwxml-schema
+if [ "$bwxml" != "" ] ; then
+ cd $QUICKSTART_HOME/bwxml
fi
if [ "$caldav" != "" ] ; then
Modified: trunk/build/quickstart/windows/bw.bat
===================================================================
--- trunk/build/quickstart/windows/bw.bat 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/build/quickstart/windows/bw.bat 2011-02-22 18:27:46 UTC (rev 3191)
@@ -157,6 +157,17 @@
SHIFT
GOTO branch
+:updateall
+ for %%project in (%updateProjects%) do (
+ ECHO *************************************************************
+ ECHO Updating project %%project.
+ ECHO *************************************************************
+
+ echo svn update %%project
+ )
+
+ GOTO:EOF
+
:reindex
ECHO Calling the reindexer
SET INDEXER=%QUICKSTART_HOME%\bedework\dist\temp\shellscr\indexer
@@ -267,6 +278,7 @@
IF "%1" == "-bwchome" GOTO bwchome
IF "%1" == "-bwc" GOTO bwc
IF "%1" == "-offline" GOTO offline
+IF "%1" == "-updateall" GOTO updateall
IF "%1" == "-reindex" GOTO reindex
IF "%1" == "-zoneinfo" GOTO zoneinfo
IF "%1" == "-buildwebcache" GOTO buildwebcache
@@ -292,11 +304,24 @@
:usage
ECHO Usage:
ECHO.
+ ECHO bw ACTION
ECHO bw [CONFIG-SOURCE] [CONFIG] [PROJECT] [ -offline ] [ target ]
- ECHO bw ACTION
ECHO.
ECHO Where:
ECHO.
+ ECHO ACTION defines an action to take usually in the context of the quickstart.
+ ECHO In a deployed system many of these actions are handled directly by a
+ ECHO deployed application. ACTION may be one of
+ ECHO -updateall Does an svn update of all projects"
+ ECHO -reindex runs the indexer directly out of the quickstart bedework
+ ECHO dist directory to rebuild the lucene indexes
+REM Don't support zoneinfo command on Windows for now
+REM ECHO -zoneinfo - builds zoneinfo data for the timezones server
+REM ECHO requires -version and -tzdata parameters
+ ECHO -buildwebcache builds webcache
+ ECHO -deploywebcache deploys webcache
+ ECHO -deployurlbuilder deploys url/widget builder
+ ECHO.
ECHO CONFIG-SOURCE optionally defines the location of configurations and is one or none of
ECHO -quickstart to use the configurations within the quickstart
ECHO e.g. "bw -quickstart start"
@@ -329,17 +354,5 @@
ECHO The environment variable BEDEWORK_CONFIG contains the path to the current
ECHO configuration directory and can be used to build a path to the other files.
ECHO.
- ECHO ACTION defines an action to take usually in the context of the quickstart.
- ECHO In a deployed system many of these actions are handled directly by a
- ECHO deployed application. ACTION may be one of
- ECHO -reindex - runs the indexer directly out of the quickstart bedework
- ECHO dist directory to rebuild the lucene indexes
-REM Don't support zoneinfo command on Windows for now
-REM ECHO -zoneinfo - builds zoneinfo data for the timezones server
-REM ECHO requires -version and -tzdata parameters
- ECHO -buildwebcache - builds webcache
- ECHO -deploywebcache - deploys webcache
- ECHO -deployurlbuilder - deploys url/widget builder
ECHO.
ECHO.
- ECHO.
Modified: trunk/config/bwbuild/default/build.properties
===================================================================
--- trunk/config/bwbuild/default/build.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/default/build.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -10,6 +10,7 @@
org.bedework.version=3.7
org.bedework.access.version=3.7
org.bedework.bwtools.version=3.7
+org.bedework.bwxml.version=3.7
org.bedework.caldav.version=3.7
org.bedework.caldavtest.version=3.7
org.bedework.calendarapi.version=3.7
Modified: trunk/config/bwbuild/default/cal.properties
===================================================================
--- trunk/config/bwbuild/default/cal.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/default/cal.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -668,7 +668,8 @@
org.bedework.app.exsynchwcb.description=Bedework exsynch callback server.
org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server
org.bedework.app.exsynchwcb.name=Demoexsynchw
-org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+#org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.exsynchwcb.wsdl,deploy.dir=/exchange
org.bedework.app.exsynchwcb.logprefix=exsynch
Modified: trunk/config/bwbuild/jboss-h2/build.properties
===================================================================
--- trunk/config/bwbuild/jboss-h2/build.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/jboss-h2/build.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -10,6 +10,7 @@
org.bedework.version=3.7
org.bedework.access.version=3.7
org.bedework.bwtools.version=3.7
+org.bedework.bwxml.version=3.7
org.bedework.caldav.version=3.7
org.bedework.caldavtest.version=3.7
org.bedework.calendarapi.version=3.7
Modified: trunk/config/bwbuild/jboss-h2/cal.properties
===================================================================
--- trunk/config/bwbuild/jboss-h2/cal.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/jboss-h2/cal.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -661,7 +661,8 @@
org.bedework.app.exsynchwcb.description=Bedework exsynch callback server.
org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server
org.bedework.app.exsynchwcb.name=Demoexsynchw
-org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+#org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.exsynchwcb.wsdl,deploy.dir=/exchange
org.bedework.app.exsynchwcb.logprefix=exsynch
Modified: trunk/config/bwbuild/jboss-mysql/build.properties
===================================================================
--- trunk/config/bwbuild/jboss-mysql/build.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/jboss-mysql/build.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -10,6 +10,7 @@
org.bedework.version=3.7
org.bedework.access.version=3.7
org.bedework.bwtools.version=3.7
+org.bedework.bwxml.version=3.7
org.bedework.caldav.version=3.7
org.bedework.caldavtest.version=3.7
org.bedework.calendarapi.version=3.7
Modified: trunk/config/bwbuild/jboss-mysql/cal.properties
===================================================================
--- trunk/config/bwbuild/jboss-mysql/cal.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/jboss-mysql/cal.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -666,7 +666,8 @@
org.bedework.app.exsynchwcb.description=Bedework exsynch callback server.
org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server
org.bedework.app.exsynchwcb.name=Demoexsynchw
-org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+#org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.exsynchwcb.wsdl,deploy.dir=/exchange
org.bedework.app.exsynchwcb.logprefix=exsynch
Modified: trunk/config/bwbuild/jboss-postgresql/build.properties
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/build.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/jboss-postgresql/build.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -10,6 +10,7 @@
org.bedework.version=3.7
org.bedework.access.version=3.7
org.bedework.bwtools.version=3.7
+org.bedework.bwxml.version=3.7
org.bedework.caldav.version=3.7
org.bedework.caldavtest.version=3.7
org.bedework.calendarapi.version=3.7
Modified: trunk/config/bwbuild/jboss-postgresql/cal.options.xml
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/cal.options.xml 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/jboss-postgresql/cal.options.xml 2011-02-22 18:27:46 UTC (rev 3191)
@@ -897,17 +897,19 @@
<Exsynch classname="org.bedework.exchgsynch.ExsynchConfig">
<appType>exsynch</appType>
- <!-- location of the WSDL - modified to include server element -->
+ <!-- location of the WSDL - modified to include server element
+ localhost may be good enough
+ -->
<exchangeWSDLURI>http://localhost:8080/exchange/Services.wsdl</exchangeWSDLURI>
+ <!-- location of the WSDL for the remote web service -->
+ <remoteWSDLURI>http://localhost:8080/exchange/wssvc.wsdl</remoteWSDLURI>
+
<!-- Exchange sync callback. Comment out for no service -->
<exchangeWsPushURI>http://128.113.124.164:8080/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>
Modified: trunk/config/bwbuild/jboss-postgresql/cal.properties
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/cal.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/jboss-postgresql/cal.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -667,7 +667,8 @@
org.bedework.app.exsynchwcb.description=Bedework exsynch callback server.
org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server
org.bedework.app.exsynchwcb.name=Demoexsynchw
-org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+#org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.exsynchwcb.wsdl,deploy.dir=/exchange
org.bedework.app.exsynchwcb.logprefix=exsynch
Modified: trunk/config/bwbuild/liferay5/build.properties
===================================================================
--- trunk/config/bwbuild/liferay5/build.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/liferay5/build.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -1,26 +1,30 @@
#
# bedework.org/build.properties
#
-# Configure a build of a demo calendar running on bedework.org under liferay 5
+# Configure a build of a demo calendar running on bedework.org.
#
-# This file gives users the opportunity to override properties that will be
-# defined later in the build process.
-# The order of loading is:
-# <home-dir>/bedework.build.properties if it exists
-# <various other distributed properties>
-#
compile.debug=yes
+# Version we are building and including
+org.bedework.version=3.7
+org.bedework.access.version=3.7
+org.bedework.bwtools.version=3.7
+org.bedework.bwxml.version=3.7
+org.bedework.caldav.version=3.7
+org.bedework.caldavtest.version=3.7
+org.bedework.calendarapi.version=3.7
+org.bedework.davutil.version=3.7
+org.bedework.dumprestore.version=3.7
+org.bedework.indexer.version=3.7
+org.bedework.rpiutil.version=3.7
+org.bedework.testsuite.version=3.7
+org.bedework.webapps.version=3.7
+org.bedework.webdav.version=3.7
+
org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
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.config.sysevents.properties=${env.BEDEWORK_CONFIG}/sysevents.properties
-
-org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml
-
-# Enable/disable replacement of log4j config during deployment
-org.bedework.deploy.log4j.config=no
-
Modified: trunk/config/bwbuild/liferay5/cal.properties
===================================================================
--- trunk/config/bwbuild/liferay5/cal.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/liferay5/cal.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -3,21 +3,22 @@
#
# Introduction
#
+# All properties defined in this file are used at deploy time only. The options
+# xml file contains all run time properties and will be built in to the resulting
+# war files and runable components.
#
# Properties for all modules are saved below - even if they are not
# being deployed. The globals section defines which modules will be
# deployed as well as some other global properties.
#
-# Note that the options and properties are undergoing yet another upheaval.
-# They will be divided into two parts, build-time ant properties in this file
-# and run-time application properties in a corresponding xxx.options.xml file.
-#
# --------------------------------------------------------------------
#
# Install options
#
# Define the names of the applications we want to build
-org.bedework.install.app.names=bwconfig,CalAdmin,EventSubmit,Events,SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres
+org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
+ SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,\
+ test,sysevlog,monitor,genkeys
#
# --------------------------------------------------------------------
Deleted: trunk/config/bwbuild/liferay5/carddav.options.xml
===================================================================
--- trunk/config/bwbuild/liferay5/carddav.options.xml 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/liferay5/carddav.options.xml 2011-02-22 18:27:46 UTC (rev 3191)
@@ -1,350 +0,0 @@
-<!-- This provides run time options for the CardDAV server.
- -->
-<bedework-options>
- <org>
- <bedework>
- <global>
- <version>3.6</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.
-
- 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>
- </global>
-
- <app>
- <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>
-
- <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>
- </app>
- </bedework>
- </org>
-</bedework-options>
Modified: trunk/config/bwbuild/oracle10g/build.properties
===================================================================
--- trunk/config/bwbuild/oracle10g/build.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/oracle10g/build.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -3,15 +3,6 @@
#
# Configure a build of a demo calendar running on bedework.org.
#
-# This file gives users the opportunity to override properties that will be
-# defined later in the build process.
-# The order of loading is:
-# <home-dir>/bedework.build.properties (this file)
-# local.build.properties
-# <various other distributed properties>
-#
-# Therefore add individual developer overrrides to <home-dir>/bedework.build.properties
-#
compile.debug=yes
@@ -19,6 +10,7 @@
org.bedework.version=3.7
org.bedework.access.version=3.7
org.bedework.bwtools.version=3.7
+org.bedework.bwxml.version=3.7
org.bedework.caldav.version=3.7
org.bedework.caldavtest.version=3.7
org.bedework.calendarapi.version=3.7
@@ -36,9 +28,3 @@
org.bedework.config.options=${env.BEDEWORK_CONFIG}/cal.options.xml
org.bedework.config.sysevents.properties=${env.BEDEWORK_CONFIG}/sysevents.properties
-
-org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml
-
-# Enable/disable replacement of log4j config during deployment
-org.bedework.deploy.log4j.config=no
-
Modified: trunk/config/bwbuild/oracle10g/cal.properties
===================================================================
--- trunk/config/bwbuild/oracle10g/cal.properties 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/oracle10g/cal.properties 2011-02-22 18:27:46 UTC (rev 3191)
@@ -17,8 +17,8 @@
#
# Define the names of the applications we want to build
org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
- SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,dumpres,indexer,\
- sysevlog,iosched
+ SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,\
+ test,sysevlog,monitor,genkeys
#
# --------------------------------------------------------------------
@@ -37,16 +37,47 @@
org.bedework.global.jdbcid=sa
org.bedework.global.jdbcpw=
+# DB Datasource for jboss services
+# There doesn't appear to be the extra level of indirection that the jboss-web.xml
+# files allow so this will appear directly in the hibernate proeprties file for
+# jboss services.
+
+# Note - apparently the java Property classes preserve trailing blanks
+# Hibernate will include that trailing blank as part of the name leading to
+# much grief.
+org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS
+org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS
+org.bedework.global.jboss.exsynch.datasource.jndiname=/ExsynchDS
+
# Hibernate caching parameters
org.bedework.global.hibernate.cache.use_second_level_cache=false
org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider
# Specify the platform we are building for. buildwar.xml will import the file
# build/platforms/<platform>War.xml
-org.bedework.global.deploy.platform=tomcat5
+org.bedework.global.deploy.platform=jboss
#
# ------------------------------------------------------------------------
+# Properties enabling and controlling ear file build
# ------------------------------------------------------------------------
+
+# Comment this out to disable ear build.
+org.bedework.global.build.ear=yes
+org.bedework.global.ear.name=bwcal
+
+#
+# The ear can be zipped or left unzipped. Zipped can be useful for copying
+# Jboss will not tolerate zipped ears and unzipped wars.
+
+# Comment out or set to "no"/"false" to disable zipped ear file
+org.bedework.global.ear.zipped=no
+
+# How would you like your wars sir? zipped or unzipped?
+org.bedework.global.wars.zipped=no
+
+#
+# ------------------------------------------------------------------------
+# ------------------------------------------------------------------------
# bedework calendar default deployment definitions.
# ------------------------------------------------------------------------
# ------------------------------------------------------------------------
@@ -63,41 +94,75 @@
org.bedework.dojo.dir=dojo-0.4.1-ajax
org.bedework.jquery.dir=jquery
+# ------------------------------------------------------------------------
+# Extra jars
+# ------------------------------------------------------------------------
+#
# A place to put extra jars and files, e.g. jdbc drivers.
# This can be directed at any local directory
#
-# There can be three directories inside this, jdbc, shell and war.
-# org.bedework.global.ext.lib=${org.bedework.config.home}/lib
+# There can be three directories inside this, server, shell and war.
+# Though only server is used (maybe)
+org.bedework.global.ext.lib=${org.bedework.config.home}/lib
+# A list of jars to copy, delimited by ","
+org.bedework.global.extra.jars=${org.bedework.project.bedework}/projects/rpiutil/dist/rpiutil-${org.bedework.rpiutil.version}.jar
+
# ------------------------------------------------------------------------
# Application server defs
# ------------------------------------------------------------------------
# where the application server lives
-org.bedework.appserver.dir=${org.bedework.project.bedework}/../apache-tomcat-5.5.17
+org.bedework.appserver.dir=${org.bedework.project.bedework}/../jboss-5.1.0.GA
-# where we deploy
-org.bedework.appserver.deploy.dir=${org.bedework.appserver.dir}/webapps
+# name of jboss configuration we are using
+org.bedework.jboss.config=default
+# location of jboss configuration we are using
+org.bedework.jboss.config.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}
+
+# where we deploy
+org.bedework.appserver.deploy.dir=${org.bedework.jboss.config.dir}/bwdeploy
+
# where most library files used by all applications go
-appserver.lib.dir=${org.bedework.appserver.dir}/common/lib
+appserver.lib.dir=${org.bedework.jboss.config.dir}/lib
+# where things like log4j config files go
+org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework
+org.bedework.data.dir=${org.bedework.jboss.data.dir}
+
# where 'endorsed' library files go. These classes override anything
# the JVM has. This is particularly important for things like Xalan,
# etc., which can break the application if you choose the wrong version
-appserver.endorsed.dir=${org.bedework.appserver.dir}/common/endorsed
+appserver.endorsed.dir=${org.bedework.appserver.dir}/lib/endorsed
-# where things like log4j config files go
-log4j.config.destination=${org.bedework.appserver.dir}/common/classes
-
# the toplevel directory for the server static resources, relative to the application server home
-org.bedework.server.resource.root.dir=webapps/ROOT
+org.bedework.server.resource.root.dir=server/${org.bedework.jboss.config}/deploy/ROOT.war
-# Set to yes if you want your log4j.xml overwritten
-org.bedework.deploy.log4j.config=no
+# The log4j config file destination
+org.bedework.log4j.config=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf/jboss-log4j.xml
#
+# If set to true or yes will copy in the bedework db datasource def bedework-ds.xml
+org.bedework.global.copy.bedeworkds.config=yes
+#
+# If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml
+org.bedework.global.copy.bedeworkcardds.config=yes
+#
+# If set to true or yes will copy in the bedework exchange synch db datasource def
+org.bedework.global.copy.bedeworkexsynchds.config=yes
+
# ------------------------------------------------------------------------
+# ActiveMQ defs
# ------------------------------------------------------------------------
+
+org.bedework.global.activemq.dir=${org.bedework.appserver.deploy.dir}/activemq-rar-5.3.0.rar
+#
+# If set to true or yes will copy in the activemq configuration into the rar
+org.bedework.global.copy.activemq.config=yes
+
+#
+# ------------------------------------------------------------------------
+# ------------------------------------------------------------------------
# end of bedework calendar default deployment definitions.
# ------------------------------------------------------------------------
# ------------------------------------------------------------------------
@@ -124,17 +189,18 @@
# Bedework timezones server - a requirement for bedework
#
+org.bedework.app.tzsvr.war.only=yes
org.bedework.app.tzsvr.project=bwtzsvr
org.bedework.app.tzsvr.sou.dir=tzsvr
org.bedework.app.tzsvr.war.name=tzsvr
org.bedework.app.tzsvr.context.root=/tzsvr
# Set for jboss
-#org.bedework.app.tzsvr.virtual.host=
+#org.bedework.app.tzsvr.virtual.host=my.host1,my.host.2
org.bedework.app.tzsvr.description=Bedework timezones server.
org.bedework.app.tzsvr.display.name=Bedework timezones server.
org.bedework.app.tzsvr.name=tzsvr
-org.bedework.app.tzsvr.deploy.dir=/webapps
+org.bedework.app.tzsvr.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.tzsvr.logprefix=Tzsvr
org.bedework.app.tzsvr.tzdata.url=http://localhost:8080/tzdata.zip
@@ -157,8 +223,8 @@
org.bedework.app.bwconfig.default.contenttype=text/xml
org.bedework.app.bwconfig.war.name=bwconfig
org.bedework.app.bwconfig.context.root=/bwconfig
-org.bedework.app.bwconfig.resources.dir=/webapps/ROOT/bwconfigrsrc
-org.bedework.app.bwconfig.deploy.dir=/webapps
+org.bedework.app.bwconfig.resources.dir=${org.bedework.server.resource.root.dir}/bwconfigrsrc
+org.bedework.app.bwconfig.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.bwconfig.description=Bedework properties config application
org.bedework.app.bwconfig.display.name=Bedework Config
org.bedework.app.bwconfig.name=bwconfig
@@ -174,16 +240,16 @@
org.bedework.app.CalAdmin.default.contenttype=text/xml
#org.bedework.app.CalAdmin.portlet.name=CalAdmin
-org.bedework.app.CalAdmin.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml
+org.bedework.app.CalAdmin.tomcat.context.xml=war/META-INF/context.xml
org.bedework.app.CalAdmin.war.name=caladmin
org.bedework.app.CalAdmin.context.root=/caladmin
# Set for jboss
#org.bedework.app.CalAdmin.virtual.host=
-org.bedework.app.CalAdmin.resources.dir=/webapps/ROOT/caladminrsrc
-org.bedework.app.CalAdmin.deploy.dir=/webapps
+org.bedework.app.CalAdmin.resources.dir=${org.bedework.server.resource.root.dir}/caladminrsrc
+org.bedework.app.CalAdmin.deploy.dir=${org.bedework.appserver.deploy.dir}
-org.bedework.app.CalAdmin.security.domain=demo
+org.bedework.app.CalAdmin.security.domain=bedeworkdemo
org.bedework.app.CalAdmin.security.prefix=demo
org.bedework.app.CalAdmin.transport.guarantee=NONE
@@ -200,17 +266,17 @@
org.bedework.app.EventSubmit.sou.dir=websubmit
org.bedework.app.EventSubmit.default.contenttype=text/xml
org.bedework.app.EventSubmit.web.xml=war/WEB-INF/web.xml
-org.bedework.app.EventSubmit.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml
+org.bedework.app.EventSubmit.tomcat.context.xml=war/META-INF/context.xml
#org.bedework.app.EventSubmit.portlet.name=EventSubmit
org.bedework.app.EventSubmit.war.name=eventsubmit
org.bedework.app.EventSubmit.context.root=/eventsubmit
# Set for jboss
#org.bedework.app.EventSubmit.virtual.host=
-org.bedework.app.EventSubmit.resources.dir=/webapps/ROOT/eventsubmitrsrc
-org.bedework.app.EventSubmit.deploy.dir=/webapps
+org.bedework.app.EventSubmit.resources.dir=${org.bedework.server.resource.root.dir}/eventsubmitrsrc
+org.bedework.app.EventSubmit.deploy.dir=${org.bedework.appserver.deploy.dir}
-org.bedework.app.EventSubmit.security.domain=demo
+org.bedework.app.EventSubmit.security.domain=bedeworkdemo
org.bedework.app.EventSubmit.security.prefix=demo
org.bedework.app.EventSubmit.transport.guarantee=NONE
@@ -227,23 +293,24 @@
org.bedework.app.Events.sou.dir=webclient
org.bedework.app.Events.default.contenttype=text/xml
org.bedework.app.Events.web.xml=war/WEB-INF/publicweb.xml
-org.bedework.app.Events.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml
+org.bedework.app.Events.tomcat.context.xml=war/META-INF/publiccontext.xml
#org.bedework.app.Events.portlet.name=PublicCal
org.bedework.app.Events.war.name=cal
org.bedework.app.Events.context.root=/cal
# Set for jboss
#org.bedework.app.Events.virtual.host=
-org.bedework.app.Events.resources.dir=/webapps/ROOT/calrsrc
-org.bedework.app.Events.deploy.dir=/webapps
+org.bedework.app.Events.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc
+org.bedework.app.Events.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.Events.cal.suite=MainCampus
org.bedework.app.Events.description=Struts based XML version of the Bedework calendar client. It may have many skins, determined by the XSLT.
-org.bedework.app.Events.display.name=Demo calendar - Duke/Yale Themed Suite
+org.bedework.app.Events.display.name=Demo calendar
org.bedework.app.Events.name=DemoCal
-
#
+# --------------------------------------------------------------------
+#
# Feed Server
#
org.bedework.app.Feeder.project=webapps
@@ -255,18 +322,17 @@
#org.bedework.app.Feeder.portlet.name=PublicCal
org.bedework.app.Feeder.war.name=feeder
-org.bedework.app.Feeder.context.root=/calfeed
+org.bedework.app.Feeder.context.root=/feeder
# Set for jboss
#org.bedework.app.Feeder.virtual.host=
-org.bedework.app.Feeder.resources.dir=/webapps/ROOT/calfeedrsrc
-org.bedework.app.Feeder.deploy.dir=/webapps
+org.bedework.app.Feeder.resources.dir=${org.bedework.server.resource.root.dir}/calfeedrsrc
+org.bedework.app.Feeder.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.Feeder.cal.suite=MainCampus
org.bedework.app.Feeder.description=Struts based XML version of the Bedework calendar client. It may have many skins, determined by the XSLT.
org.bedework.app.Feeder.display.name=Demo calendar
org.bedework.app.Feeder.name=feeder
-
#
# --------------------------------------------------------------------
#
@@ -276,15 +342,15 @@
org.bedework.app.SoEDept.sou.dir=webclient
org.bedework.app.SoEDept.default.contenttype=text/xml
org.bedework.app.SoEDept.web.xml=war/WEB-INF/publicweb.xml
-org.bedework.app.SoEDept.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml
+org.bedework.app.SoEDept.tomcat.context.xml=war/META-INF/publiccontext.xml
#org.bedework.app.SoEDept.portlet.name=SoEDept
org.bedework.app.SoEDept.war.name=soedept
org.bedework.app.SoEDept.context.root=/soedept
# Set for jboss
#org.bedework.app.SoEDept.virtual.host=
-org.bedework.app.SoEDept.resources.dir=/webapps/ROOT/calrsrc
-org.bedework.app.SoEDept.deploy.dir=/webapps
+org.bedework.app.SoEDept.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc
+org.bedework.app.SoEDept.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.SoEDept.cal.suite=SoEDepartmental
org.bedework.app.SoEDept.description=Struts based XML version of the Bedework calendar client. It may have many skins, determined by the XSLT.
@@ -300,17 +366,17 @@
org.bedework.app.UserCal.sou.dir=webclient
org.bedework.app.UserCal.default.contenttype=text/xml
org.bedework.app.UserCal.web.xml=war/WEB-INF/userweb.xml
-org.bedework.app.UserCal.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml
+org.bedework.app.UserCal.tomcat.context.xml=war/META-INF/usercontext.xml
#org.bedework.app.UserCal.portlet.name=UserCal
org.bedework.app.UserCal.war.name=ucal
org.bedework.app.UserCal.context.root=/ucal
# Set for jboss
#org.bedework.app.UserCal.virtual.host=
-org.bedework.app.UserCal.resources.dir=/webapps/ROOT/ucalrsrc
-org.bedework.app.UserCal.deploy.dir=/webapps
+org.bedework.app.UserCal.resources.dir=${org.bedework.server.resource.root.dir}/ucalrsrc
+org.bedework.app.UserCal.deploy.dir=${org.bedework.appserver.deploy.dir}
-org.bedework.app.UserCal.security.domain=demo
+org.bedework.app.UserCal.security.domain=bedeworkdemo
org.bedework.app.UserCal.security.prefix=demo
org.bedework.app.UserCal.transport.guarantee=NONE
@@ -328,7 +394,7 @@
org.bedework.app.Pubcaldav.interface.jar=bw-caldav
org.bedework.app.Pubcaldav.web.xml=war/WEB-INF/publicweb.xml
-org.bedework.app.Pubcaldav.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml
+org.bedework.app.Pubcaldav.tomcat.context.xml=war/META-INF/publiccontext.xml
org.bedework.app.Pubcaldav.war.name=pubcaldav
org.bedework.app.Pubcaldav.context.root=/pubcaldav
# Set for jboss
@@ -337,7 +403,7 @@
org.bedework.app.Pubcaldav.description=Bedework public caldav server.
org.bedework.app.Pubcaldav.display.name=Bedework public caldav
org.bedework.app.Pubcaldav.name=DemoPubcaldav
-org.bedework.app.Pubcaldav.deploy.dir=/webapps
+org.bedework.app.Pubcaldav.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.Pubcaldav.logprefix=PubCalDav
#
@@ -350,28 +416,77 @@
org.bedework.app.Usercaldav.interface.jar=bw-caldav
org.bedework.app.Usercaldav.web.xml=war/WEB-INF/userweb.xml
-org.bedework.app.Usercaldav.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml
+org.bedework.app.Usercaldav.tomcat.context.xml=war/META-INF/usercontext.xml
org.bedework.app.Usercaldav.war.name=ucaldav
org.bedework.app.Usercaldav.context.root=/ucaldav
# Set for jboss
#org.bedework.app.Usercaldav.virtual.host=
-org.bedework.app.Usercaldav.security.domain=demo
+org.bedework.app.Usercaldav.security.domain=bedeworkdemo
org.bedework.app.Usercaldav.security.prefix=demo
org.bedework.app.Usercaldav.transport.guarantee=NONE
org.bedework.app.Usercaldav.description=Bedework user caldav server.
org.bedework.app.Usercaldav.display.name=Bedework usercaldav
org.bedework.app.Usercaldav.name=DemoUsrcaldav
-org.bedework.app.Usercaldav.deploy.dir=/webapps
+org.bedework.app.Usercaldav.deploy.dir=${org.bedework.appserver.deploy.dir}
org.bedework.app.Usercaldav.logprefix=UserCalDav
#
# --------------------------------------------------------------------
#
+# Public Calws Server
+#
+org.bedework.app.Pubcalws.project=caldav
+org.bedework.app.Pubcalws.sou.dir=server
+org.bedework.app.Pubcalws.interface.jar=bw-caldav
+
+org.bedework.app.Pubcalws.web.xml=war/WEB-INF/publicws-web.xml
+org.bedework.app.Pubcalws.tomcat.context.xml=war/META-INF/publiccontext.xml
+org.bedework.app.Pubcalws.war.name=Pubcalws
+org.bedework.app.Pubcalws.context.root=/Pubcalws
+# Set for jboss
+#org.bedework.app.Pubcalws.virtual.host=
+
+org.bedework.app.Pubcalws.description=Bedework public calws server.
+org.bedework.app.Pubcalws.display.name=Bedework public calws
+org.bedework.app.Pubcalws.name=DemoPubcalws
+org.bedework.app.Pubcalws.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.Pubcalws.logprefix=Pubcalws
+
+#
+# --------------------------------------------------------------------
+#
+# Personal Calws Server
+#
+org.bedework.app.Usercalws.project=caldav
+org.bedework.app.Usercalws.sou.dir=server
+org.bedework.app.Usercalws.interface.jar=bw-caldav
+
+org.bedework.app.Usercalws.web.xml=war/WEB-INF/userws-web.xml
+org.bedework.app.Usercalws.tomcat.context.xml=war/META-INF/usercontext.xml
+org.bedework.app.Usercalws.war.name=ucalws
+org.bedework.app.Usercalws.context.root=/ucalws
+# Set for jboss
+#org.bedework.app.Usercalws.virtual.host=
+
+org.bedework.app.Usercalws.security.domain=bedeworkdemo
+org.bedework.app.Usercalws.security.prefix=demo
+org.bedework.app.Usercalws.transport.guarantee=NONE
+
+org.bedework.app.Usercalws.description=Bedework user calws server.
+org.bedework.app.Usercalws.display.name=Bedework Usercalws
+org.bedework.app.Usercalws.name=DemoUsrcalws
+org.bedework.app.Usercalws.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.Usercalws.logprefix=Usercalws
+
+#
+# --------------------------------------------------------------------
+#
# CalDAV test
#
+org.bedework.app.caldavTest.runnable=yes
org.bedework.app.caldavTest.project=caldavTest
org.bedework.app.caldavTest.sou.dir=caldavTest
org.bedework.app.caldavTest.shellscr.name=bwruntest
@@ -385,6 +500,7 @@
# Testsuite
#
+org.bedework.app.test.runnable=yes
org.bedework.app.test.project=testsuite
org.bedework.app.test.sou.dir=
org.bedework.app.test.shellscr.name=bwruntest
@@ -412,7 +528,7 @@
#
# --------------------------------------------------------------------
#
-# Crawler
+# Indexer
#
org.bedework.app.indexer.project=indexer
@@ -438,13 +554,120 @@
#
# --------------------------------------------------------------------
#
+# Server monitor
+#
+
+org.bedework.app.monitor.project=calendarapi
+org.bedework.app.monitor.sou.dir=
+org.bedework.app.monitor.shellscr.name=bwrun
+org.bedework.app.monitor.batscr.name=bwrun.bat
+org.bedework.app.monitor.zip.name=monitor
+org.bedework.app.monitor.description=Bedework system events monitor application
+
+#
+# --------------------------------------------------------------------
+#
+# Key generator
+#
+
+org.bedework.app.genkeys.project=calendarapi
+org.bedework.app.genkeys.sou.dir=
+org.bedework.app.genkeys.shellscr.name=bwrun
+org.bedework.app.genkeys.batscr.name=bwrun.bat
+org.bedework.app.genkeys.zip.name=genkeys
+org.bedework.app.genkeys.description=Bedework system Key generator
+
+#
+# --------------------------------------------------------------------
+#
# In/outbox scheduler
#
org.bedework.app.iosched.project=calendarapi
org.bedework.app.iosched.sou.dir=
+org.bedework.app.iosched.in.ear=true
org.bedework.app.iosched.shellscr.name=bwrun
org.bedework.app.iosched.batscr.name=bwrun.bat
org.bedework.app.iosched.zip.name=bwiosched
org.bedework.app.iosched.description=Bedework In/outbox scheduler application
+#
+# --------------------------------------------------------------------
+#
+# Public Carddav Server
+#
+org.bedework.app.pubcarddav.project=carddav
+org.bedework.app.pubcarddav.sou.dir=server
+
+org.bedework.app.pubcarddav.web.xml=war/WEB-INF/publicweb.xml
+org.bedework.app.pubcarddav.war.name=pubcarddav
+org.bedework.app.pubcarddav.context.root=/pubcarddav
+# Set for jboss
+#org.bedework.app.pubcarddav.virtual.host=calendars.rpi.edu
+
+org.bedework.app.pubcarddav.description=Bedework public carddav server.
+org.bedework.app.pubcarddav.display.name=Bedework public carddav
+org.bedework.app.pubcarddav.name=Demopubcarddav
+org.bedework.app.pubcarddav.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.pubcarddav.logprefix=pubcarddav
+
+#
+# --------------------------------------------------------------------
+#
+# Personal Carddav Server
+#
+org.bedework.app.usercarddav.project=carddav
+org.bedework.app.usercarddav.sou.dir=server
+
+org.bedework.app.usercarddav.web.xml=war/WEB-INF/userweb.xml
+org.bedework.app.usercarddav.war.name=ucarddav
+org.bedework.app.usercarddav.context.root=/ucarddav
+# Set for jboss
+#org.bedework.app.usercarddav.virtual.host=events.rpi.edu
+
+org.bedework.app.usercarddav.security.domain=bedeworkdemo
+org.bedework.app.usercarddav.security.prefix=demo
+org.bedework.app.usercarddav.transport.guarantee=NONE
+
+org.bedework.app.usercarddav.description=Bedework user carddav server.
+org.bedework.app.usercarddav.display.name=Bedework usercarddav
+org.bedework.app.usercarddav.name=DemoUsrcarddav
+org.bedework.app.usercarddav.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.usercarddav.logprefix=usercarddav
+
+#
+# --------------------------------------------------------------------
+#
+# CardDAV importer
+#
+
+org.bedework.app.carddavimp.runnable=yes
+org.bedework.app.carddavimp.project=carddav
+org.bedework.app.carddavimp.sou.dir=tools
+org.bedework.app.carddavimp.shellscr.name=bwrun
+org.bedework.app.carddavimp.batscr.name=bwrun.bat
+org.bedework.app.carddavimp.zip.name=carddavimp
+org.bedework.app.carddavimp.description=Bedework CardDAV importer
+
+#
+# --------------------------------------------------------------------
+#
+# Exchange synchronization Service - callback web server
+#
+org.bedework.app.exsynchwcb.project=exsynch
+org.bedework.app.exsynchwcb.sou.dir=server
+
+org.bedework.app.exsynchwcb.web.xml=war/WEB-INF/web.xml
+org.bedework.app.exsynchwcb.war.name=exsynch
+org.bedework.app.exsynchwcb.context.root=/exsynch
+# Set for jboss
+#org.bedework.app.usercarddav.virtual.host=events.rpi.edu
+
+org.bedework.app.exsynchwcb.description=Bedework exsynch callback server.
+org.bedework.app.exsynchwcb.display.name=Bedework exsynch callback server
+org.bedework.app.exsynchwcb.name=Demoexsynchw
+#org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.exsynchwcb.wsdl,deploy.dir=/exchange
+org.bedework.app.exsynchwcb.logprefix=exsynch
+
+
Deleted: trunk/config/bwbuild/oracle10g/carddav.options.xml
===================================================================
--- trunk/config/bwbuild/oracle10g/carddav.options.xml 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/oracle10g/carddav.options.xml 2011-02-22 18:27:46 UTC (rev 3191)
@@ -1,350 +0,0 @@
-<!-- This provides run time options for the CardDAV server.
- -->
-<bedework-options>
- <org>
- <bedework>
- <global>
- <version>3.6</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.
-
- 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>
- </global>
-
- <app>
- <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>
-
- <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>
- </app>
- </bedework>
- </org>
-</bedework-options>
Deleted: trunk/config/bwbuild/oracle10g/context.xml
===================================================================
--- trunk/config/bwbuild/oracle10g/context.xml 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/config/bwbuild/oracle10g/context.xml 2011-02-22 18:27:46 UTC (rev 3191)
@@ -1,50 +0,0 @@
-<Context path="@CONTEXT-ROOT@" reloadable="false">
- <!-- Resource referenced by web.xml -->
- <Resource name="jdbc/calDB" auth="Container"
- type="javax.sql.DataSource"
- driverClassName="oracle.jdbc.OracleDriver"
- url="jdbc:oracle:thin:@localhost:1521:XE"
- username="sa"
- password=""
- maxActive="8"
- maxIdle="4"
- maxWait="-1"
- defaultAutoCommit="false" />
-
- <!-- ActiveMQ ConnectionFactory -->
- <Resource name="jms/BedeworkConnectionFactory"
- auth="Container"
- type="org.apache.activemq.ActiveMQConnectionFactory"
- description="JMS Connection Factory"
- factory="org.apache.activemq.jndi.JNDIReferenceFactory"
- brokerURL="tcp://localhost:61616?trace=true"
- brokerName="LocalActiveMQBroker"/>
-
- <!-- ActiveMQ System events queue -->
- <Resource name="queue/sysevents"
- auth="Container"
- type="org.apache.activemq.command.ActiveMQQueue"
- description="Bedework crawler queue"
- factory="org.apache.activemq.jndi.JNDIReferenceFactory"
- physicalName="bedework.sysevents"/>
-
- <!-- ActiveMQ System events log queue -->
- <Resource name="queue/syseventslog"
- auth="Container"
- type="org.apache.activemq.command.ActiveMQQueue"
- description="Bedework crawler queue"
- factory="org.apache.activemq.jndi.JNDIReferenceFactory"
- physicalName="bedework.sysevents.logger"/>
-
- <!-- ActiveMQ index crawler notifications queue -->
- <Resource name="queue/crawler"
- auth="Container"
- type="org.apache.activemq.command.ActiveMQQueue"
- description="Bedework crawler queue"
- factory="org.apache.activemq.jndi.JNDIReferenceFactory"
- physicalName="bedework.crawler"/>
-
- <!-- Disables restart persistence of sessions -->
- <Manager pathname=""/>
-</Context>
-
Modified: trunk/deployment/bw-core-appjars.xml
===================================================================
--- trunk/deployment/bw-core-appjars.xml 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/deployment/bw-core-appjars.xml 2011-02-22 18:27:46 UTC (rev 3191)
@@ -25,11 +25,13 @@
libcache="${org.bedework.libcache.dir}"
name="bw-cdvserver" version="${org.bedework.caldav.version}"
projecthome="${bw.project.home}/projects/caldav" />
+
+ <!-- ===================== Bedework schema jars ====================== -->
<getJar lib="${org.bedework.temp.extrajars.dir}"
libcache="${org.bedework.libcache.dir}"
- name="bw-exsynch-genwssrc" version="${org.bedework.caldav.version}"
- projecthome="${bw.project.home}/projects/caldav" />
+ name="bw-exsynchwsschema" version="${org.bedework.bwxml.version}"
+ projecthome="${bw.project.home}/../bwxml" />
<!-- ================= Bedework dump/restore jars ==================== -->
Modified: trunk/util/svncopy.sh
===================================================================
--- trunk/util/svncopy.sh 2011-02-22 18:23:12 UTC (rev 3190)
+++ trunk/util/svncopy.sh 2011-02-22 18:27:46 UTC (rev 3191)
@@ -86,6 +86,10 @@
then
# Not linked
echo ""
+ elif [ "${1}" = "bwxml" ]
+ then
+# Not linked
+ echo ""
elif [ "${1}" = "cachedfeeder" ]
then
# Not linked
@@ -140,6 +144,7 @@
PROJECTS="$PROJECTS buildTools"
PROJECTS="$PROJECTS bwtools"
PROJECTS="$PROJECTS bwtzsvr"
+PROJECTS="$PROJECTS bwxml"
PROJECTS="$PROJECTS cachedfeeder"
PROJECTS="$PROJECTS caldav"
PROJECTS="$PROJECTS caldavimpl"
More information about the Bedework-commit
mailing list