Changeset 1941

Timestamp:

10/30/08 17:21:30

Author:

johnsa

Message:

property file updates for new build process

Files:

• trunk/config/bwbuild/default/cal.properties (modified) (1 diff)
• trunk/config/configs/democal.options.xml (modified) (3 diffs)
• trunk/config/configs/democal.properties (modified) (16 diffs)

trunk/config/bwbuild/default/cal.properties

@@ -4 +4 @@
-# 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.
-#
-# --------------------------------------------------------------------

trunk/config/configs/democal.options.xml

@@ -325 +325 @@
-             ================================================================== -->
-        <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <appType>usercaldav</appType>
-          <publicAdmin>false</publicAdmin>
-          <guestMode>false</guestMode>
@@ -346 +347 @@
-             ================================================================== -->
-        <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig">
+          <appType>publiccaldav</appType>
-          <publicAdmin>false</publicAdmin>
-          <guestMode>true</guestMode>
@@ -365 +367 @@
-
-        <!-- ==================================================================
+                          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>

trunk/config/configs/democal.properties

@@ -16 +16 @@
-# 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
@@ -45 +44 @@
-org.bedework.global.public.calendar.uri=/cal
-org.bedework.global.personal.calendar.uri=/ucal
-
-#
-# ------------------------------------------------------------------------
@@ -54 +52 @@
-#
-
+#
-# ------------------------------------------------------------------------
-# directory defs
@@ -63 +62 @@
-org.bedework.dojo.dir=dojo-0.4.1-ajax
-
-e
+
-org.bedework.jdbc.lib=${org.bedework.project.bedework}/lib/jdbc
-
@@ -102 +101 @@
-# ------------------------------------------------------------------------
-#
+# ------------------------------------------------------------------------
+#   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
+
-#
-# -------------------------------------------------------------------
@@ -108 +127 @@
-#
-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
@@ -126 +144 @@
-#
-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
@@ -154 +171 @@
-#
-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
@@ -182 +198 @@
-#
-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
@@ -207 +222 @@
-#
-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
@@ -232 +246 @@
-#
-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
@@ -260 +273 @@
-#
-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
@@ -283 +295 @@
-#
-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
@@ -311 +322 @@
-
-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
@@ -325 +335 @@
-
-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
@@ -342 +351 @@
-
-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