Changeset 2231

Show
Ignore:
Timestamp:
06/25/09 13:52:38
Author:
douglm
Message:

Fix up build so that tz server gets correctly incorporated into the ear. Involved:

  1. Moving the temp expanded war file
  2. changing the name of the ehcache config so it doesn't intefere with th ebedework one.
  3. Fixed Carddav options and bedework options
  4. temp lib was getting built into the ear doubling its size. Removed that
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2058 r2231  
    1 <!-- This provides run time options for each of the configured applications. 
     1<!-- This provides run time options for the CardDAV server. 
    22  --> 
    33<bedework-options> 
    …… 
    66      <global> 
    77        <version>3.5</version> 
     8         
    89        <dirhandlers> 
    910          <!-- handle the principal hierarchy. 
    …… 
    168169 
    169170          <defaultAddressbook>address-book</defaultAddressbook> 
     171 
     172          <addressBookHandlerPrefix>/user</addressBookHandlerPrefix> 
     173 
     174          <principalRoot>/principals</principalRoot> 
     175          <userPrincipalRoot>/principals/users</userPrincipalRoot> 
     176          <groupPrincipalRoot>/principals/groups</groupPrincipalRoot> 
     177          <resourcePrincipalRoot>/principals/resources</resourcePrincipalRoot> 
     178          <venuePrincipalRoot>/principals/locations</venuePrincipalRoot> 
     179          <ticketPrincipalRoot>/principals/tickets</ticketPrincipalRoot> 
     180          <hostPrincipalRoot>/principals/hosts</hostPrincipalRoot> 
    170181        </usercarddav> 
    171182 
    …… 
    178189 
    179190          <defaultAddressbook>address-book</defaultAddressbook> 
     191 
     192          <addressBookHandlerPrefix>/public</addressBookHandlerPrefix> 
    180193 
    181194          <principalRoot>/principals</principalRoot> 

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

    r2144 r2231  
    174174          <autoCreateLocations>false</autoCreateLocations> 
    175175          <autoDeleteLocations>false</autoDeleteLocations> 
    176           <allowEditAllCategories>false</allowEditAllCategories> 
    177           <allowEditAllLocations>false</allowEditAllLocations> 
    178           <allowEditAllContacts>false</allowEditAllContacts> 
     176 
     177          <!-- if these are false only superuser can maintain public 
     178               categories, locations and contacts --> 
     179          <allowEditAllCategories>true</allowEditAllCategories> 
     180          <allowEditAllLocations>true</allowEditAllLocations> 
     181          <allowEditAllContacts>true</allowEditAllContacts> 
     182 
    179183          <categoryOptional>true</categoryOptional> 
    180184 

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

    r2064 r2231  
    144144org.bedework.global.build.common.context.war.name=bedework-common 
    145145org.bedework.global.build.common.context.deploy.dir=/webapps 
     146 
    146147# 
    147148# ------------------------------------------------------------------- 

  • trunk/deployment/build.xml

    r1998 r2231  
    8888        </if> 
    8989 
     90        <!-- 
    9091        <property name="org.bedework.ear.templib" 
    9192                  location="${org.bedework.ear.dir}/lib" /> 
     93                  --> 
     94        <property name="org.bedework.ear.templib" 
     95                  location="${org.bedework.temp.dir}/earlib" /> 
    9296        <property name="org.bedework.ear.properties.dir" 
    9397                  location="${org.bedework.temp.dir}/ear-properties" />