Changeset 1933
- Timestamp:
- 10/28/08 10:12:28
- Files:
-
- trunk/build/buildfilters.xml (modified) (1 diff)
- trunk/build/buildwar.xml (modified) (3 diffs)
- trunk/build/getJar.xml (modified) (1 diff)
- trunk/build/quickstart/run-hsqldb.xml (modified) (1 diff)
- trunk/config/bwbuild/default/cal.options.xml (modified) (8 diffs)
- trunk/config/bwbuild/default/cal.properties (modified) (10 diffs)
- trunk/config/bwbuild/jboss/democal.options.xml (modified) (8 diffs)
- trunk/config/bwbuild/jboss/democal.properties (modified) (10 diffs)
- trunk/config/configs/democal.options.xml (modified) (8 diffs)
- trunk/config/configs/democal.properties (modified) (11 diffs)
- trunk/config/properties (deleted)
- trunk/deployment/appjars.xml (modified) (1 diff)
- trunk/deployment/freebusyAggregator/uportal2/build.xml (modified) (1 diff)
- trunk/deployment/freebusyAggregator/webapp/build.xml (modified) (1 diff)
- trunk/deployment/termination/liferay5 (added)
- trunk/deployment/termination/liferay5/build.xml (added)
- trunk/deployment/termination/liferay5/liferay-portlet.tld (added)
- trunk/deployment/webadmin/jetspeed/build.xml (modified) (1 diff)
- trunk/deployment/webadmin/liferay4/build.xml (modified) (1 diff)
- trunk/deployment/webadmin/liferay5 (added)
- trunk/deployment/webadmin/liferay5/build.xml (added)
- trunk/deployment/webadmin/uportal2/build.xml (modified) (1 diff)
- trunk/deployment/webconfig/webapp/build.xml (modified) (1 diff)
- trunk/deployment/webpublic/jetspeed/build.xml (modified) (1 diff)
- trunk/deployment/webpublic/liferay4/build.xml (modified) (1 diff)
- trunk/deployment/webpublic/liferay5 (added)
- trunk/deployment/webpublic/liferay5/build.xml (added)
- trunk/deployment/webpublic/uportal2/build.xml (modified) (1 diff)
- trunk/deployment/webpublic/webapp/build.xml (modified) (1 diff)
- trunk/deployment/websubmit/jetspeed/build.xml (modified) (1 diff)
- trunk/deployment/websubmit/liferay4/build.xml (modified) (1 diff)
- trunk/deployment/websubmit/liferay5 (added)
- trunk/deployment/websubmit/liferay5/build.xml (added)
- trunk/deployment/websubmit/uportal2/build.xml (modified) (1 diff)
- trunk/deployment/websubmit/webapp/build.xml (modified) (1 diff)
- trunk/deployment/webuser/jetspeed/build.xml (modified) (1 diff)
- trunk/deployment/webuser/liferay4/build.xml (modified) (2 diffs)
- trunk/deployment/webuser/liferay5 (added)
- trunk/deployment/webuser/liferay5/build.xml (added)
- trunk/deployment/webuser/portlet/resources/demoskins (deleted)
- trunk/deployment/webuser/uportal2/build.xml (modified) (2 diffs)
- trunk/deployment/webuser/webapp/build.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/buildfilters.xml
r1906 r1933 92 92 value="${propval.app.root}" /> 93 93 94 <filter token="APP-GUESTMODE"95 value="${propval.app.guestmode}" />96 97 94 <!-- Change this to be an app par --> 98 95 <filter token="RUN-AS-USER" trunk/build/buildwar.xml
r1920 r1933 140 140 <antcall target="copy.war.docs" inheritRefs="true" /> 141 141 142 <!-- Create the env.properties file -->142 <!-- Create the runtime options file --> 143 143 <mkdir dir="${app.dest.properties}" /> 144 145 <copy tofile="${app.dest.properties}/env.properties"146 file="${org.bedework.config.properties}" />147 144 148 145 <copy tofile="${app.dest.properties}/options.xml" … … 417 414 <antcall target="add.uportal2" inheritRefs="true" /> 418 415 <antcall target="add.liferay4" inheritRefs="true" /> 416 <antcall target="add.liferay5" inheritRefs="true" /> 419 417 </then> 420 418 </if> … … 542 540 543 541 <!-- ================================================================= 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 <!-- ================================================================= 544 619 If this is a j2ee app the following gets executed. 545 620 We create an uodated jboss-web.xml file (for jboss) and a ear trunk/build/getJar.xml
r1894 r1933 19 19 @param lib optional destination for the get task 20 20 @param libcache optional location of the cache 21 @param property optional name of property to hold loca ltion of resulting jar21 @param property optional name of property to hold location of resulting jar 22 22 @param project optional project name for local fetch from generated quickstart. 23 23 =================================================================== --> trunk/build/quickstart/run-hsqldb.xml
r1914 r1933 87 87 </target> 88 88 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 89 103 <!-- ================================================================= 90 104 The "hsqldb-test" target starts the hsqldb server for testing trunk/config/bwbuild/default/cal.options.xml
r1906 r1933 5 5 <bedework> 6 6 <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 7 16 <module> 8 17 <!-- A dummy module with no directory. --> … … 142 151 <categoryOptional>true</categoryOptional> 143 152 153 <noGroupAllowed>false</noGroupAllowed> 154 144 155 <appType>webadmin</appType> 156 <publicAdmin>true</publicAdmin> 157 <guestMode>false</guestMode> 145 158 146 159 <!-- This will become a system configuration in time --> … … 169 182 170 183 <appType>websubmit</appType> 184 <publicAdmin>false</publicAdmin> 185 <guestMode>false</guestMode> 171 186 172 187 <!-- This will become a system configuration in time --> … … 203 218 204 219 <appType>webpublic</appType> 220 <publicAdmin>false</publicAdmin> 221 <guestMode>true</guestMode> 222 <runAsUser>public-user</runAsUser> 205 223 206 224 <!-- Default value for 24 hour mode --> … … 236 254 237 255 <appType>webpublic</appType> 256 <publicAdmin>false</publicAdmin> 257 <guestMode>true</guestMode> 258 <runAsUser>public-user</runAsUser> 238 259 239 260 <!-- Default value for 24 hour mode --> … … 266 287 267 288 <appType>webuser</appType> 289 <publicAdmin>false</publicAdmin> 290 <guestMode>false</guestMode> 268 291 269 292 <!-- Default value for 24 hour mode --> … … 288 311 ================================================================== --> 289 312 <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 290 318 <!-- Comment out or delete for no real time server to server service 291 319 Currently under development and may present a security risk in … … 304 332 ================================================================== --> 305 333 <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 306 340 <!-- Comment out or delete for no real time server to server service 307 341 Currently under development and may present a security risk in trunk/config/bwbuild/default/cal.properties
r1914 r1933 38 38 org.bedework.global.hibernate.cache.use_second_level_cache=false 39 39 org.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 names43 # The value here must match that in the options xml file.44 org.bedework.global.system.name=bedework45 40 46 41 # Uncomment this to enable building of a common context for common javascript. … … 209 204 org.bedework.app.bwconfig.display.name=Bedework Config 210 205 org.bedework.app.bwconfig.name=bwconfig 211 org.bedework.app.bwconfig.guestmode=true212 org.bedework.app.bwconfig.publicadmin=false213 206 org.bedework.app.bwconfig.logprefix=BwConfig 214 207 … … 222 215 org.bedework.app.CalAdmin.sou.dir=webadmin 223 216 org.bedework.app.CalAdmin.default.contenttype=text/xml 224 org.bedework.app.CalAdmin.nogroupallowed=false225 217 #org.bedework.app.CalAdmin.portlet.name=CalAdmin 226 218 … … 243 235 org.bedework.app.CalAdmin.display.name=Public Events Administration 244 236 org.bedework.app.CalAdmin.name=DemoCalAdmin 245 246 org.bedework.app.CalAdmin.admingroupsidprefix=agrp_247 org.bedework.app.CalAdmin.guestmode=false248 org.bedework.app.CalAdmin.publicadmin=true249 org.bedework.app.CalAdmin.run.as.user=public-user250 237 251 238 # … … 279 266 org.bedework.app.EventSubmit.name=DemoEventSubmit 280 267 281 org.bedework.app.EventSubmit.guestmode=false282 org.bedework.app.EventSubmit.publicadmin=false283 284 268 # 285 269 # -------------------------------------------------------------------- … … 308 292 org.bedework.app.Events.display.name=Demo calendar 309 293 org.bedework.app.Events.name=DemoCal 310 org.bedework.app.Events.run.as.user=public-user311 312 org.bedework.app.Events.guestmode=true313 org.bedework.app.Events.publicadmin=false314 294 315 295 # … … 339 319 org.bedework.app.SoEDept.display.name=Demo departmental calendar 340 320 org.bedework.app.SoEDept.name=SoEDept 341 org.bedework.app.SoEDept.run.as.user=public-user342 343 org.bedework.app.SoEDept.guestmode=true344 org.bedework.app.SoEDept.publicadmin=false345 321 346 322 # … … 374 350 org.bedework.app.UserCal.name=DemoUserCal 375 351 376 org.bedework.app.UserCal.guestmode=false377 org.bedework.app.UserCal.publicadmin=false378 379 352 # 380 353 # -------------------------------------------------------------------- … … 399 372 org.bedework.app.Pubcaldav.name=DemoPubcaldav 400 373 org.bedework.app.Pubcaldav.deploy.dir=/webapps 401 org.bedework.app.Pubcaldav.guestmode=true402 org.bedework.app.Pubcaldav.publicadmin=false403 org.bedework.app.Pubcaldav.run.as.user=public-user404 374 org.bedework.app.Pubcaldav.logprefix=PubCalDav 405 org.bedework.app.Pubcaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl406 375 407 376 # … … 431 400 org.bedework.app.Usercaldav.name=DemoUsrcaldav 432 401 org.bedework.app.Usercaldav.deploy.dir=/webapps 433 org.bedework.app.Usercaldav.guestmode=false434 org.bedework.app.Usercaldav.publicadmin=false435 402 org.bedework.app.Usercaldav.logprefix=UserCalDav 436 org.bedework.app.Usercaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl437 403 438 404 # trunk/config/bwbuild/jboss/democal.options.xml
r1807 r1933 5 5 <bedework> 6 6 <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 7 16 <module> 8 17 <!-- A dummy module with no directory. --> … … 134 143 <categoryOptional>true</categoryOptional> 135 144 145 <noGroupAllowed>false</noGroupAllowed> 146 136 147 <appType>webadmin</appType> 148 <publicAdmin>true</publicAdmin> 149 <guestMode>false</guestMode> 137 150 138 151 <!-- This will become a system configuration in time --> … … 161 174 162 175 <appType>websubmit</appType> 176 <publicAdmin>false</publicAdmin> 177 <guestMode>false</guestMode> 163 178 164 179 <!-- This will become a system configuration in time --> … … 195 210 196 211 <appType>webpublic</appType> 212 <publicAdmin>false</publicAdmin> 213 <guestMode>true</guestMode> 214 <runAsUser>public-user</runAsUser> 197 215 198 216 <!-- Default value for 24 hour mode --> … … 228 246 229 247 <appType>webpublic</appType> 248 <publicAdmin>false</publicAdmin> 249 <guestMode>true</guestMode> 250 <runAsUser>public-user</runAsUser> 230 251 231 252 <!-- Default value for 24 hour mode --> … … 258 279 259 280 <appType>webuser</appType> 281 <publicAdmin>false</publicAdmin> 282 <guestMode>false</guestMode> 260 283 261 284 <!-- Default value for 24 hour mode --> … … 280 303 ================================================================== --> 281 304 <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 282 310 <!-- Comment out or delete for no real time server to server service 283 311 Currently under development and may present a security risk in … … 296 324 ================================================================== --> 297 325 <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 298 332 <!-- Comment out or delete for no real time server to server service 299 333 Currently under development and may present a security risk in trunk/config/bwbuild/jboss/democal.properties
r1807 r1933 38 38 org.bedework.global.hibernate.cache.use_second_level_cache=false 39 39 org.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 names43 # The value here must match that in the options xml file.44 org.bedework.global.system.name=bedework45 40 46 41 # Uncomment this to enable building of a common context for common javascript. … … 212 207 org.bedework.app.bwconfig.display.name=Bedework Config 213 208 org.bedework.app.bwconfig.name=bwconfig 214 org.bedework.app.bwconfig.guestmode=true215 org.bedework.app.bwconfig.publicadmin=false216 209 org.bedework.app.bwconfig.logprefix=BwConfig 217 210 … … 225 218 org.bedework.app.CalAdmin.sou.dir=webadmin 226 219 org.bedework.app.CalAdmin.default.contenttype=text/xml 227 org.bedework.app.CalAdmin.nogroupallowed=false228 220 #org.bedework.app.CalAdmin.portlet.name=CalAdmin 229 221 … … 246 238 org.bedework.app.CalAdmin.display.name=Public Events Administration 247 239 org.bedework.app.CalAdmin.name=DemoCalAdmin 248 249 org.bedework.app.CalAdmin.admingroupsidprefix=agrp_250 org.bedework.app.CalAdmin.guestmode=false251 org.bedework.app.CalAdmin.publicadmin=true252 org.bedework.app.CalAdmin.run.as.user=public-user253 240 254 241 # … … 282 269 org.bedework.app.EventSubmit.name=DemoEventSubmit 283 270 284 org.bedework.app.EventSubmit.guestmode=false285 org.bedework.app.EventSubmit.publicadmin=false286 287 271 # 288 272 # -------------------------------------------------------------------- … … 311 295 org.bedework.app.Events.display.name=Demo calendar 312 296 org.bedework.app.Events.name=DemoCal 313 org.bedework.app.Events.run.as.user=public-user314 315 org.bedework.app.Events.guestmode=true316 org.bedework.app.Events.publicadmin=false317 297 318 298 # … … 342 322 org.bedework.app.SoEDept.display.name=Demo departmental calendar 343 323 org.bedework.app.SoEDept.name=SoEDept 344 org.bedework.app.SoEDept.run.as.user=public-user345 346 org.bedework.app.SoEDept.guestmode=true347 org.bedework.app.SoEDept.publicadmin=false348 324 349 325 # … … 377 353 org.bedework.app.UserCal.name=DemoUserCal 378 354 379 org.bedework.app.UserCal.guestmode=false380 org.bedework.app.UserCal.publicadmin=false381 382 355 # 383 356 # -------------------------------------------------------------------- … … 402 375 org.bedework.app.Pubcaldav.name=DemoPubcaldav 403 376 org.bedework.app.Pubcaldav.deploy.dir=/webapps 404 org.bedework.app.Pubcaldav.guestmode=true405 org.bedework.app.Pubcaldav.publicadmin=false406 org.bedework.app.Pubcaldav.run.as.user=public-user407 377 org.bedework.app.Pubcaldav.logprefix=PubCalDav 408 org.bedework.app.Pubcaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl409 378 410 379 # … … 434 403 org.bedework.app.Usercaldav.name=DemoUsrcaldav 435 404 org.bedework.app.Usercaldav.deploy.dir=/webapps 436 org.bedework.app.Usercaldav.guestmode=false437 org.bedework.app.Usercaldav.publicadmin=false438 405 org.bedework.app.Usercaldav.logprefix=UserCalDav 439 org.bedework.app.Usercaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl440 406 441 407 # trunk/config/configs/democal.options.xml
r1906 r1933 5 5 <bedework> 6 6 <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 7 16 <module> 8 17 <!-- A dummy module with no directory. --> … … 142 151 <categoryOptional>true</categoryOptional> 143 152 153 <noGroupAllowed>false</noGroupAllowed> 154 144 155 <appType>webadmin</appType> 156 <publicAdmin>true</publicAdmin> 157 <guestMode>false</guestMode> 145 158 146 159 <!-- This will become a system configuration in time --> … … 169 182 170 183 <appType>websubmit</appType> 184 <publicAdmin>false</publicAdmin> 185 <guestMode>false</guestMode> 171 186 172 187 <!-- This will become a system configuration in time --> … … 203 218 204 219 <appType>webpublic</appType> 220 <publicAdmin>false</publicAdmin> 221 <guestMode>true</guestMode> 222 <runAsUser>public-user</runAsUser> 205 223 206 224 <!-- Default value for 24 hour mode --> … … 236 254 237 255 <appType>webpublic</appType> 256 <publicAdmin>false</publicAdmin> 257 <guestMode>true</guestMode> 258 <runAsUser>public-user</runAsUser> 238 259 239 260 <!-- Default value for 24 hour mode --> … … 266 287 267 288 <appType>webuser</appType> 289 <publicAdmin>false</publicAdmin> 290 <guestMode>false</guestMode> 268 291 269 292 <!-- Default value for 24 hour mode --> … … 288 311 ================================================================== --> 289 312 <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 290 318 <!-- Comment out or delete for no real time server to server service 291 319 Currently under development and may present a security risk in … … 304 332 ================================================================== --> 305 333 <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 306 340 <!-- Comment out or delete for no real time server to server service 307 341 Currently under development and may present a security risk in trunk/config/configs/democal.properties
r1914 r1933 4 4 # Introduction 5 5 # 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. 6 9 # 7 10 # Properties for all modules are saved below - even if they are not 8 11 # being deployed. The globals section defines which modules will be 9 12 # 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 file13 # and run-time application properties in a corresponding xxx.options.xml file.14 13 # 15 14 # -------------------------------------------------------------------- … … 38 37 org.bedework.global.hibernate.cache.use_second_level_cache=false 39 38 org.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 names43 # The value here must match that in the options xml file.44 org.bedework.global.system.name=bedework45 39 46 40 # Uncomment this to enable building of a common context for common javascript. … … 208 202 org.bedework.app.bwconfig.display.name=Bedework Config 209 203 org.bedework.app.bwconfig.name=bwconfig 210 org.bedework.app.bwconfig.guestmode=true211 org.bedework.app.bwconfig.publicadmin=false212 204 org.bedework.app.bwconfig.logprefix=BwConfig 213 205 … … 221 213 org.bedework.app.CalAdmin.sou.dir=webadmin 222 214 org.bedework.app.CalAdmin.default.contenttype=text/xml 223 org.bedework.app.CalAdmin.nogroupallowed=false224 215 #org.bedework.app.CalAdmin.portlet.name=CalAdmin 225 216 … … 242 233 org.bedework.app.CalAdmin.display.name=Public Events Administration 243 234 org.bedework.app.CalAdmin.name=DemoCalAdmin 244 245 org.bedework.app.CalAdmin.admingroupsidprefix=agrp_246 org.bedework.app.CalAdmin.guestmode=false247 org.bedework.app.CalAdmin.publicadmin=true248 org.bedework.app.CalAdmin.run.as.user=public-user249 235 250 236 # … … 278 264 org.bedework.app.EventSubmit.name=DemoEventSubmit 279 265 280 org.bedework.app.EventSubmit.guestmode=false281 org.bedework.app.EventSubmit.publicadmin=false282 283 266 # 284 267 # -------------------------------------------------------------------- … … 307 290 org.bedework.app.Events.display.name=Demo calendar 308 291 org.bedework.app.Events.name=DemoCal 309 org.bedework.app.Events.run.as.user=public-user310 311 org.bedework.app.Events.guestmode=true312 org.bedework.app.Events.publicadmin=false313 292 314 293 # … … 338 317 org.bedework.app.SoEDept.display.name=Demo departmental calendar 339 318 org.bedework.app.SoEDept.name=SoEDept 340 org.bedework.app.SoEDept.run.as.user=public-user341 342 org.bedework.app.SoEDept.guestmode=true343 org.bedework.app.SoEDept.publicadmin=false344 319 345 320 # … … 373 348 org.bedework.app.UserCal.name=DemoUserCal 374 349 375 org.bedework.app.UserCal.guestmode=false376 org.bedework.app.UserCal.publicadmin=false377 378 350 # 379 351 # -------------------------------------------------------------------- … … 398 370 org.bedework.app.Pubcaldav.name=DemoPubcaldav 399 371 org.bedework.app.Pubcaldav.deploy.dir=/webapps 400 org.bedework.app.Pubcaldav.guestmode=true401 org.bedework.app.Pubcaldav.publicadmin=false402 org.bedework.app.Pubcaldav.run.as.user=public-user403 372 org.bedework.app.Pubcaldav.logprefix=PubCalDav 404 org.bedework.app.Pubcaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl405 373 406 374 # … … 430 398 org.bedework.app.Usercaldav.name=DemoUsrcaldav 431 399 org.bedework.app.Usercaldav.deploy.dir=/webapps 432 org.bedework.app.Usercaldav.guestmode=false433 org.bedework.app.Usercaldav.publicadmin=false434 400 org.bedework.app.Usercaldav.logprefix=UserCalDav 435 org.bedework.app.Usercaldav.sysintfimpl=org.bedework.caldav.bwserver.BwSysIntfImpl436 401 437 402 # trunk/deployment/appjars.xml
r1919 r1933 101 101 <!-- Liferay --> 102 102 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> 108 160 109 161 <!-- Other commons apis --> trunk/deployment/freebusyAggregator/uportal2/build.xml
r1105 r1933 14 14 <property name="propval.directory.browsing.disallowed" 15 15 value="${app.directory.browsing.disallowed}" /> 16 17 <property name="propval.app.guestmode" value="true" />18 16 19 17 <dirname property="portlet.build.dir" file="${ant.file}"/> trunk/deployment/freebusyAggregator/webapp/build.xml
r1895 r1933 31 31 <property name="propval.directory.browsing.disallowed" 32 32 value="${app.directory.browsing.disallowed}" /> 33 34 <property name="propval.app.guestmode" value="true" />35 33 36 34 <property name="app.resources.dir" trunk/deployment/webadmin/jetspeed/build.xml
r1205 r1933 16 16 <property name="propval.directory.browsing.disallowed" 17 17 value="${app.directory.browsing.disallowed}" /> 18 19 <property name="propval.app.guestmode" value="false" />20 18 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> trunk/deployment/webadmin/liferay4/build.xml
r1621 r1933 16 16 <property name="propval.directory.browsing.disallowed" 17 17 value="${app.directory.browsing.disallowed}" /> 18 19 <property name="propval.app.guestmode" value="false" />20 18 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> trunk/deployment/webadmin/uportal2/build.xml
r1621 r1933 16 16 <property name="propval.directory.browsing.disallowed" 17 17 value="${app.directory.browsing.disallowed}" /> 18 19 <property name="propval.app.guestmode" value="false" />20 18 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> trunk/deployment/webconfig/webapp/build.xml
r1895 r1933 33 33 <property name="propval.directory.browsing.disallowed" 34 34 value="${app.directory.browsing.disallowed}" /> 35 36 <property name="propval.app.guestmode" value="true" />37 35 38 36 <property name="app.resources.dir" trunk/deployment/webpublic/jetspeed/build.xml
r1205 r1933 16 16 <property name="propval.directory.browsing.disallowed" 17 17 value="${app.directory.browsing.disallowed}" /> 18 19 <property name="propval.app.guestmode" value="true" />20 18 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> trunk/deployment/webpublic/liferay4/build.xml
r1621 r1933 16 16 <property name="propval.directory.browsing.disallowed" 17 17 value="${app.directory.browsing.disallowed}" /> 18 19 <property name="propval.app.guestmode" value="true" />20 18 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> trunk/deployment/webpublic/uportal2/build.xml
r1621 r1933 16 16 <property name="propval.directory.browsing.disallowed" 17 17 value="${app.directory.browsing.disallowed}" /> 18 19 <property name="propval.app.guestmode" value="true" />20 18 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> trunk/deployment/webpublic/webapp/build.xml
r1895 r1933 34 34 <property name="propval.directory.browsing.disallowed" 35 35 value="${app.directory.browsing.disallowed}" /> 36 37 <property name="propval.app.guestmode" value="true" />38 36 39 37 <property name="app.resources.dir" trunk/deployment/websubmit/jetspeed/build.xml
r1580 r1933 16 16 value="${app.sou.dir}/war/WEB-INF/web.xml" /> 17 17 --> 18 19 <property name="propval.app.guestmode" value="false" />20 18 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> trunk/deployment/websubmit/liferay4/build.xml
r1580 r1933 16 16 value="${app.sou.dir}/war/WEB-INF/web.xml" /> 17 17 --> 18 19 <property name="propval.app.guestmode" value="false" />20 18 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> trunk/deployment/websubmit/uportal2/build.xml
r1580 r1933 16 16 value="${app.sou.dir}/war/WEB-INF/web.xml" /> 17 17 --> 18 19 <property name="propval.app.guestmode" value="false" />20 18 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> trunk/deployment/websubmit/webapp/build.xml
r1895 r1933 30 30 value="${app.sou.dir}/war/WEB-INF/web.xml" /> 31 31 --> 32 33 <property name="propval.app.guestmode" value="false" />34 32 35 33 <property name="app.resources.dir" trunk/deployment/webuser/jetspeed/build.xml
r1205 r1933 16 16 value="${app.sou.dir}/war/WEB-INF/web.xml" /> 17 17 --> 18 19 <property name="propval.app.guestmode" value="false" />20 18 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> trunk/deployment/webuser/liferay4/build.xml
r1213 r1933 17 17 --> 18 18 19 <property name="propval.app.guestmode" value="false" />20 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> 22 20 … … 26 24 27 25 <!-- 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 we26 portal use. So far we've not managed that so for the time being we 29 27 will just use the standalone skin set. 30 28 <property name="portlet.skins.dir" trunk/deployment/webuser/uportal2/build.xml
r1621 r1933 17 17 --> 18 18 19 <property name="propval.app.guestmode" value="false" />20 21 19 <dirname property="portlet.build.dir" file="${ant.file}"/> 22 20 … … 26 24 27 25 <!-- 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 we26 portal use. So far we've not managed that so for the time being we 29 27 will just use the standalone skin set. 30 28 <property name="portlet.skins.dir" trunk/deployment/webuser/webapp/build.xml
r1895 r1933 30 30 value="${app.sou.dir}/war/WEB-INF/web.xml" /> 31 31 --> 32 33 <property name="propval.app.guestmode" value="false" />34 32 35 33 <property name="app.resources.dir"
