Changeset 1933

Show
Ignore:
Timestamp:
10/28/08 10:12:28
Author:
douglm
Message:

Two distinct sets of updates here.

1. Add some support (not fully working yet) for liferay5. Some old unused stylesheets were deleted to tidy up and while working on this decided the second set of updates were needed asa first step to simplification

2. Ensure that only the option xml file is used at run time.

Some properties were moved into the xml file and code was adjusted to refer to the xml config objects.

CalEnv?, CalEnvI, CalEnvFactory? were removed.

Following properties were moved into options.xml

org.bedework.app.X.nogroupallowed

org.bedework.app.X.publicadmin

org.bedework.app.X.guestmode

sysintfimpl (caldav)

org.bedework.global.system.name --> globals.systemName

org.bedework.app.X.run.as.user --> runAsUser

org.bedework.app.CalAdmin?.admingroupsidprefix=agrp_

Removed remaining run-time references to
org.bedework.app.X.name
org.bedework.app.X.root

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildfilters.xml

    r1906 r1933  
    9292            value="${propval.app.root}" /> 
    9393 
    94     <filter token="APP-GUESTMODE" 
    95             value="${propval.app.guestmode}" /> 
    96  
    9794    <!-- Change this to be an app par --> 
    9895    <filter token="RUN-AS-USER" 

  • trunk/build/buildwar.xml

    r1920 r1933  
    140140    <antcall target="copy.war.docs" inheritRefs="true" /> 
    141141 
    142     <!-- Create the env.properties file --> 
     142    <!-- Create the runtime options file --> 
    143143    <mkdir dir="${app.dest.properties}" /> 
    144  
    145     <copy tofile="${app.dest.properties}/env.properties" 
    146           file="${org.bedework.config.properties}" /> 
    147144 
    148145    <copy tofile="${app.dest.properties}/options.xml" 
    …… 
    417414        <antcall target="add.uportal2" inheritRefs="true" /> 
    418415        <antcall target="add.liferay4" inheritRefs="true" /> 
     416        <antcall target="add.liferay5" inheritRefs="true" /> 
    419417      </then> 
    420418    </if> 
    …… 
    542540 
    543541  <!-- ================================================================= 
     542       Liferay 5 modifications 
     543       ================================================================= --> 
     544 
     545  <target name="add.liferay5" if="org.bedework.build.for.liferay5" > 
     546   <!-- Add liferay config files --> 
     547    <copy todir="${app.dest.webinf}" > 
     548      <fileset dir="${app.sou.dir}/war/WEB-INF" > 
     549        <include name="liferay*"/> 
     550      </fileset> 
     551      <filterset refid="property.filters" /> 
     552    </copy> 
     553 
     554    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-taglib}"/> 
     555    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-bridges}"/> 
     556    <copy todir="${app.dest.lib}" file="${org.bedework.appjar.liferay.util-java}"/> 
     557 
     558    <!-- Add the context params --> 
     559    <replace file="${app.temp.web.xml}"> 
     560      <replacetoken><![CDATA[<!-- add context params here -->]]></replacetoken> 
     561      <replacevalue><![CDATA[<!-- add context params here --> 
     562 
     563  <context-param> 
     564    <param-name>company_id</param-name> 
     565    <param-value>@LIFERAY-COMPANY-ID@</param-value> 
     566  </context-param>]]> 
     567      </replacevalue> 
     568    </replace> 
     569 
     570    <!-- Add the portal listener --> 
     571    <replace file="${app.temp.web.xml}"> 
     572      <replacetoken><![CDATA[<!-- add listeners here -->]]></replacetoken> 
     573      <replacevalue><![CDATA[<!-- add listeners here --> 
     574 
     575  <listener> 
     576    <listener-class> 
     577      @PORTAL-SERVLET-CONTEXT-LISTENER@ 
     578    </listener-class> 
     579  </listener>]]> 
     580      </replacevalue> 
     581    </replace> 
     582 
     583    <!-- Add the portlet servlet definition --> 
     584    <replace file="${app.temp.web.xml}"> 
     585      <replacetoken><![CDATA[<!-- add servlet definitions here -->]]></replacetoken> 
     586      <replacevalue><![CDATA[<!-- add servlet definitions here --> 
     587 
     588  <!-- Servlet definition for portlet use. --> 
     589  <servlet> 
     590    <servlet-name>@PORTLET-NAME@</servlet-name> 
     591    <display-name>@PORTLET-NAME@ Wrapper</display-name> 
     592    <servlet-class>@PORTLET-SERVLET-CLASS@</servlet-class> 
     593    <init-param> 
     594      <param-name>portlet-class</param-name> 
     595      <param-value>@PORTLET-CLASS@</param-value> 
     596    </init-param> 
     597    <init-param> 
     598      <param-name>portlet-guid</param-name> 
     599      <param-value>@CONTEXT-ROOT@.@PORTLET-NAME@</param-value> 
     600    </init-param> 
     601  </servlet>]]> 
     602      </replacevalue> 
     603    </replace> 
     604 
     605    <!-- Add the portlet servlet mapping --> 
     606    <replace file="${app.temp.web.xml}"> 
     607      <replacetoken><![CDATA[<!-- add servlet mappings here -->]]></replacetoken> 
     608      <replacevalue><![CDATA[<!-- add servlet mappings here --> 
     609 
     610  <servlet-mapping> 
     611    <servlet-name>@PORTLET-NAME@</servlet-name> 
     612    <url-pattern>/@PORTLET-NAME@/*</url-pattern> 
     613  </servlet-mapping>]]> 
     614      </replacevalue> 
     615    </replace> 
     616  </target> 
     617 
     618  <!-- ================================================================= 
    544619       If this is a j2ee app the following gets executed. 
    545620       We create an uodated jboss-web.xml file (for jboss) and a ear 

  • trunk/build/getJar.xml

    r1894 r1933  
    1919     @param lib      optional destination for the get task 
    2020     @param libcache optional location of the cache 
    21      @param property optional name of property to hold localtion of resulting jar 
     21     @param property optional name of property to hold location of resulting jar 
    2222     @param project optional project name for local fetch from generated quickstart. 
    2323     =================================================================== --> 

  • trunk/build/quickstart/run-hsqldb.xml

    r1914 r1933  
    8787  </target> 
    8888 
     89  <target name="liferaydb" depends="run.init" 
     90          description="starts the hsqldb server for likferay"> 
     91    <echo message="Starting hsqldb"/> 
     92    <java fork="true" dir="${basedir}" classname="org.hsqldb.Server"> 
     93      <classpath> 
     94        <pathelement path="${org.bedework.hsqldb.dir}/lib/hsqldb.jar"/> 
     95      </classpath> 
     96      <arg value="-database"/> 
     97      <arg value="${org.bedework.hsqldb.dir}/lportal"/> 
     98      <arg value="-port"/> 
     99      <arg value="9887"/> 
     100    </java> 
     101  </target> 
     102 
    89103  <!-- ================================================================= 
    90104       The "hsqldb-test" target starts the hsqldb server for testing 

  • trunk/config/bwbuild/default/cal.options.xml

    r1906 r1933  
    55    <bedework> 
    66      <global> 
     7        <!-- This property is how the running system finds the system settings. 
     8             In theory we could have multiple settings with different names 
     9         --> 
     10        <systemName>bedework</systemName> 
     11 
     12        <!-- This is used to prefix administrative group names to distinguish 
     13             them from user group names. --> 
     14        <adminGroupsIdPrefix>agrp_</adminGroupsIdPrefix> 
     15 
    716        <module> 
    817          <!-- A dummy module with no directory. --> 
    …… 
    142151          <categoryOptional>true</categoryOptional> 
    143152 
     153          <noGroupAllowed>false</noGroupAllowed> 
     154 
    144155          <appType>webadmin</appType> 
     156          <publicAdmin>true</publicAdmin> 
     157          <guestMode>false</guestMode> 
    145158 
    146159          <!-- This will become a system configuration in time --> 
    …… 
    169182 
    170183          <appType>websubmit</appType> 
     184          <publicAdmin>false</publicAdmin> 
     185          <guestMode>false</guestMode> 
    171186 
    172187          <!-- This will become a system configuration in time --> 
    …… 
    203218 
    204219          <appType>webpublic</appType> 
     220          <publicAdmin>false</publicAdmin> 
     221          <guestMode>true</guestMode> 
     222          <runAsUser>public-user</runAsUser> 
    205223 
    206224          <!-- Default value for 24 hour mode --> 
    …… 
    236254 
    237255          <appType>webpublic</appType> 
     256          <publicAdmin>false</publicAdmin> 
     257          <guestMode>true</guestMode> 
     258          <runAsUser>public-user</runAsUser> 
    238259 
    239260          <!-- Default value for 24 hour mode --> 
    …… 
    266287 
    267288          <appType>webuser</appType> 
     289          <publicAdmin>false</publicAdmin> 
     290          <guestMode>false</guestMode> 
    268291 
    269292          <!-- Default value for 24 hour mode --> 
    …… 
    288311             ================================================================== --> 
    289312        <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig"> 
     313          <publicAdmin>false</publicAdmin> 
     314          <guestMode>false</guestMode> 
     315 
     316          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl> 
     317 
    290318          <!-- Comment out or delete for no real time server to server service 
    291319               Currently under development and may present a security risk in 
    …… 
    304332             ================================================================== --> 
    305333        <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig"> 
     334          <publicAdmin>false</publicAdmin> 
     335          <guestMode>true</guestMode> 
     336          <runAsUser>public-user</runAsUser> 
     337 
     338          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl> 
     339 
    306340          <!-- Comment out or delete for no real time server to server service 
    307341               Currently under development and may present a security risk in 

  • trunk/config/bwbuild/default/cal.properties

    r1914 r1933  
    3838org.bedework.global.hibernate.cache.use_second_level_cache=false 
    3939org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    40  
    41 # This property is how the running system finds the system settings. 
    42 # In theory we could have multiple settings with different names 
    43 # The value here must match that in the options xml file. 
    44 org.bedework.global.system.name=bedework 
    4540 
    4641# Uncomment this to enable building of a common context for common javascript. 
    …… 
    209204org.bedework.app.bwconfig.display.name=Bedework Config 
    210205org.bedework.app.bwconfig.name=bwconfig 
    211 org.bedework.app.bwconfig.guestmode=true 
    212 org.bedework.app.bwconfig.publicadmin=false 
    213206org.bedework.app.bwconfig.logprefix=BwConfig 
    214207 
    …… 
    222215org.bedework.app.CalAdmin.sou.dir=webadmin 
    223216org.bedework.app.CalAdmin.default.contenttype=text/xml 
    224 org.bedework.app.CalAdmin.nogroupallowed=false 
    225217#org.bedework.app.CalAdmin.portlet.name=CalAdmin 
    226218 
    …… 
    243235org.bedework.app.CalAdmin.display.name=Public Events Administration 
    244236org.bedework.app.CalAdmin.name=DemoCalAdmin 
    245  
    246 org.bedework.app.CalAdmin.admingroupsidprefix=agrp_ 
    247 org.bedework.app.CalAdmin.guestmode=false 
    248 org.bedework.app.CalAdmin.publicadmin=true 
    249 org.bedework.app.CalAdmin.run.as.user=public-user 
    250237 
    251238# 
    …… 
    279266org.bedework.app.EventSubmit.name=DemoEventSubmit 
    280267 
    281 org.bedework.app.EventSubmit.guestmode=false 
    282 org.bedework.app.EventSubmit.publicadmin=false 
    283  
    284268# 
    285269# -------------------------------------------------------------------- 
    …… 
    308292org.bedework.app.Events.display.name=Demo calendar 
    309293org.bedework.app.Events.name=DemoCal 
    310 org.bedework.app.Events.run.as.user=public-user 
    311  
    312 org.bedework.app.Events.guestmode=true 
    313 org.bedework.app.Events.publicadmin=false 
    314294 
    315295# 
    …… 
    339319org.bedework.app.SoEDept.display.name=Demo departmental calendar 
    340320org.bedework.app.SoEDept.name=SoEDept 
    341 org.bedework.app.SoEDept.run.as.user=public-user 
    342  
    343 org.bedework.app.SoEDept.guestmode=true 
    344 org.bedework.app.SoEDept.publicadmin=false 
    345321 
    346322# 
    …… 
    374350org.bedework.app.UserCal.name=DemoUserCal 
    375351 
    376 org.bedework.app.UserCal.guestmode=false 
    377 org.bedework.app.UserCal.publicadmin=false 
    378  
    379352# 
    380353# -------------------------------------------------------------------- 
    …… 
    399372org.bedework.app.Pubcaldav.name=DemoPubcaldav 
    400373org.bedework.app.Pubcaldav.deploy.dir=/webapps 
    401 org.bedework.app.Pubcaldav.guestmode=true 
    402 org.bedework.app.Pubcaldav.publicadmin=false 
    403 org.bedework.app.Pubcaldav.run.as.user=public-user 
    404374org.bedework.app.Pubcaldav.logprefix=PubCalDav 
    405 org.bedework.app.Pubcaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl 
    406375 
    407376# 
    …… 
    431400org.bedework.app.Usercaldav.name=DemoUsrcaldav 
    432401org.bedework.app.Usercaldav.deploy.dir=/webapps 
    433 org.bedework.app.Usercaldav.guestmode=false 
    434 org.bedework.app.Usercaldav.publicadmin=false 
    435402org.bedework.app.Usercaldav.logprefix=UserCalDav 
    436 org.bedework.app.Usercaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl 
    437403 
    438404# 

  • trunk/config/bwbuild/jboss/democal.options.xml

    r1807 r1933  
    55    <bedework> 
    66      <global> 
     7        <!-- This property is how the running system finds the system settings. 
     8             In theory we could have multiple settings with different names 
     9         --> 
     10        <systemName>bedework</systemName> 
     11 
     12        <!-- This is used to prefix administrative group names to distinguish 
     13             them from user group names. --> 
     14        <adminGroupsIdPrefix>agrp_</adminGroupsIdPrefix> 
     15 
    716        <module> 
    817          <!-- A dummy module with no directory. --> 
    …… 
    134143          <categoryOptional>true</categoryOptional> 
    135144 
     145          <noGroupAllowed>false</noGroupAllowed> 
     146 
    136147          <appType>webadmin</appType> 
     148          <publicAdmin>true</publicAdmin> 
     149          <guestMode>false</guestMode> 
    137150 
    138151          <!-- This will become a system configuration in time --> 
    …… 
    161174 
    162175          <appType>websubmit</appType> 
     176          <publicAdmin>false</publicAdmin> 
     177          <guestMode>false</guestMode> 
    163178 
    164179          <!-- This will become a system configuration in time --> 
    …… 
    195210 
    196211          <appType>webpublic</appType> 
     212          <publicAdmin>false</publicAdmin> 
     213          <guestMode>true</guestMode> 
     214          <runAsUser>public-user</runAsUser> 
    197215 
    198216          <!-- Default value for 24 hour mode --> 
    …… 
    228246 
    229247          <appType>webpublic</appType> 
     248          <publicAdmin>false</publicAdmin> 
     249          <guestMode>true</guestMode> 
     250          <runAsUser>public-user</runAsUser> 
    230251 
    231252          <!-- Default value for 24 hour mode --> 
    …… 
    258279 
    259280          <appType>webuser</appType> 
     281          <publicAdmin>false</publicAdmin> 
     282          <guestMode>false</guestMode> 
    260283 
    261284          <!-- Default value for 24 hour mode --> 
    …… 
    280303             ================================================================== --> 
    281304        <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig"> 
     305          <publicAdmin>false</publicAdmin> 
     306          <guestMode>false</guestMode> 
     307 
     308          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl> 
     309 
    282310          <!-- Comment out or delete for no real time server to server service 
    283311               Currently under development and may present a security risk in 
    …… 
    296324             ================================================================== --> 
    297325        <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig"> 
     326          <publicAdmin>false</publicAdmin> 
     327          <guestMode>true</guestMode> 
     328          <runAsUser>public-user</runAsUser> 
     329 
     330          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl> 
     331 
    298332          <!-- Comment out or delete for no real time server to server service 
    299333               Currently under development and may present a security risk in 

  • trunk/config/bwbuild/jboss/democal.properties

    r1807 r1933  
    3838org.bedework.global.hibernate.cache.use_second_level_cache=false 
    3939org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    40  
    41 # This property is how the running system finds the system settings. 
    42 # In theory we could have multiple settings with different names 
    43 # The value here must match that in the options xml file. 
    44 org.bedework.global.system.name=bedework 
    4540 
    4641# Uncomment this to enable building of a common context for common javascript. 
    …… 
    212207org.bedework.app.bwconfig.display.name=Bedework Config 
    213208org.bedework.app.bwconfig.name=bwconfig 
    214 org.bedework.app.bwconfig.guestmode=true 
    215 org.bedework.app.bwconfig.publicadmin=false 
    216209org.bedework.app.bwconfig.logprefix=BwConfig 
    217210 
    …… 
    225218org.bedework.app.CalAdmin.sou.dir=webadmin 
    226219org.bedework.app.CalAdmin.default.contenttype=text/xml 
    227 org.bedework.app.CalAdmin.nogroupallowed=false 
    228220#org.bedework.app.CalAdmin.portlet.name=CalAdmin 
    229221 
    …… 
    246238org.bedework.app.CalAdmin.display.name=Public Events Administration 
    247239org.bedework.app.CalAdmin.name=DemoCalAdmin 
    248  
    249 org.bedework.app.CalAdmin.admingroupsidprefix=agrp_ 
    250 org.bedework.app.CalAdmin.guestmode=false 
    251 org.bedework.app.CalAdmin.publicadmin=true 
    252 org.bedework.app.CalAdmin.run.as.user=public-user 
    253240 
    254241# 
    …… 
    282269org.bedework.app.EventSubmit.name=DemoEventSubmit 
    283270 
    284 org.bedework.app.EventSubmit.guestmode=false 
    285 org.bedework.app.EventSubmit.publicadmin=false 
    286  
    287271# 
    288272# -------------------------------------------------------------------- 
    …… 
    311295org.bedework.app.Events.display.name=Demo calendar 
    312296org.bedework.app.Events.name=DemoCal 
    313 org.bedework.app.Events.run.as.user=public-user 
    314  
    315 org.bedework.app.Events.guestmode=true 
    316 org.bedework.app.Events.publicadmin=false 
    317297 
    318298# 
    …… 
    342322org.bedework.app.SoEDept.display.name=Demo departmental calendar 
    343323org.bedework.app.SoEDept.name=SoEDept 
    344 org.bedework.app.SoEDept.run.as.user=public-user 
    345  
    346 org.bedework.app.SoEDept.guestmode=true 
    347 org.bedework.app.SoEDept.publicadmin=false 
    348324 
    349325# 
    …… 
    377353org.bedework.app.UserCal.name=DemoUserCal 
    378354 
    379 org.bedework.app.UserCal.guestmode=false 
    380 org.bedework.app.UserCal.publicadmin=false 
    381  
    382355# 
    383356# -------------------------------------------------------------------- 
    …… 
    402375org.bedework.app.Pubcaldav.name=DemoPubcaldav 
    403376org.bedework.app.Pubcaldav.deploy.dir=/webapps 
    404 org.bedework.app.Pubcaldav.guestmode=true 
    405 org.bedework.app.Pubcaldav.publicadmin=false 
    406 org.bedework.app.Pubcaldav.run.as.user=public-user 
    407377org.bedework.app.Pubcaldav.logprefix=PubCalDav 
    408 org.bedework.app.Pubcaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl 
    409378 
    410379# 
    …… 
    434403org.bedework.app.Usercaldav.name=DemoUsrcaldav 
    435404org.bedework.app.Usercaldav.deploy.dir=/webapps 
    436 org.bedework.app.Usercaldav.guestmode=false 
    437 org.bedework.app.Usercaldav.publicadmin=false 
    438405org.bedework.app.Usercaldav.logprefix=UserCalDav 
    439 org.bedework.app.Usercaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl 
    440406 
    441407# 

  • trunk/config/configs/democal.options.xml

    r1906 r1933  
    55    <bedework> 
    66      <global> 
     7        <!-- This property is how the running system finds the system settings. 
     8             In theory we could have multiple settings with different names 
     9         --> 
     10        <systemName>bedework</systemName> 
     11 
     12        <!-- This is used to prefix administrative group names to distinguish 
     13             them from user group names. --> 
     14        <adminGroupsIdPrefix>agrp_</adminGroupsIdPrefix> 
     15 
    716        <module> 
    817          <!-- A dummy module with no directory. --> 
    …… 
    142151          <categoryOptional>true</categoryOptional> 
    143152 
     153          <noGroupAllowed>false</noGroupAllowed> 
     154 
    144155          <appType>webadmin</appType> 
     156          <publicAdmin>true</publicAdmin> 
     157          <guestMode>false</guestMode> 
    145158 
    146159          <!-- This will become a system configuration in time --> 
    …… 
    169182 
    170183          <appType>websubmit</appType> 
     184          <publicAdmin>false</publicAdmin> 
     185          <guestMode>false</guestMode> 
    171186 
    172187          <!-- This will become a system configuration in time --> 
    …… 
    203218 
    204219          <appType>webpublic</appType> 
     220          <publicAdmin>false</publicAdmin> 
     221          <guestMode>true</guestMode> 
     222          <runAsUser>public-user</runAsUser> 
    205223 
    206224          <!-- Default value for 24 hour mode --> 
    …… 
    236254 
    237255          <appType>webpublic</appType> 
     256          <publicAdmin>false</publicAdmin> 
     257          <guestMode>true</guestMode> 
     258          <runAsUser>public-user</runAsUser> 
    238259 
    239260          <!-- Default value for 24 hour mode --> 
    …… 
    266287 
    267288          <appType>webuser</appType> 
     289          <publicAdmin>false</publicAdmin> 
     290          <guestMode>false</guestMode> 
    268291 
    269292          <!-- Default value for 24 hour mode --> 
    …… 
    288311             ================================================================== --> 
    289312        <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig"> 
     313          <publicAdmin>false</publicAdmin> 
     314          <guestMode>false</guestMode> 
     315 
     316          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl> 
     317 
    290318          <!-- Comment out or delete for no real time server to server service 
    291319               Currently under development and may present a security risk in 
    …… 
    304332             ================================================================== --> 
    305333        <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig"> 
     334          <publicAdmin>false</publicAdmin> 
     335          <guestMode>true</guestMode> 
     336          <runAsUser>public-user</runAsUser> 
     337 
     338          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl> 
     339 
    306340          <!-- Comment out or delete for no real time server to server service 
    307341               Currently under development and may present a security risk in 

  • trunk/config/configs/democal.properties

    r1914 r1933  
    44# Introduction 
    55# 
     6# All properties defined in this file are used at deploy time only. The options 
     7# xml file contains all run time propreties adn will be built in to the resulting 
     8# war files and runable components. 
    69# 
    710# Properties for all modules are saved below - even if they are not 
    811# being deployed. The globals section defines which modules will be 
    912# deployed as well as some other global properties. 
    10 # 
    11 # Note that the options and properties are undergoing yet another upheaval. 
    12 # They will be divided into two parts, build-time ant properties in this file 
    13 # and run-time application properties in a corresponding xxx.options.xml file. 
    1413# 
    1514# -------------------------------------------------------------------- 
    …… 
    3837org.bedework.global.hibernate.cache.use_second_level_cache=false 
    3938org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    40  
    41 # This property is how the running system finds the system settings. 
    42 # In theory we could have multiple settings with different names 
    43 # The value here must match that in the options xml file. 
    44 org.bedework.global.system.name=bedework 
    4539 
    4640# Uncomment this to enable building of a common context for common javascript. 
    …… 
    208202org.bedework.app.bwconfig.display.name=Bedework Config 
    209203org.bedework.app.bwconfig.name=bwconfig 
    210 org.bedework.app.bwconfig.guestmode=true 
    211 org.bedework.app.bwconfig.publicadmin=false 
    212204org.bedework.app.bwconfig.logprefix=BwConfig 
    213205 
    …… 
    221213org.bedework.app.CalAdmin.sou.dir=webadmin 
    222214org.bedework.app.CalAdmin.default.contenttype=text/xml 
    223 org.bedework.app.CalAdmin.nogroupallowed=false 
    224215#org.bedework.app.CalAdmin.portlet.name=CalAdmin 
    225216 
    …… 
    242233org.bedework.app.CalAdmin.display.name=Public Events Administration 
    243234org.bedework.app.CalAdmin.name=DemoCalAdmin 
    244  
    245 org.bedework.app.CalAdmin.admingroupsidprefix=agrp_ 
    246 org.bedework.app.CalAdmin.guestmode=false 
    247 org.bedework.app.CalAdmin.publicadmin=true 
    248 org.bedework.app.CalAdmin.run.as.user=public-user 
    249235 
    250236# 
    …… 
    278264org.bedework.app.EventSubmit.name=DemoEventSubmit 
    279265 
    280 org.bedework.app.EventSubmit.guestmode=false 
    281 org.bedework.app.EventSubmit.publicadmin=false 
    282  
    283266# 
    284267# -------------------------------------------------------------------- 
    …… 
    307290org.bedework.app.Events.display.name=Demo calendar 
    308291org.bedework.app.Events.name=DemoCal 
    309 org.bedework.app.Events.run.as.user=public-user 
    310  
    311 org.bedework.app.Events.guestmode=true 
    312 org.bedework.app.Events.publicadmin=false 
    313292 
    314293# 
    …… 
    338317org.bedework.app.SoEDept.display.name=Demo departmental calendar 
    339318org.bedework.app.SoEDept.name=SoEDept 
    340 org.bedework.app.SoEDept.run.as.user=public-user 
    341  
    342 org.bedework.app.SoEDept.guestmode=true 
    343 org.bedework.app.SoEDept.publicadmin=false 
    344319 
    345320# 
    …… 
    373348org.bedework.app.UserCal.name=DemoUserCal 
    374349 
    375 org.bedework.app.UserCal.guestmode=false 
    376 org.bedework.app.UserCal.publicadmin=false 
    377  
    378350# 
    379351# -------------------------------------------------------------------- 
    …… 
    398370org.bedework.app.Pubcaldav.name=DemoPubcaldav 
    399371org.bedework.app.Pubcaldav.deploy.dir=/webapps 
    400 org.bedework.app.Pubcaldav.guestmode=true 
    401 org.bedework.app.Pubcaldav.publicadmin=false 
    402 org.bedework.app.Pubcaldav.run.as.user=public-user 
    403372org.bedework.app.Pubcaldav.logprefix=PubCalDav 
    404 org.bedework.app.Pubcaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl 
    405373 
    406374# 
    …… 
    430398org.bedework.app.Usercaldav.name=DemoUsrcaldav 
    431399org.bedework.app.Usercaldav.deploy.dir=/webapps 
    432 org.bedework.app.Usercaldav.guestmode=false 
    433 org.bedework.app.Usercaldav.publicadmin=false 
    434400org.bedework.app.Usercaldav.logprefix=UserCalDav 
    435 org.bedework.app.Usercaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl 
    436401 
    437402# 

  • trunk/deployment/appjars.xml

    r1919 r1933  
    101101      <!-- Liferay --> 
    102102 
    103       <getJar lib="${org.bedework.app.lib}" 
    104               name="liferay.util-bridges" version="4.2" /> 
    105  
    106       <getJar lib="${org.bedework.app.lib}" 
    107               name="liferay.util-java" version="4.2" /> 
     103      <if> 
     104        <isset property="org.bedework.build.for.liferay4" /> 
     105        <then> 
     106          <getJar lib="${org.bedework.app.lib}" 
     107                  name="liferay.util-bridges" version="4.2" /> 
     108 
     109          <getJar lib="${org.bedework.app.lib}" 
     110                  name="liferay.util-java" version="4.2" /> 
     111        </then> 
     112      </if> 
     113 
     114      <if> 
     115        <isset property="org.bedework.build.for.liferay5" /> 
     116        <then> 
     117          <getJar lib="${org.bedework.app.lib}" 
     118                  name="liferay.util-bridges" version="5.1" /> 
     119 
     120          <getJar lib="${org.bedework.app.lib}" 
     121                  name="liferay.util-java" version="5.1" /> 
     122 
     123          <getJar lib="${org.bedework.app.lib}" 
     124                  name="liferay.util-taglib" version="5.1" /> 
     125 
     126          <getJar lib="${org.bedework.app.lib}" 
     127                  name="liferay.portal-impl" version="5.1" /> 
     128 
     129          <getJar lib="${org.bedework.app.lib}" 
     130                  name="liferay.portal-kernel" version="5.1" /> 
     131 
     132          <getJar lib="${org.bedework.app.lib}" 
     133                  name="liferay.spring" version="5.1" /> 
     134 
     135          <getJar lib="${org.bedework.app.lib}" 
     136                  name="liferay.easyconf" version="5.1" /> 
     137 
     138          <getJar lib="${org.bedework.app.lib}" 
     139                  name="liferay.portal-service" version="5.1" /> 
     140 
     141          <getJar lib="${org.bedework.app.lib}" 
     142                  name="liferay.xstream" version="5.1" /> 
     143 
     144          <getJar lib="${org.bedework.app.lib}" 
     145                  name="liferay.commons-lang" version="5.1" /> 
     146 
     147          <getJar lib="${org.bedework.app.lib}" 
     148                  name="liferay.commons-collections" version="5.1" /> 
     149 
     150          <getJar lib="${org.bedework.app.lib}" 
     151                  name="liferay.aspectj-weaver" version="5.1" /> 
     152 
     153          <getJar lib="${org.bedework.app.lib}" 
     154                  name="liferay.portlet" version="5.1" /> 
     155 
     156          <getJar lib="${org.bedework.app.lib}" 
     157                  name="commons-configuration" /> 
     158        </then> 
     159      </if> 
    108160 
    109161      <!-- Other commons apis --> 

  • trunk/deployment/freebusyAggregator/uportal2/build.xml

    r1105 r1933  
    1414    <property name="propval.directory.browsing.disallowed" 
    1515              value="${app.directory.browsing.disallowed}" /> 
    16  
    17     <property name="propval.app.guestmode" value="true" /> 
    1816 
    1917    <dirname property="portlet.build.dir" file="${ant.file}"/> 

  • trunk/deployment/freebusyAggregator/webapp/build.xml

    r1895 r1933  
    3131    <property name="propval.directory.browsing.disallowed" 
    3232              value="${app.directory.browsing.disallowed}" /> 
    33  
    34     <property name="propval.app.guestmode" value="true" /> 
    3533 
    3634    <property name="app.resources.dir" 

  • trunk/deployment/webadmin/jetspeed/build.xml

    r1205 r1933  
    1616    <property name="propval.directory.browsing.disallowed" 
    1717              value="${app.directory.browsing.disallowed}" /> 
    18  
    19     <property name="propval.app.guestmode" value="false" /> 
    2018 
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 

  • trunk/deployment/webadmin/liferay4/build.xml

    r1621 r1933  
    1616    <property name="propval.directory.browsing.disallowed" 
    1717              value="${app.directory.browsing.disallowed}" /> 
    18  
    19     <property name="propval.app.guestmode" value="false" /> 
    2018 
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 

  • trunk/deployment/webadmin/uportal2/build.xml

    r1621 r1933  
    1616    <property name="propval.directory.browsing.disallowed" 
    1717              value="${app.directory.browsing.disallowed}" /> 
    18  
    19     <property name="propval.app.guestmode" value="false" /> 
    2018 
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 

  • trunk/deployment/webconfig/webapp/build.xml

    r1895 r1933  
    3333    <property name="propval.directory.browsing.disallowed" 
    3434              value="${app.directory.browsing.disallowed}" /> 
    35  
    36     <property name="propval.app.guestmode" value="true" /> 
    3735 
    3836    <property name="app.resources.dir" 

  • trunk/deployment/webpublic/jetspeed/build.xml

    r1205 r1933  
    1616    <property name="propval.directory.browsing.disallowed" 
    1717              value="${app.directory.browsing.disallowed}" /> 
    18  
    19     <property name="propval.app.guestmode" value="true" /> 
    2018 
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 

  • trunk/deployment/webpublic/liferay4/build.xml

    r1621 r1933  
    1616    <property name="propval.directory.browsing.disallowed" 
    1717              value="${app.directory.browsing.disallowed}" /> 
    18  
    19     <property name="propval.app.guestmode" value="true" /> 
    2018 
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 

  • trunk/deployment/webpublic/uportal2/build.xml

    r1621 r1933  
    1616    <property name="propval.directory.browsing.disallowed" 
    1717              value="${app.directory.browsing.disallowed}" /> 
    18  
    19     <property name="propval.app.guestmode" value="true" /> 
    2018 
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 

  • trunk/deployment/webpublic/webapp/build.xml

    r1895 r1933  
    3434    <property name="propval.directory.browsing.disallowed" 
    3535              value="${app.directory.browsing.disallowed}" /> 
    36  
    37     <property name="propval.app.guestmode" value="true" /> 
    3836 
    3937    <property name="app.resources.dir" 

  • trunk/deployment/websubmit/jetspeed/build.xml

    r1580 r1933  
    1616              value="${app.sou.dir}/war/WEB-INF/web.xml" /> 
    1717              --> 
    18  
    19     <property name="propval.app.guestmode" value="false" /> 
    2018 
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 

  • trunk/deployment/websubmit/liferay4/build.xml

    r1580 r1933  
    1616              value="${app.sou.dir}/war/WEB-INF/web.xml" /> 
    1717              --> 
    18  
    19     <property name="propval.app.guestmode" value="false" /> 
    2018 
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 

  • trunk/deployment/websubmit/uportal2/build.xml

    r1580 r1933  
    1616              value="${app.sou.dir}/war/WEB-INF/web.xml" /> 
    1717              --> 
    18  
    19     <property name="propval.app.guestmode" value="false" /> 
    2018 
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 

  • trunk/deployment/websubmit/webapp/build.xml

    r1895 r1933  
    3030              value="${app.sou.dir}/war/WEB-INF/web.xml" /> 
    3131              --> 
    32  
    33     <property name="propval.app.guestmode" value="false" /> 
    3432 
    3533    <property name="app.resources.dir" 

  • trunk/deployment/webuser/jetspeed/build.xml

    r1205 r1933  
    1616              value="${app.sou.dir}/war/WEB-INF/web.xml" /> 
    1717              --> 
    18  
    19     <property name="propval.app.guestmode" value="false" /> 
    2018 
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 

  • trunk/deployment/webuser/liferay4/build.xml

    r1213 r1933  
    1717              --> 
    1818 
    19     <property name="propval.app.guestmode" value="false" /> 
    20  
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 
    2220 
    …… 
    2624 
    2725    <!-- The intent is to have a set of quickstart skins configured for 
    28          portal use. So far we've not managed that so for th etime being we 
     26         portal use. So far we've not managed that so for the time being we 
    2927         will just use the standalone skin set. 
    3028    <property name="portlet.skins.dir" 

  • trunk/deployment/webuser/uportal2/build.xml

    r1621 r1933  
    1717              --> 
    1818 
    19     <property name="propval.app.guestmode" value="false" /> 
    20  
    2119    <dirname property="portlet.build.dir" file="${ant.file}"/> 
    2220 
    …… 
    2624 
    2725    <!-- The intent is to have a set of quickstart skins configured for 
    28          portal use. So far we've not managed that so for th etime being we 
     26         portal use. So far we've not managed that so for the time being we 
    2927         will just use the standalone skin set. 
    3028    <property name="portlet.skins.dir" 

  • trunk/deployment/webuser/webapp/build.xml

    r1895 r1933  
    3030              value="${app.sou.dir}/war/WEB-INF/web.xml" /> 
    3131              --> 
    32  
    33     <property name="propval.app.guestmode" value="false" /> 
    3432 
    3533    <property name="app.resources.dir"