[Bedework-commit] bedework r1941 - in trunk/config: bwbuild/default configs

svnadmin at bedework.org svnadmin at bedework.org
Thu Oct 30 17:21:30 EDT 2008 

Author: johnsa
Date: 2008-10-30 17:21:30 -0400 (Thu, 30 Oct 2008)
New Revision: 1941

Modified:
   trunk/config/bwbuild/default/cal.properties
   trunk/config/configs/democal.options.xml
   trunk/config/configs/democal.properties
Log:
property file updates for new build process

Modified: trunk/config/bwbuild/default/cal.properties
===================================================================
--- trunk/config/bwbuild/default/cal.properties	2008-10-30 21:21:01 UTC (rev 1940)
+++ trunk/config/bwbuild/default/cal.properties	2008-10-30 21:21:30 UTC (rev 1941)
@@ -3,15 +3,14 @@
 #
 # Introduction
 #
+# All properties defined in this file are used at deploy time only. The options
+# xml file contains all run time propreties adn 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.
-#
 # --------------------------------------------------------------------
 #
 # Global options

Modified: trunk/config/configs/democal.options.xml
===================================================================
--- trunk/config/configs/democal.options.xml	2008-10-30 21:21:01 UTC (rev 1940)
+++ trunk/config/configs/democal.options.xml	2008-10-30 21:21:30 UTC (rev 1941)
@@ -324,6 +324,7 @@
                           User CalDAV server UserCalDAV
              ================================================================== -->
         <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <appType>usercaldav</appType>
           <publicAdmin>false</publicAdmin>
           <guestMode>false</guestMode>
 
@@ -345,6 +346,7 @@
                           Public (unauthenticated) CalDAV server PublicCalDAV
              ================================================================== -->
         <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <appType>publiccaldav</appType>
           <publicAdmin>false</publicAdmin>
           <guestMode>true</guestMode>
           <runAsUser>public-user</runAsUser>
@@ -364,10 +366,30 @@
         </Pubcaldav>
 
         <!-- ==================================================================
+                          CalDAV test suite
+             ================================================================== -->
+        <caldavTest classname="org.bedework.calfacade.configs.ConfigCommon">
+          <appType>caldavTest</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
+        </caldavTest>
+
+        <!-- ==================================================================
+                          bedework test suite
+             ================================================================== -->
+        <test classname="org.bedework.calfacade.configs.ConfigCommon">
+          <appType>testsuite</appType>
+          <publicAdmin>false</publicAdmin>
+          <guestMode>false</guestMode>
+        </test>
+
+        <!-- ==================================================================
                           Dump restore program dumpres
              ================================================================== -->
         <dumpres classname="org.bedework.calfacade.configs.DumpRestoreConfig">
           <debug>true</debug>
+          <appType>dumprestore</appType>
+          <guestMode>true</guestMode>
           <debugEntity>false</debugEntity>
           <superGroupName>campusAdminGroups</superGroupName>
           <defaultPublicCalPath>/public/Other Events/Other</defaultPublicCalPath>

Modified: trunk/config/configs/democal.properties
===================================================================
--- trunk/config/configs/democal.properties	2008-10-30 21:21:01 UTC (rev 1940)
+++ trunk/config/configs/democal.properties	2008-10-30 21:21:30 UTC (rev 1941)
@@ -15,7 +15,6 @@
 #
 # Global 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
 
@@ -44,7 +43,6 @@
 org.bedework.global.public.admin.uri=/caladmin
 org.bedework.global.public.calendar.uri=/cal
 org.bedework.global.personal.calendar.uri=/ucal
-
 #
 # ------------------------------------------------------------------------
 # ------------------------------------------------------------------------
@@ -53,6 +51,7 @@
 # ------------------------------------------------------------------------
 #
 
+#
 # ------------------------------------------------------------------------
 # directory defs
 # ------------------------------------------------------------------------
@@ -62,7 +61,7 @@
 # Where we keep the dojo stuff in deployment/resources/javascript
 org.bedework.dojo.dir=dojo-0.4.1-ajax
 
-# A place to put jdbc drivers. This can be directeed at any local directory
+# A place to put jdbc drivers. This can be directed at any local directory
 org.bedework.jdbc.lib=${org.bedework.project.bedework}/lib/jdbc
 
 # ------------------------------------------------------------------------
@@ -101,13 +100,32 @@
 # ------------------------------------------------------------------------
 # ------------------------------------------------------------------------
 #
+# ------------------------------------------------------------------------
+#   Common context for javasscript, resources etc.
+# ------------------------------------------------------------------------
+# Enable building of a common context for common javascript.
+# This context will be deployed along with the applications and makes common
+# javascript available under, two paths at the contex defined here.
 #
+# This is necessary to deal with problems delivering commmon code from the same
+# server when the root context is defined to be an application rather than the
+# normal web server default.
+#
+org.bedework.global.build.common.context.name=bedework-common
+org.bedework.global.build.common.context.root=/bedework-common
+org.bedework.global.build.common.context.war.name=bedework-common
+org.bedework.global.build.common.context.deploy.dir=/webapps
+
+# This is where we copy common xsl and javascript for inclusion by xsl and generated
+# content.
+#org.bedework.global.common.deploydir=/webapps/ROOT/bedework-common
+
+#
 # -------------------------------------------------------------------
 #
 # Bedework config web client
 #
 org.bedework.app.bwconfig.project=webapps
-org.bedework.app.bwconfig.type=webconfig
 org.bedework.app.bwconfig.sou.dir=webconfig
 org.bedework.app.bwconfig.default.contenttype=text/xml
 org.bedework.app.bwconfig.war.name=bwconfig
@@ -125,7 +143,6 @@
 # Admin Web Client
 #
 org.bedework.app.CalAdmin.project=webapps
-org.bedework.app.CalAdmin.type=webadmin
 org.bedework.app.CalAdmin.sou.dir=webadmin
 org.bedework.app.CalAdmin.default.contenttype=text/xml
 #org.bedework.app.CalAdmin.portlet.name=CalAdmin
@@ -153,7 +170,6 @@
 # Events submission Web Client
 #
 org.bedework.app.EventSubmit.project=webapps
-org.bedework.app.EventSubmit.type=websubmit
 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
@@ -181,7 +197,6 @@
 # Public Web Client
 #
 org.bedework.app.Events.project=webapps
-org.bedework.app.Events.type=webpublic
 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
@@ -206,7 +221,6 @@
 # Demo departmental public Web Client
 #
 org.bedework.app.SoEDept.project=webapps
-org.bedework.app.SoEDept.type=webpublic
 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
@@ -231,7 +245,6 @@
 # Personal Web Client
 #
 org.bedework.app.UserCal.project=webapps
-org.bedework.app.UserCal.type=webuser
 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
@@ -259,7 +272,6 @@
 # Public Caldav Server
 #
 org.bedework.app.Pubcaldav.project=caldav
-org.bedework.app.Pubcaldav.type=publiccaldav
 org.bedework.app.Pubcaldav.sou.dir=server
 org.bedework.app.Pubcaldav.interface.jar=bw-caldav
 
@@ -282,7 +294,6 @@
 # Personal Caldav Server
 #
 org.bedework.app.Usercaldav.project=caldav
-org.bedework.app.Usercaldav.type=usercaldav
 org.bedework.app.Usercaldav.sou.dir=server
 org.bedework.app.Usercaldav.interface.jar=bw-caldav
 
@@ -310,7 +321,6 @@
 #
 
 org.bedework.app.caldavTest.project=caldavTest
-org.bedework.app.caldavTest.type=caldavTest
 org.bedework.app.caldavTest.sou.dir=caldavTest
 org.bedework.app.caldavTest.shellscr.name=bwruntest
 org.bedework.app.caldavTest.batscr.name=bwruntest.bat
@@ -324,7 +334,6 @@
 #
 
 org.bedework.app.test.project=testsuite
-org.bedework.app.test.type=testsuite
 org.bedework.app.test.sou.dir=
 org.bedework.app.test.shellscr.name=bwruntest
 org.bedework.app.test.batscr.name=bwruntest.bat
@@ -341,7 +350,6 @@
 # -------------- normal dump/restore build properties ------------------
 
 org.bedework.app.dumpres.project=dumprestore
-org.bedework.app.dumpres.type=dumprestore
 org.bedework.app.dumpres.sou.dir=
 org.bedework.app.dumpres.shellscr.name=bwrun
 org.bedework.app.dumpres.batscr.name=bwrun.bat

More information about the Bedework-commit mailing list