Changeset 1602

Show
Ignore:
Timestamp:
11/01/07 10:38:33
Author:
douglm
Message:

Restructure some of the code used during login - try to separate out that used for admin client only.

Add another config option to allow web code to distinguish the type of application running.

Use that to select public event properties when it's the event submission client

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1589 r1602  
    135135          <categoryOptional>true</categoryOptional> 
    136136 
     137          <appType>webadmin</appType> 
     138 
    137139          <!-- Default value for 24 hour mode --> 
    138140          <hour24>true</hour24> 
    …… 
    143145          <logPrefix>PubEventsAdmin</logPrefix> 
    144146 
    145           <appRoot>/caladminrsrc</appRoot> 
     147          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    146148          <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    147149        </CalAdmin> 
    …… 
    156158          <autoDeleteLocations>false</autoDeleteLocations> 
    157159 
     160          <appType>websubmit</appType> 
     161 
    158162          <!-- Default value for 24 hour mode --> 
    159163          <hour24>false</hour24> 
    …… 
    166170          <logPrefix>EventSubmit</logPrefix> 
    167171 
    168           <appRoot>/eventsubmitrsrc</appRoot> 
     172          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    169173          <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    170174 
    …… 
    172176          <refreshInterval>900</refreshInterval> 
    173177        </EventSubmit> 
    174          
     178 
    175179        <!-- ================================================================== 
    176180                          Public web client Events 
    …… 
    185189          <autoDeleteLocations>false</autoDeleteLocations> 
    186190 
     191          <appType>webpublic</appType> 
     192 
    187193          <!-- Default value for 24 hour mode --> 
    188194          <hour24>true</hour24> 
    …… 
    195201          <logPrefix>PubEvents</logPrefix> 
    196202 
    197           <appRoot>/calrsrc</appRoot> 
     203          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    198204          <portalPlatform>@PORTAL-PLATFORM@</portalPlatform> 
    199205 
    …… 
    216222          <autoDeleteLocations>false</autoDeleteLocations> 
    217223 
     224          <appType>webpublic</appType> 
     225 
    218226          <!-- Default value for 24 hour mode --> 
    219227          <hour24>true</hour24> 
    …… 
    243251          <autoCreateLocations>false</autoCreateLocations> 
    244252          <autoDeleteLocations>false</autoDeleteLocations> 
     253 
     254          <appType>webuser</appType> 
    245255 
    246256          <!-- Default value for 24 hour mode --> 

  • trunk/config/configs/democal.properties

    r1586 r1602  
    215215org.bedework.app.CalAdmin.ear.name=caladmin 
    216216org.bedework.app.CalAdmin.context.root=/caladmin 
    217 org.bedework.app.CalAdmin.root=/caladminrsrc 
     217org.bedework.app.CalAdmin.root=http://localhost:8080/caladminrsrc 
    218218org.bedework.app.CalAdmin.resources.dir=/webapps/ROOT/caladminrsrc 
    219219org.bedework.app.CalAdmin.deploy.dir=/webapps 
    …… 
    279279org.bedework.app.Events.ear.name=cal 
    280280org.bedework.app.Events.context.root=/cal 
    281 org.bedework.app.Events.root=/calrsrc 
     281org.bedework.app.Events.root=http://localhost:8080/calrsrc 
    282282org.bedework.app.Events.resources.dir=/webapps/ROOT/calrsrc 
    283283org.bedework.app.Events.deploy.dir=/webapps