Changeset 1036

Show
Ignore:
Timestamp:
10/20/06 13:46:11
Author:
douglm
Message:

Apply fix to restore from 3.0 code

Allow adding/removing event categories in admin and user client. Needs ui changes
Add system property to limit max date of recurring events.
Changed config to set it

Change events code to fix adding of recurring events with Date type dates (as against Date/Time).
Use limits to allow adding of infinite events.

Add code to bulk upload from ics file in admin and user client.

Many Java5 changes - all Collection stuff and nearly done. Down to 80+ eclipse warnings (from 460).

Schema change:
add int columns "bwmax_instances" , "bwmax_years" to Bedework_Settings

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildsh.xml

    r995 r1036  
    9696 
    9797        <!-- Calendar api jars --> 
     98        <include name="bw-apiutil*.jar"/> 
    9899        <include name="bw-calcore*.jar"/> 
    99100        <include name="bw-calcorei*.jar"/> 

  • trunk/build/buildwar.xml

    r1001 r1036  
    319319 
    320320        <!-- Calendar api jars --> 
     321        <include name="bw-apiutil*.jar"/> 
    321322        <include name="bw-calcore*.jar"/> 
    322323        <include name="bw-calcorei*.jar"/> 

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

    r993 r1036  
    4747        <!-- size limits --> 
    4848        <maxPublicDescriptionLength>500</maxPublicDescriptionLength> 
    49         <maxUserDescriptionLength>1000</maxUserDescriptionLength> 
     49        <maxUserDescriptionLength>5000</maxUserDescriptionLength> 
    5050        <maxUserEntitySize>100000</maxUserEntitySize> 
    5151        <defaultUserQuota>10000000</defaultUserQuota> <!-- 10 Meg OK? --> 
    …… 
    5353        <!-- Max number of instances per recurring event --> 
    5454        <maxInstances>1000</maxInstances> 
     55 
     56        <!-- Max number of years per recurring event --> 
     57        <maxYears>10</maxYears> 
    5558 
    5659        <userauthClass>org.bedework.calcore.hibernate.UserAuthUWDbImpl</userauthClass> 

  • trunk/config/configs/democal.properties

    r997 r1036  
    2727# 
    2828org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect 
     29 
     30# This property is how the running system finds the system settings. 
     31# In theory we could have multiple settings with different names 
     32# The value here must match that in the options xml file. 
    2933org.bedework.global.system.name=bedework 
     34 
    3035org.bedework.global.directory.browsing.disallowed=false 
    3136org.bedework.global.build.standalone.app=true