Changeset 3339

Show
Ignore:
Timestamp:
09/09/11 11:06:08
Author:
douglm
Message:

Aligned all the options files before the next change

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/config/bwbuild/.defaults/cal.properties

    r3333 r3339  
    204204org.bedework.calws-soap.service=http://localhost:8080/ucaldav${org.bedework.calws-soap.uri} 
    205205 
     206# The exchange web service - needed for exchange synch service 
     207org.bedework.exchange.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/exchange 
     208 
     209# synch - wsdl where we deploy for the build. 
     210org.bedework.synch.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/synch 
     211 
    206212# 
    207213# ------------------------------------------------------------------------ 
  • trunk/config/bwbuild/.defaults/synch-config.xml

    r3336 r3339  
    6161  <bean id="exdemoExchangeConfig"  
    6262        class="org.bedework.synch.cnctrs.exchange.ExchangeConnectorConfig"> 
     63    <property name="readOnly" value="false" /> 
     64 
     65    <property name="trustLastmod" value="true" /> 
    6366 
    6467    <!-- location of the WSDL - modified to include server element  
     
    8285  <bean id="bwdemoBedeworkConfig"  
    8386        class="org.bedework.synch.cnctrs.bedework.BedeworkConnectorConfig"> 
     87    <property name="readOnly" value="false" /> 
     88 
     89    <property name="trustLastmod" value="true" /> 
    8490 
    8591    <!-- location of the WSDL for the remote web service  
     
    105111    <property name="readOnly" value="true" /> 
    106112 
     113    <property name="trustLastmod" value="false" /> 
     114 
    107115    <!-- seconds  -->  
    108116    <property name="minPoll" value="15" /> 
  • trunk/config/bwbuild/default/cal.options.xml

    r3328 r3339  
    483483      <app> 
    484484        <!-- =============================================================== 
    485                           Config web client 
    486              =============================================================== --> 
    487         <bwconfig classname="org.bedework.calfacade.configs.ConfigCommon"> 
    488           <appType>webconfig</appType> 
    489           <publicAdmin>false</publicAdmin> 
    490           <guestMode>false</guestMode> 
    491         </bwconfig> 
    492  
    493         <!-- =============================================================== 
    494485                          Admin web client CalAdmin 
    495486             =============================================================== --> 
     
    779770          <!-- Comment out or delete for no web calendar service --> 
    780771          <webcalServiceURI>/webcal</webcalServiceURI> 
    781  
    782           <!-- The bedework end of the synch service. This is a web 
    783                service called by the synch engine to get information out of 
    784                bedework and to update events and status. 
    785                 
    786                This path should probably be restricted to a given host only. 
    787                 
    788                Coming up on a separate port might help to lock it down. 
    789                Comment out or delete for no synch service  
    790                --> 
    791           <synchWsURI>/synchws/</synchWsURI> 
    792772        </Pubcaldav> 
    793773 
     
    897877          <debugEntity>false</debugEntity> 
    898878        </iosched> 
    899  
    900         <!-- ================================================================== 
    901                           Exchange synch 
    902              ================================================================== --> 
    903         <Exsynch classname="org.bedework.exchgsynch.ExsynchConfig"> 
    904           <appType>exsynch</appType> 
    905  
    906           <!-- location of the WSDL - modified to include server element  
    907                This corresponds to the wsdl deploy location defined in the 
    908                build properties file. 
    909           --> 
    910           <exchangeWSDLURI>http://localhost:8080/wsdls/exchange/Services.wsdl</exchangeWSDLURI> 
    911  
    912           <!-- location of the WSDL for the remote web service  
    913                This corresponds to the wsdl deploy location defined in the 
    914                build properties file. 
    915           --> 
    916           <remoteWSDLURI>http://localhost:8080/wsdls/exsynch/wssvc.wsdl</remoteWSDLURI> 
    917  
    918           <!-- Exchange sync callback. Comment out for no service --> 
    919           <exchangeWsPushURI>http://128.113.124.225:8080/exsynch/</exchangeWsPushURI> 
    920  
    921           <!-- Path to keystore - comment out to use default -->           
    922           <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore> 
    923            
    924           <remoteWsURL>http://localhost:8080/pubcaldav/exsynchws/</remoteWsURL> 
    925            
    926           <!-- seconds  -->  
    927           <remoteKeepAliveInterval>60</remoteKeepAliveInterval> 
    928         </Exsynch> 
    929879 
    930880        <!-- =============================================================== 
     
    956906          <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 
    957907        </usercarddav> 
     908 
     909        <!-- =============================================================== 
     910                          User CardDAV server usercarddavweb 
     911             This should be pretty much identical to the above 
     912             =============================================================== --> 
     913        <usercarddavweb classname="org.bedework.carddav.util.CardDAVConfig" > 
     914          <sysintfImpl>org.bedework.carddav.bwserver.BwSysIntfImpl</sysintfImpl> 
     915           
     916          <webaddrServiceURI>/find</webaddrServiceURI> 
     917          <webaddrServicePropertiesList>fn,email,note,org</webaddrServicePropertiesList> 
     918          <webaddrPublicAddrbook>/principals/users</webaddrPublicAddrbook> 
     919 
     920          <directoryBrowsingDisallowed>false</directoryBrowsingDisallowed> 
     921 
     922          <defaultAddressbook>addressbook</defaultAddressbook> 
     923 
     924          <!-- This will act as the root for the file system --> 
     925          <addressBookHandlerPrefix>/user</addressBookHandlerPrefix> 
     926           
     927          <!-- Needed for access calculations --> 
     928          <userHomeRoot>/user</userHomeRoot> 
     929 
     930          <principalRoot>/principals</principalRoot> 
     931          <userPrincipalRoot>/principals/users</userPrincipalRoot> 
     932          <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 
     933          <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 
     934          <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 
     935          <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 
     936          <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 
     937        </usercarddavweb> 
    958938 
    959939        <!-- =============================================================== 
  • trunk/config/bwbuild/default/cal.properties

    r3333 r3339  
    33# 
    44# This file provides overrides to the defaults 
     5# NOTE: It cannot depend on anything in the defaults. They are loaded AFTER this 
    56# 
    67org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect 
  • trunk/config/bwbuild/derby/build.properties

    r3336 r3339  
    11# 
    2 # bedework.org/build.properties 
     2# build.properties 
    33# 
    4 # Configure a build of a demo calendar running on bedework.org. 
     4# Configure the location of various properties 
    55# 
    66 
  • trunk/config/bwbuild/derby/cal.properties

    r3333 r3339  
    55 
    66org.bedework.global.hibernate.dialect=edu.rpi.cmt.jboss.jdbc.DerbyDialect 
     7# NOTE: It cannot depend on anything in the defaults. They are loaded AFTER this 
    78 
  • trunk/config/bwbuild/jboss-h2/cal.properties

    r3333 r3339  
    22# -------------------------------------------------------------------- 
    33# 
    4 # Introduction 
    5 
    6 # All properties defined in this file are used at deploy time only. The options 
    7 # xml file contains all run time properties and will be built in to the resulting 
    8 # war files and runable components. 
    9 
    10 # Properties for all modules are saved below - even if they are not 
    11 # being deployed. The globals section defines which modules will be 
    12 # deployed as well as some other global properties. 
    13 
    14 # -------------------------------------------------------------------- 
    15 
    16 # Install options 
    17 
    18 # Define the names of the applications we want to build: 
    19 # Note this is NOT all of the sections found below. Some components are now 
    20 # included by default as they have become a jboss service, e..g indexing and  
    21 # dump/restore. 
    22 
    23 #Others are built as separate projects. However, all build information for 
    24 # allprojects adn subprojects is in this file, and all configuration (with the 
    25 # proviso below) is in the options file. 
    26 
    27 # Separate from this are the various configuration files, e.g. bedework-ds.xml  
    28 # which get deployed into the app server. 
    29 #  
    30 # These are the names which MAY appear in the list: 
    31 #  
    32 # CalAdmin:    admin client. You probably always want this 
    33 # EventSubmit: public events submission client 
    34 # Events:      Public events Client 
    35 # Feeder:      Feed context. Better than using the main web client. 
    36 # SoEDept:     Example calendar suite 
    37 # UserCal:     personal web client 
    38 # Pubcaldav:   Unauthenticated public caldav - alsoprovides unauth SOAP web services   
    39 # Usercaldav:  Authenticated caldav - Also provides SOAP web services   
    40 # Pubcalws:    Unauthenticated CalWS REST web service 
    41 # Usercalws:   Authenticated CalWS REST web service 
    42 # sysevlog:    System event logger - required 
    43 # monitor:     System monitor - required 
    44 # genkeys:     key generator - required 
    45 org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\ 
    46  SoEDept,UserCal,Pubcaldav,Usercaldav,\ 
    47  Pubcalws,Usercalws,sysevlog,monitor,genkeys 
    48  
    49 
    50 # -------------------------------------------------------------------- 
    51 
    52 # Global options 
    53 
    54 # -------------------------------------------------------------------- 
    55 
    56 # 'environment' options used globally by the system. 
    57 
    58 #org.bedework.global.hibernate.dialect=org.hibernate.dialect.DerbyDialect 
    59 org.bedework.global.hibernate.dialect=org.bedework.calcore.H2Dialect 
    60  
    61 # DB Datasource for jboss services 
    62 # There doesn't appear to be the extra level of indirection that the jboss-web.xml 
    63 # files allow so this will appear directly in the hibernate proeprties file for 
    64 # jboss services. 
    65  
    66 # Note - apparently the java Property classes preserve trailing blanks 
    67 # Hibernate will include that trailing blank as part of the name leading to  
    68 # much grief.  
    69 org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS 
    70 org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS 
    71 org.bedework.global.jboss.tzdb.datasource.jndiname=/TzDS 
    72  
    73 # Hibernate caching parameters 
    74 org.bedework.global.hibernate.cache.use_second_level_cache=false 
    75 org.bedework.global.hibernate.cache.provider_class org.hibernate.cache.EhCacheProvider 
    76  
    77 # Specify the platform we are building for. buildwar.xml will import the file 
    78 # build/platforms/<platform>War.xml 
    79 org.bedework.global.deploy.platform=jboss 
    80 
    81 # ------------------------------------------------------------------------ 
    82 # Properties enabling and controlling ear file build 
    83 # ------------------------------------------------------------------------ 
    84  
    85 # Comment this out to disable ear build. 
    86 org.bedework.global.build.ear=yes 
    87 org.bedework.global.ear.name=bwcal 
    88  
    89 
    90 # The ear can be zipped or left unzipped. Zipped can be useful for copying 
    91 # Jboss will not tolerate zipped ears and unzipped wars. 
    92  
    93 # Comment out or set to "no"/"false" to disable zipped ear file 
    94 org.bedework.global.ear.zipped=no 
    95  
    96 # How would you like your wars sir? zipped or unzipped? 
    97 org.bedework.global.wars.zipped=no 
    98  
    99 
    100 # ------------------------------------------------------------------------ 
    101 # ------------------------------------------------------------------------ 
    102 #    bedework calendar default deployment definitions. 
    103 # ------------------------------------------------------------------------ 
    104 # ------------------------------------------------------------------------ 
     4# This file provides overrides to the defaults 
     5# NOTE: It cannot depend on anything in the defaults. They are loaded AFTER this 
    1056# 
    1067 
    107 
    108 # ------------------------------------------------------------------------ 
    109 # directory defs 
    110 # ------------------------------------------------------------------------ 
    111  
    112 org.bedework.directory.dir=${org.bedework.project.bedework}/../apacheds-1.5.3-fixed 
    113  
    114 # Where we keep the javascript libraries in deployment/resources/javascript 
    115 org.bedework.dojo.dir=dojo-0.4.1-ajax 
    116 org.bedework.jquery.dir=jquery 
    117  
    118 # ------------------------------------------------------------------------ 
    119 # Extra jars 
    120 # ------------------------------------------------------------------------ 
    121 
    122 # A place to put extra jars and files, e.g. jdbc drivers. 
    123 # This can be directed at any local directory 
    124 
    125 # There can be three directories inside this, server, shell and war. 
    126 # Though only server is used (maybe) 
    127 org.bedework.global.ext.lib=${org.bedework.config.home}/lib 
    128  
    129 # A list of jars to copy, delimited by "," 
    130 org.bedework.global.extra.jars=${org.bedework.project.bedework}/../rpiutil/dist/rpiutil-${org.bedework.rpiutil.version}.jar 
    131  
    132 # ------------------------------------------------------------------------ 
    133 # Application server defs 
    134 # ------------------------------------------------------------------------ 
    135  
    136 #  where the application server lives 
    137 org.bedework.appserver.dir=${org.bedework.project.bedework}/../jboss-5.1.0.GA 
    138  
    139 # name of jboss configuration we are using 
    140 org.bedework.jboss.config=default 
    141  
    142 # location of jboss configuration we are using 
    143 org.bedework.jboss.config.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config} 
    144  
    145 # where we deploy 
    146 org.bedework.appserver.deploy.dir=${org.bedework.jboss.config.dir}/bwdeploy 
    147  
    148 #  where most library files used by all applications go 
    149 appserver.lib.dir=${org.bedework.jboss.config.dir}/lib 
    150  
    151 # where things like log4j config files go 
    152 org.bedework.jboss.data.dir=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/data/bedework 
    153 org.bedework.data.dir=${org.bedework.jboss.data.dir} 
    154  
    155 # where 'endorsed' library files go.  These classes override anything 
    156 # the JVM has. This is particularly important for things like Xalan, 
    157 # etc., which can break the application if you choose the wrong version 
    158 appserver.endorsed.dir=${org.bedework.appserver.dir}/lib/endorsed 
    159  
    160 # the toplevel directory for the server static resources, relative to the application server home 
    161 org.bedework.server.resource.root.dir=server/${org.bedework.jboss.config}/deploy/ROOT.war 
    162  
    163 # The log4j config file destination 
    164 org.bedework.log4j.config=${org.bedework.appserver.dir}/server/${org.bedework.jboss.config}/conf/jboss-log4j.xml 
    165 
    166 # If set to true or yes will copy in the bedework db datasource def bedework-ds.xml 
    167 org.bedework.global.copy.bedeworkds.config=yes 
    168 
    169 # If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml 
    170 org.bedework.global.copy.bedeworkcardds.config=yes 
    171 
    172 # If set to true or yes will copy in the bedework tz db datasource def bedework-ds.xml 
    173 org.bedework.global.copy.bedeworktzds.config=yes 
    174  
    175 # If set to true or yes will build the web (CASifiable) version of carddav also  
    176 org.bedework.global.carddav.web.version=yes 
    177  
    178 # ------------------------------------------------------------------------ 
    179 # ActiveMQ defs 
    180 # ------------------------------------------------------------------------ 
    181  
    182 org.bedework.global.activemq.dir=${org.bedework.appserver.deploy.dir}/activemq-rar-5.3.0.rar 
    183 
    184 # If set to true or yes will copy in the activemq configuration into the rar 
    185 org.bedework.global.copy.activemq.config=yes 
    186  
    187 # ------------------------------------------------------------------------ 
    188 # Deployment locations for the wsdls and associated files. 
    189 # For each related service there is a run time URL to allow client services  
    190 # to access these deployed wsdls. 
    191 
    192 # In addition we define the location of the associated service which has to be 
    193 # embedded in the wsdl. 
    194 # ------------------------------------------------------------------------ 
    195  
    196 # All wsdls are under this directory 
    197 org.bedework.wsdl.deploy.dir=${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/wsdls 
    198  
    199 org.bedework.calws.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/calws-soap 
    200  
    201 org.bedework.calws-soap.uri=/calws-soap/ 
    202 org.bedework.calws-soap.service=http://localhost:8080/ucaldav${org.bedework.calws-soap.uri} 
    203  
    204 
    205 # ------------------------------------------------------------------------ 
    206 # ------------------------------------------------------------------------ 
    207 #    end of bedework calendar default deployment definitions. 
    208 # ------------------------------------------------------------------------ 
    209 # ------------------------------------------------------------------------ 
    210 
    211 # ------------------------------------------------------------------------ 
    212 #   Common context for javascript, resources etc. 
    213 # ------------------------------------------------------------------------ 
    214 # Enable building of a common context for common javascript. 
    215 # This context will be deployed along with the applications and makes common 
    216 # javascript available under, two paths at the contex defined here. 
    217 
    218 # This is necessary to deal with problems delivering commmon code from the same 
    219 # server when the root context is defined to be an application rather than the 
    220 # normal web server default. 
    221 
    222 org.bedework.global.build.common.context.name=bedework-common 
    223 org.bedework.global.build.common.context.root=/bedework-common 
    224 org.bedework.global.build.common.context.war.name=bedework-common 
    225 org.bedework.global.build.common.context.deploy.dir=/webapps 
    226  
    227 
    228 # ------------------------------------------------------------------- 
    229 
    230 # Bedework timezones server - a requirement for bedework 
    231 
    232  
    233 org.bedework.app.tzsvr.project=bwtzsvr 
    234 org.bedework.app.tzsvr.sou.dir=tzsvr 
    235 org.bedework.app.tzsvr.war.name=tzsvr 
    236 org.bedework.app.tzsvr.context.root=/tzsvr 
    237 # Set for jboss 
    238 #org.bedework.app.tzsvr.virtual.host=my.host1,my.host.2 
    239  
    240 org.bedework.app.tzsvr.description=Bedework timezones server. 
    241 org.bedework.app.tzsvr.display.name=Bedework timezones server. 
    242 org.bedework.app.tzsvr.name=tzsvr 
    243 org.bedework.app.tzsvr.deploy.dir=${org.bedework.appserver.deploy.dir} 
    244 org.bedework.app.tzsvr.logprefix=Tzsvr 
    245  
    246 # True if this is a primary server  
    247 org.bedework.app.tzsvr.primary.server=false 
    248  
    249 #Location of a primary server 
    250 org.bedework.app.tzsvr.primary.url=http://dev.bedework.org/tzsvr 
    251  
    252 #Location of a data file 
    253 org.bedework.app.tzsvr.tzdata.url=${jboss.server.data.dir}/bedework/tzdata.zip 
    254  
    255 # Property defining integer seconds refetch interval for data 
    256 org.bedework.app.tzsvr.refetch.interval=600 
    257  
    258 org.bedework.app.tzsvr.vtimezones.cache.name=vtz 
    259  
    260 
    261 # -------------------------------------------------------------------- 
    262 
    263 # Admin Web Client 
    264 
    265 org.bedework.app.CalAdmin.project=webapps 
    266 org.bedework.app.CalAdmin.sou.dir=webadmin 
    267 org.bedework.app.CalAdmin.default.contenttype=text/xml 
    268 #org.bedework.app.CalAdmin.portlet.name=CalAdmin 
    269  
    270 org.bedework.app.CalAdmin.tomcat.context.xml=war/META-INF/context.xml 
    271  
    272 org.bedework.app.CalAdmin.war.name=caladmin 
    273 org.bedework.app.CalAdmin.context.root=/caladmin 
    274 # Set for jboss 
    275 #org.bedework.app.CalAdmin.virtual.host= 
    276 org.bedework.app.CalAdmin.resources.dir=${org.bedework.server.resource.root.dir}/caladminrsrc 
    277 org.bedework.app.CalAdmin.deploy.dir=${org.bedework.appserver.deploy.dir} 
    278  
    279 org.bedework.app.CalAdmin.security.domain=bedeworkdemo 
    280 org.bedework.app.CalAdmin.security.prefix=demo 
    281 org.bedework.app.CalAdmin.transport.guarantee=NONE 
    282  
    283 org.bedework.app.CalAdmin.description=Struts based version of the Bedework calendar public events admin client. 
    284 org.bedework.app.CalAdmin.display.name=Public Events Administration 
    285 org.bedework.app.CalAdmin.name=DemoCalAdmin 
    286  
    287 
    288 # -------------------------------------------------------------------- 
    289 
    290 # Events submission Web Client 
    291 
    292 org.bedework.app.EventSubmit.project=webapps 
    293 org.bedework.app.EventSubmit.sou.dir=websubmit 
    294 org.bedework.app.EventSubmit.default.contenttype=text/xml 
    295 org.bedework.app.EventSubmit.web.xml=war/WEB-INF/web.xml 
    296 org.bedework.app.EventSubmit.tomcat.context.xml=war/META-INF/context.xml 
    297 #org.bedework.app.EventSubmit.portlet.name=EventSubmit 
    298  
    299 org.bedework.app.EventSubmit.war.name=eventsubmit 
    300 org.bedework.app.EventSubmit.context.root=/eventsubmit 
    301 # Set for jboss 
    302 #org.bedework.app.EventSubmit.virtual.host= 
    303 org.bedework.app.EventSubmit.resources.dir=${org.bedework.server.resource.root.dir}/eventsubmitrsrc 
    304 org.bedework.app.EventSubmit.deploy.dir=${org.bedework.appserver.deploy.dir} 
    305  
    306 org.bedework.app.EventSubmit.security.domain=bedeworkdemo 
    307 org.bedework.app.EventSubmit.security.prefix=demo 
    308 org.bedework.app.EventSubmit.transport.guarantee=NONE 
    309  
    310 org.bedework.app.EventSubmit.description=Bedework calendar event submission client. 
    311 org.bedework.app.EventSubmit.display.name=Bedework 
    312 org.bedework.app.EventSubmit.name=DemoEventSubmit 
    313  
    314 
    315 # -------------------------------------------------------------------- 
    316 
    317 # Public Web Client 
    318 
    319 org.bedework.app.Events.project=webapps 
    320 org.bedework.app.Events.sou.dir=webclient 
    321 org.bedework.app.Events.default.contenttype=text/xml 
    322 org.bedework.app.Events.web.xml=war/WEB-INF/publicweb.xml 
    323 org.bedework.app.Events.tomcat.context.xml=war/META-INF/publiccontext.xml 
    324 #org.bedework.app.Events.portlet.name=PublicCal 
    325  
    326 org.bedework.app.Events.war.name=cal 
    327 org.bedework.app.Events.context.root=/cal 
    328 # Set for jboss 
    329 #org.bedework.app.Events.virtual.host= 
    330 org.bedework.app.Events.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc 
    331 org.bedework.app.Events.deploy.dir=${org.bedework.appserver.deploy.dir} 
    332 org.bedework.app.Events.cal.suite=MainCampus 
    333  
    334 org.bedework.app.Events.description=Struts based XML version of the Bedework calendar client. It may have many skins, determined by the XSLT. 
    335 org.bedework.app.Events.display.name=Demo calendar 
    336 org.bedework.app.Events.name=DemoCal 
    337  
    338 
    339 # -------------------------------------------------------------------- 
    340 
    341 # Feed Server 
    342 
    343 org.bedework.app.Feeder.project=webapps 
    344 org.bedework.app.Feeder.sou.dir=feeder 
    345 org.bedework.app.Feeder.default.contenttype=text/xml 
    346 # need to model feederweb.xml from publicweb.xml  (check session timeout value.  Change from 30 to 1?) 
    347 org.bedework.app.Feeder.web.xml=war/WEB-INF/web.xml 
    348 org.bedework.app.Feeder.tomcat.context.xml=${env.BEDEWORK_CONFIG}/context.xml 
    349 #org.bedework.app.Feeder.portlet.name=PublicCal 
    350  
    351 org.bedework.app.Feeder.war.name=feeder 
    352 org.bedework.app.Feeder.context.root=/feeder 
    353 # Set for jboss 
    354 #org.bedework.app.Feeder.virtual.host= 
    355 org.bedework.app.Feeder.resources.dir=${org.bedework.server.resource.root.dir}/calfeedrsrc 
    356 org.bedework.app.Feeder.deploy.dir=${org.bedework.appserver.deploy.dir} 
    357 org.bedework.app.Feeder.cal.suite=MainCampus 
    358  
    359 org.bedework.app.Feeder.description=Struts based XML version of the Bedework calendar client. It may have many skins, determined by the XSLT. 
    360 org.bedework.app.Feeder.display.name=Demo calendar 
    361 org.bedework.app.Feeder.name=feeder 
    362  
    363 
    364 # -------------------------------------------------------------------- 
    365 
    366 # Demo departmental public Web Client 
    367 
    368 org.bedework.app.SoEDept.project=webapps 
    369 org.bedework.app.SoEDept.sou.dir=webclient 
    370 org.bedework.app.SoEDept.default.contenttype=text/xml 
    371 org.bedework.app.SoEDept.web.xml=war/WEB-INF/publicweb.xml 
    372 org.bedework.app.SoEDept.tomcat.context.xml=war/META-INF/publiccontext.xml 
    373 #org.bedework.app.SoEDept.portlet.name=SoEDept 
    374  
    375 org.bedework.app.SoEDept.war.name=soedept 
    376 org.bedework.app.SoEDept.context.root=/soedept 
    377 # Set for jboss 
    378 #org.bedework.app.SoEDept.virtual.host= 
    379 org.bedework.app.SoEDept.resources.dir=${org.bedework.server.resource.root.dir}/calrsrc 
    380 org.bedework.app.SoEDept.deploy.dir=${org.bedework.appserver.deploy.dir} 
    381 org.bedework.app.SoEDept.cal.suite=SoEDepartmental 
    382  
    383 org.bedework.app.SoEDept.description=Struts based XML version of the Bedework calendar client. It may have many skins, determined by the XSLT. 
    384 org.bedework.app.SoEDept.display.name=Demo departmental calendar 
    385 org.bedework.app.SoEDept.name=SoEDept 
    386  
    387 
    388 # -------------------------------------------------------------------- 
    389 
    390 # Personal Web Client 
    391 
    392 org.bedework.app.UserCal.project=webapps 
    393 org.bedework.app.UserCal.sou.dir=webclient 
    394 org.bedework.app.UserCal.default.contenttype=text/xml 
    395 org.bedework.app.UserCal.web.xml=war/WEB-INF/userweb.xml 
    396 org.bedework.app.UserCal.tomcat.context.xml=war/META-INF/usercontext.xml 
    397 #org.bedework.app.UserCal.portlet.name=UserCal 
    398  
    399 org.bedework.app.UserCal.war.name=ucal 
    400 org.bedework.app.UserCal.context.root=/ucal 
    401 # Set for jboss 
    402 #org.bedework.app.UserCal.virtual.host= 
    403 org.bedework.app.UserCal.resources.dir=${org.bedework.server.resource.root.dir}/ucalrsrc 
    404 org.bedework.app.UserCal.deploy.dir=${org.bedework.appserver.deploy.dir} 
    405  
    406 org.bedework.app.UserCal.security.domain=bedeworkdemo 
    407 org.bedework.app.UserCal.security.prefix=demo 
    408 org.bedework.app.UserCal.transport.guarantee=NONE 
    409  
    410 org.bedework.app.UserCal.description=XML/XSLT version of the Bedework calendar client. 
    411 org.bedework.app.UserCal.display.name=Bedework 
    412 org.bedework.app.UserCal.name=DemoUserCal 
    413  
    414 
    415 # -------------------------------------------------------------------- 
    416 
    417 # Public Caldav Server 
    418 
    419 org.bedework.app.Pubcaldav.project=caldavimpl 
    420 org.bedework.app.Pubcaldav.sou.dir=server 
    421 org.bedework.app.Pubcaldav.interface.jar=bw-caldav 
    422  
    423 org.bedework.app.Pubcaldav.web.xml=war/WEB-INF/publicweb.xml 
    424 org.bedework.app.Pubcaldav.tomcat.context.xml=war/META-INF/publiccontext.xml 
    425 org.bedework.app.Pubcaldav.war.name=pubcaldav 
    426 org.bedework.app.Pubcaldav.context.root=/pubcaldav 
    427 # Set for jboss 
    428 #org.bedework.app.Pubcaldav.virtual.host= 
    429  
    430 org.bedework.app.Pubcaldav.description=Bedework public caldav server. 
    431 org.bedework.app.Pubcaldav.display.name=Bedework public caldav 
    432 org.bedework.app.Pubcaldav.name=DemoPubcaldav 
    433 org.bedework.app.Pubcaldav.deploy.dir=${org.bedework.appserver.deploy.dir} 
    434 org.bedework.app.Pubcaldav.logprefix=PubCalDav 
    435  
    436 
    437 # -------------------------------------------------------------------- 
    438 
    439 # Personal Caldav Server 
    440 
    441 org.bedework.app.Usercaldav.project=caldavimpl 
    442 org.bedework.app.Usercaldav.sou.dir=server 
    443 org.bedework.app.Usercaldav.interface.jar=bw-caldav 
    444  
    445 org.bedework.app.Usercaldav.web.xml=war/WEB-INF/userweb.xml 
    446 org.bedework.app.Usercaldav.tomcat.context.xml=war/META-INF/usercontext.xml 
    447 org.bedework.app.Usercaldav.war.name=ucaldav 
    448 org.bedework.app.Usercaldav.context.root=/ucaldav 
    449 # Set for jboss 
    450 #org.bedework.app.Usercaldav.virtual.host= 
    451  
    452 org.bedework.app.Usercaldav.security.domain=bedeworkdemo 
    453 org.bedework.app.Usercaldav.security.prefix=demo 
    454 org.bedework.app.Usercaldav.transport.guarantee=NONE 
    455  
    456 org.bedework.app.Usercaldav.description=Bedework user caldav server. 
    457 org.bedework.app.Usercaldav.display.name=Bedework usercaldav 
    458 org.bedework.app.Usercaldav.name=DemoUsrcaldav 
    459 org.bedework.app.Usercaldav.deploy.dir=${org.bedework.appserver.deploy.dir} 
    460 org.bedework.app.Usercaldav.logprefix=UserCalDav 
    461  
    462 
    463 # -------------------------------------------------------------------- 
    464 
    465 # Public Calws Server 
    466 
    467 org.bedework.app.Pubcalws.project=caldavimpl 
    468 org.bedework.app.Pubcalws.sou.dir=server 
    469 org.bedework.app.Pubcalws.interface.jar=bw-caldav 
    470  
    471 org.bedework.app.Pubcalws.web.xml=war/WEB-INF/publicws-web.xml 
    472 org.bedework.app.Pubcalws.tomcat.context.xml=war/META-INF/publiccontext.xml 
    473 org.bedework.app.Pubcalws.war.name=pubcalws 
    474 org.bedework.app.Pubcalws.context.root=/pubcalws 
    475 # Set for jboss 
    476 #org.bedework.app.Pubcalws.virtual.host= 
    477  
    478 org.bedework.app.Pubcalws.description=Bedework public calws server. 
    479 org.bedework.app.Pubcalws.display.name=Bedework public calws 
    480 org.bedework.app.Pubcalws.name=DemoPubcalws 
    481 org.bedework.app.Pubcalws.deploy.dir=${org.bedework.appserver.deploy.dir} 
    482 org.bedework.app.Pubcalws.logprefix=Pubcalws 
    483  
    484 
    485 # -------------------------------------------------------------------- 
    486 
    487 # Personal Calws Server 
    488 
    489 org.bedework.app.Usercalws.project=caldavimpl 
    490 org.bedework.app.Usercalws.sou.dir=server 
    491 org.bedework.app.Usercalws.interface.jar=bw-caldav 
    492  
    493 org.bedework.app.Usercalws.web.xml=war/WEB-INF/userws-web.xml 
    494 org.bedework.app.Usercalws.tomcat.context.xml=war/META-INF/usercontext.xml 
    495 org.bedework.app.Usercalws.war.name=ucalws 
    496 org.bedework.app.Usercalws.context.root=/ucalws 
    497 # Set for jboss 
    498 #org.bedework.app.Usercalws.virtual.host= 
    499  
    500 org.bedework.app.Usercalws.security.domain=bedeworkdemo 
    501 org.bedework.app.Usercalws.security.prefix=demo 
    502 org.bedework.app.Usercalws.transport.guarantee=NONE 
    503  
    504 org.bedework.app.Usercalws.description=Bedework user calws server. 
    505 org.bedework.app.Usercalws.display.name=Bedework Usercalws 
    506 org.bedework.app.Usercalws.name=DemoUsrcalws 
    507 org.bedework.app.Usercalws.deploy.dir=${org.bedework.appserver.deploy.dir} 
    508 org.bedework.app.Usercalws.logprefix=Usercalws 
    509  
    510 
    511 # -------------------------------------------------------------------- 
    512 
    513 # CalDAV test 
    514 
    515  
    516 org.bedework.app.caldavTest.runnable=yes 
    517 org.bedework.app.caldavTest.project=caldavTest 
    518 org.bedework.app.caldavTest.sou.dir=caldavTest 
    519 org.bedework.app.caldavTest.shellscr.name=bwruntest 
    520 org.bedework.app.caldavTest.batscr.name=bwruntest.bat 
    521 org.bedework.app.caldavTest.zip.name=caldavTest 
    522 org.bedework.app.caldavTest.description=Bedework CalDAV test utility 
    523  
    524 
    525 # -------------------------------------------------------------------- 
    526 
    527 # Testsuite 
    528 
    529  
    530 org.bedework.app.test.runnable=yes 
    531 org.bedework.app.test.project=testsuite 
    532 org.bedework.app.test.sou.dir= 
    533 org.bedework.app.test.shellscr.name=bwruntest 
    534 org.bedework.app.test.batscr.name=bwruntest.bat 
    535 org.bedework.app.test.zip.name=testsuite 
    536 org.bedework.app.test.description=Bedework test suite 
    537 org.bedework.app.test.schema.delimiter=; 
    538  
    539 
    540 # -------------------------------------------------------------------- 
    541 
    542 # bwtools 
    543 
    544  
    545 org.bedework.app.bwtools.runnable=yes 
    546 org.bedework.app.bwtools.project=bwtools 
    547 org.bedework.app.bwtools.sou.dir= 
    548 org.bedework.app.bwtools.shellscr.name=bwrun 
    549 org.bedework.app.bwtools.batscr.name=bwrun.bat 
    550 org.bedework.app.bwtools.zip.name=bwtools 
    551 org.bedework.app.bwtools.description=Bedework tools suite 
    552 org.bedework.app.bwtools.schema.delimiter=; 
    553  
    554 
    555 # -------------------------------------------------------------------- 
    556 
    557 # Dumprestore 
    558 
    559  
    560 # -------------- normal dump/restore build properties ------------------ 
    561  
    562 org.bedework.app.dumpres.project=dumprestore 
    563 org.bedework.app.dumpres.sou.dir= 
    564 org.bedework.app.dumpres.shellscr.name=bwrun 
    565 org.bedework.app.dumpres.batscr.name=bwrun.bat 
    566 org.bedework.app.dumpres.zip.name=dumpres 
    567 org.bedework.app.dumpres.description=Bedework dump/restore utility 
    568 org.bedework.app.dumpres.schema.delimiter=; 
    569  
    570 
    571 # -------------------------------------------------------------------- 
    572 
    573 # Indexer 
    574 
    575  
    576 org.bedework.app.indexer.project=indexer 
    577 org.bedework.app.indexer.sou.dir= 
    578 org.bedework.app.indexer.shellscr.name=bwrun 
    579 org.bedework.app.indexer.batscr.name=bwrun.bat 
    580 org.bedework.app.indexer.zip.name=indexer 
    581 org.bedework.app.indexer.description=Bedework indexer application 
    582  
    583 
    584 # -------------------------------------------------------------------- 
    585 
    586 # Server events logger 
    587 
    588  
    589 org.bedework.app.sysevlog.project=calendarapi 
    590 org.bedework.app.sysevlog.sou.dir= 
    591 org.bedework.app.sysevlog.shellscr.name=bwrun 
    592 org.bedework.app.sysevlog.batscr.name=bwrun.bat 
    593 org.bedework.app.sysevlog.zip.name=bwsysevlog 
    594 org.bedework.app.sysevlog.description=Bedework system events logger application 
    595  
    596 
    597 # -------------------------------------------------------------------- 
    598 
    599 # Server monitor 
    600 
    601  
    602 org.bedework.app.monitor.project=calendarapi 
    603 org.bedework.app.monitor.sou.dir= 
    604 org.bedework.app.monitor.shellscr.name=bwrun 
    605 org.bedework.app.monitor.batscr.name=bwrun.bat 
    606 org.bedework.app.monitor.zip.name=monitor 
    607 org.bedework.app.monitor.description=Bedework system events monitor application 
    608  
    609 
    610 # -------------------------------------------------------------------- 
    611 
    612 # Key generator 
    613 
    614  
    615 org.bedework.app.genkeys.project=calendarapi 
    616 org.bedework.app.genkeys.sou.dir= 
    617 org.bedework.app.genkeys.shellscr.name=bwrun 
    618 org.bedework.app.genkeys.batscr.name=bwrun.bat 
    619 org.bedework.app.genkeys.zip.name=genkeys 
    620 org.bedework.app.genkeys.description=Bedework system Key generator 
    621  
    622 
    623 # -------------------------------------------------------------------- 
    624 
    625 # In/outbox scheduler 
    626 
    627  
    628 org.bedework.app.iosched.project=calendarapi 
    629 org.bedework.app.iosched.sou.dir= 
    630 org.bedework.app.iosched.in.ear=true 
    631 org.bedework.app.iosched.shellscr.name=bwrun 
    632 org.bedework.app.iosched.batscr.name=bwrun.bat 
    633 org.bedework.app.iosched.zip.name=bwiosched 
    634 org.bedework.app.iosched.description=Bedework In/outbox scheduler application 
    635  
    636 
    637 # -------------------------------------------------------------------- 
    638 
    639 # Public Carddav Server 
    640 
    641 org.bedework.app.pubcarddav.project=carddav 
    642 org.bedework.app.pubcarddav.sou.dir=server 
    643  
    644 org.bedework.app.pubcarddav.web.xml=war/WEB-INF/publicweb.xml 
    645 org.bedework.app.pubcarddav.war.name=pubcarddav 
    646 org.bedework.app.pubcarddav.context.root=/pubcarddav 
    647 # Set for jboss 
    648 #org.bedework.app.pubcarddav.virtual.host=calendars.rpi.edu 
    649  
    650 org.bedework.app.pubcarddav.description=Bedework public carddav server. 
    651 org.bedework.app.pubcarddav.display.name=Bedework public carddav 
    652 org.bedework.app.pubcarddav.name=Demopubcarddav 
    653 org.bedework.app.pubcarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 
    654 org.bedework.app.pubcarddav.logprefix=pubcarddav 
    655  
    656 
    657 # -------------------------------------------------------------------- 
    658 
    659 # Personal Carddav Server 
    660 
    661 org.bedework.app.usercarddav.project=carddav 
    662 org.bedework.app.usercarddav.sou.dir=server 
    663  
    664 org.bedework.app.usercarddav.web.xml=war/WEB-INF/userweb.xml 
    665 org.bedework.app.usercarddav.war.name=ucarddav 
    666 org.bedework.app.usercarddav.context.root=/ucarddav 
    667 # Set for jboss 
    668 #org.bedework.app.usercarddav.virtual.host=events.rpi.edu 
    669  
    670 org.bedework.app.usercarddav.security.domain=bedeworkdemo 
    671 org.bedework.app.usercarddav.security.prefix=demo 
    672 org.bedework.app.usercarddav.transport.guarantee=NONE 
    673  
    674 org.bedework.app.usercarddav.description=Bedework user carddav server. 
    675 org.bedework.app.usercarddav.display.name=Bedework usercarddav 
    676 org.bedework.app.usercarddav.name=DemoUsrcarddav 
    677 org.bedework.app.usercarddav.deploy.dir=${org.bedework.appserver.deploy.dir} 
    678 org.bedework.app.usercarddav.logprefix=usercarddav 
    679  
    680 
    681 # -------------------------------------------------------------------- 
    682 
    683 # Personal Carddav Server as a Web application (for CAS) 
    684 
    685 org.bedework.app.usercarddavweb.project=carddav 
    686 org.bedework.app.usercarddavweb.sou.dir=server 
    687  
    688 org.bedework.app.usercarddavweb.web.xml=war/WEB-INF/webuserweb.xml 
    689 org.bedework.app.usercarddavweb.war.name=ucarddavweb 
    690 org.bedework.app.usercarddavweb.context.root=/ucarddavweb 
    691 # Set for jboss 
    692 #org.bedework.app.usercarddavweb.virtual.host=events.rpi.edu 
    693  
    694 org.bedework.app.usercarddavweb.security.domain=bedeworkdemo 
    695 org.bedework.app.usercarddavweb.security.prefix=demo 
    696 org.bedework.app.usercarddavweb.transport.guarantee=NONE 
    697  
    698 org.bedework.app.usercarddavweb.description=Bedework user carddav server (web). 
    699 org.bedework.app.usercarddavweb.display.name=Bedework usercarddav (web) 
    700 org.bedework.app.usercarddavweb.name=DemoUsrcarddav 
    701 org.bedework.app.usercarddavweb.deploy.dir=${org.bedework.appserver.deploy.dir} 
    702 org.bedework.app.usercarddavweb.logprefix=usercarddavw 
    703  
    704 
    705 # -------------------------------------------------------------------- 
    706 
    707 # CardDAV importer 
    708 
    709  
    710 org.bedework.app.carddavimp.runnable=yes 
    711 org.bedework.app.carddavimp.project=carddav 
    712 org.bedework.app.carddavimp.sou.dir=tools 
    713 org.bedework.app.carddavimp.shellscr.name=bwrun 
    714 org.bedework.app.carddavimp.batscr.name=bwrun.bat 
    715 org.bedework.app.carddavimp.zip.name=carddavimp 
    716 org.bedework.app.carddavimp.description=Bedework CardDAV importer 
    717  
    718 
    719 # -------------------------------------------------------------------- 
    720 
    721 # Synchronization Service - callback web server. 
    722 
    723 org.bedework.app.synchwcb.project=synch 
    724 org.bedework.app.synchwcb.sou.dir=server 
    725  
    726 org.bedework.app.synchwcb.web.xml=war/WEB-INF/web.xml 
    727 org.bedework.app.synchwcb.war.name=synch 
    728 org.bedework.app.synchwcb.context.root=${org.bedework.synch.service.context} 
    729 # Set for jboss 
    730 #org.bedework.app.usercarddav.virtual.host=events.rpi.edu 
    731  
    732 org.bedework.app.synchwcb.description=Bedework synch callback server. 
    733 org.bedework.app.synchwcb.display.name=Bedework synch callback server 
    734 org.bedework.app.synchwcb.name=Demosynchw 
    735 #org.bedework.app.synchwcb.deploy.dir=${org.bedework.appserver.deploy.dir} 
    736 org.bedework.app.synchwcb.wsdl,deploy.dir=/wsdl/synch 
    737 org.bedework.app.synchwcb.logprefix=synch 
    738  
    739  
     8org.bedework.global.hibernate.dialect=org.bedework.calcore.H2Dialect 
  • trunk/config/bwbuild/jboss-mysql/cal.properties

    r3333 r3339  
    33# 
    44# This file provides overrides to the defaults 
     5# NOTE: It cannot depend on anything in the defaults. They are loaded AFTER this 
    56 
    67org.bedework.global.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect 
  • trunk/config/bwbuild/jboss-postgresql/cal.properties

    r3333 r3339  
    33# 
    44# This file provides overrides to the defaults 
     5# NOTE: It cannot depend on anything in the defaults. They are loaded AFTER this 
    56 
    67org.bedework.global.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect 
    7  
    8 org.bedework.global.jboss.synch.datasource.jndiname=/SynchDS 
    9  
    10 # 
    11 # If set to true or yes will copy in the bedework synch db datasource def  
    12 org.bedework.global.copy.bedeworksynchds.config=yes 
    13  
    14 # The exchange web service - needed for exchange synch service 
    15 org.bedework.exchange.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/exchange 
    16  
    17 # synch - wsdl where we deploy for the build. 
    18 org.bedework.synch.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/synch 
    19 #              where runnign services download it. 
    20 org.bedework.synch.wsdl.uri=http://localhost:8080/wsdls/synch/wssvc.wsdl 
    21  
    22 # synch - service 
    23 org.bedework.synch.service.context=/synch 
    24 org.bedework.synch.service=http://localhost:8080${org.bedework.synch.service.context} 
    25 # synch - service - manager - this correcsponds to the manager connector  
    26 #         configured into the synch service byt its own config. 
    27 org.bedework.synch.service.manager=${org.bedework.synch.service}/manager 
    28  
    29 # Bedework end of the synch service - a separate context on pubcaldav 
    30 org.bedework.bwsynch.wsuri=/synchws/ 
    31 org.bedework.bwsynch.service=http://localhost:8080/pubcaldav${org.bedework.bwsynch.wsuri} 
    32  
    33 # Where our exchange server is located - this is probably not needed now 
    34 org.bedework.exchange.ws.url=https://tootles-fe1.neverland.rpi.edu/EWS/Exchange.asmx 
  • trunk/config/bwbuild/oracle10g/build.properties

    r3334 r3339  
    2626 
    2727org.bedework.config.sysevents.properties=${org.bedework.configuration.defaults}/sysevents.properties 
     28 
     29# Where we deploy the logging config from  
     30org.bedework.config.logging=${org.bedework.configuration.defaults}/log4j.xml 
  • trunk/config/bwbuild/oracle10g/cal.options.xml

    r3338 r3339  
    517517           
    518518          <!-- Where the browser finds css and other resources -->     
    519           <browserResourceRoot>http://localhost:8080/caladminrsrc</browserResourceRoot> 
     519          <browserResourceRoot>/caladminrsrc</browserResourceRoot> 
    520520           
    521521          <!-- Where the server finds xsl etc -->     
     
    550550 
    551551          <!-- Where the browser finds css and other resources -->     
    552           <browserResourceRoot>http://localhost:8080/eventsubmitrsrc</browserResourceRoot> 
     552          <browserResourceRoot>/eventsubmitrsrc</browserResourceRoot> 
    553553           
    554554          <!-- Where the server finds xsl etc -->     
     
    586586 
    587587          <!-- Where the browser finds css and other resources -->     
    588           <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     588          <browserResourceRoot>/calrsrc</browserResourceRoot> 
    589589           
    590590          <!-- Where the server finds xsl etc -->     
     
    624624 
    625625          <!-- Where the browser finds css and other resources -->     
    626           <browserResourceRoot>http://localhost:8080/calfeedrsrc</browserResourceRoot> 
     626          <browserResourceRoot>/calfeedrsrc</browserResourceRoot> 
    627627           
    628628          <!-- Where the server finds xsl etc -->     
     
    662662 
    663663          <!-- Where the browser finds css and other resources -->     
    664           <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     664          <browserResourceRoot>/calrsrc</browserResourceRoot> 
    665665           
    666666          <!-- Where the server finds xsl etc -->     
     
    697697 
    698698          <!-- Where the browser finds css and other resources -->     
    699           <browserResourceRoot>http://localhost:8080/ucalrsrc</browserResourceRoot> 
     699          <browserResourceRoot>/ucalrsrc</browserResourceRoot> 
    700700           
    701701          <!-- Where the server finds xsl etc -->     
  • trunk/config/bwbuild/oracle10g/cal.properties

    r3333 r3339  
    33# 
    44# This file provides overrides to the defaults 
     5# NOTE: It cannot depend on anything in the defaults. They are loaded AFTER this 
    56 
    67org.bedework.global.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect