inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.0-BUG-FIX to HEAD

Browse Source 
33757: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX
      33755: Latest Spring Surf libs:
             - Updates to convert FreeMarker directives for processing directives Spring Beans to allow their behaviour to be customized.
             - Changed Extensibility model objects to use a non-blocking GUID generator to avoid thread contention (small amount noticed with 1000 concurrent user test)
             - Removed old machine gun code to generate Object GUIDs, which weren't even valid GUIDs ironically.
             - Replaced with new non-blocking fast GUID generator in webscripts package.
             - Added Reentrant ReadWriteLock around resources in singleton Spring beans that are manipulated by multiple threads.
             - Added Reentrant ReadWriteLock around Advanced Component internal resources.
             - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler
             - Removed lock around ModelWriter (which is only used by a single request thread at a time)
             - Replaced StringBuffer with StringBuilder for Writer usage in extensibility framework to remove locking.
             - Performance improvements around retrieval of RemoteClient instance
             - avoid expensive Spring prototype bean retrieval, use a threadlocal clone of a base RemoteClient bean instead.
             - Concurrency fixes around CRUD operations on shared ModelObjects instances.
             - Surf ModelObjects are shared between all users in the model object caches - but the original machine gun code has no locking what-so-ever around CRUD operations - which meant that it was possible for incorrect property values to be received from a ModelObject in a heavily multi-threaded scenario on initialisation of a Surf application.
             - was causing nonsense warnings such as:
               WARN  [extensions.webscripts.WebTemplateProcessor] [http-8081-exec-10] Unable to find a valid template path for uri: freemarker
             - Modified default web-tier server response codes for read timeout and connect timeout to return more sensible codes to client browsers.
             - Fix for concurrency issue resolving SpringMVC View objects found during heavy thread testing on web-tier startup.
             - Improved caching strategy for WebScripts View Resolver - move techniques from Surf down to WebScripts layer.
             - Improved general View Resolver strategy by caching failed view requests.
             - WebScript resource bundle extension module application thread safety modifications   
   Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      33684: Fixes for ALF-12628, ALF-12639 - timeout handling for READ_TIMEOUT from web-tier to Alfresco
   33771: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled
   33773: ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang
   - filter to include only updateable properties at persistence and start up time
   33775: ALF-11870 Handle the odd way that Outlook requests yearly repeating events, and add unit tests for the yearly recurrence cases
   33776: ALF-12569: org.postgresql.util.PSQLException Invalid ESCAPE on customizing alfresco share site dashboard   
      Added backwards compatible PostgreSQL-specific ESCAPE fragment - fixes for PostgreSQL 9.1.2.
   33784: Fixes: ALF-12111 - Publishing Error when authenticating Facebook channels using IE8. Required an update to stand-alone-auth-return.html.
   33787: Fix for ALF-12337 Remove patch.siteLoadPatch.swsdp from being run for upgrades
   - only add the sample site for new installs and not upgrades
   33794: ITALIAN: Translation updates based on EN r33523
   33807: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33717: (RECORD ONLY) ALF-12632 Move the Site Service permissions to public-services-security-context.xml, to mirror the behaviour on 4.0, and add a (commented out) example of how to restrict site creation permissions with it
      33806: Merged V3.4 to V3.4-BUG-FIX
         33728: ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews.
            - Added configuration to limit older excel format 'xls' from Excel 5.0/95 and Excel 97-2003
              Already had configuration for xlsx Microsoft Office 2007
         33743: ALF-12724: Merge HEAD to V3.4 (3.4.8)
            Issue found while fixing ALF-9899 and again by QA when testing ALF-9899
            32941: ALF-11300:
              - fix locking issues
         33772: Merged DEV to V3.4
            33768: ALF-12685 : Search isn't working correctly
               Index delete events were not getting fired for the entire tree of affected nodes when a node was archive
               Added a deletion of child nodes from indexes in DbNodeServiceImpl.pullNodeChildrenToSameStore() method.
         33803: ALF-12724: Merged V4.0-BUG-FIX to V3.4 (Reverts previous revision and changes an error message to debug)
            33137: Activities feed generator: change info log messages to debug log messages
            33452: Fix for ALF-12536
            33536: Fix for ALF-12536: hopefully this will be the final fix.
         33805: ALF-12624: Fix regression introduced by ALF-9514


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-02-09 16:13:30 +00:00
parent c1da83b23d
commit 4e7a0f6ef0
19 changed files with 573 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
source/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java
View File

@@ -122,6 +122,43 @@ public class CalendarRecurrenceHelper
return params;
}
/**
* Outlook does some crazy stuff, which is only just about permitted by
* the specification, and is hard to parse, especially for yearly events.
* Fix these to more normal cases where possible
*/
protected static Map<String,String> fixOutlookRecurrenceQuirks(Map<String,String> params)
{
if (params.containsKey("FREQ"))
{
// Is it really yearly?
if ("MONTHLY".equals(params.get("FREQ")) &&
params.get("BYMONTH") != null)
{
// Outlook can be "delightfully" different, and likes to generate
// events that recur yearly on a specific date+month as FREQ=MONTHLY
// Detect those cases, and treat as YEARLY as per the spec
params.put("FREQ", "YEARLY");
// Outlook will sometimes do nth of the month (eg 17) instead as
// BYDAY={any}, BYSETPOS=n
if (params.containsKey("BYDAY") && params.containsKey("BYSETPOS"))
{
int days = params.get("BYDAY").split(",").length;
if (days == 7)
{
// Make it normal
params.put("BYMONTHDAY", params.get("BYSETPOS"));
params.remove("BYDAY");
params.remove("BYSETPOS");
}
}
}
}
return params;
}
/**
* For the given Calendar Entry, return its subsequent Recurrence on or after
* the specified date, until the given limit. If it doesn't have any recurrences
@@ -194,8 +231,15 @@ public class CalendarRecurrenceHelper
// To hold our events
List<Date> dates = new ArrayList<Date>();
// Handle the different frequencies
// Extract out the rule into its parts
Map<String,String> params = extractRecurrenceRule(recurrenceRule);
// Outlook does some crazy stuff, which is only just about
// permitted by the specification, and is hard to parse
// Fix these to more normal cases where possible
params = fixOutlookRecurrenceQuirks(params);
// Fetch the frequency and interval
if (params.containsKey("FREQ"))
{
String freq = params.get("FREQ");
@@ -213,6 +257,7 @@ public class CalendarRecurrenceHelper
}
}
// Start with today, and roll forward
Calendar currentDate = Calendar.getInstance();
currentDate.setTime(eventStart);
@@ -458,7 +503,8 @@ public class CalendarRecurrenceHelper
protected static void buildYearlyRecurrences(Calendar currentDate, List<Date> dates,
Map<String,String> params, Date onOrAfter, Date until, boolean firstOnly, int interval)
{
int month = Integer.parseInt(params.get("BYMONTH"));
int realMonth = Integer.parseInt(params.get("BYMONTH"));
int month = realMonth - 1; // Java months count from zero
if (params.get("BYMONTHDAY") != null)
{
@@ -469,12 +515,22 @@ public class CalendarRecurrenceHelper
{
// Correct start time
}
else
else if (currentDate.get(Calendar.MONTH) < month ||
(currentDate.get(Calendar.MONTH) == month &&
currentDate.get(Calendar.DAY_OF_MONTH) < dayOfMonth))
{
currentDate.set(Calendar.YEAR, currentDate.get(Calendar.YEAR) + interval);
// The current date is before the requested date this year
// Move forward to it in this year
currentDate.set(Calendar.MONTH, month);
currentDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
}
else
{
// The current date is after the date this year, move to next year
currentDate.set(Calendar.YEAR, currentDate.get(Calendar.YEAR) + interval);
currentDate.set(Calendar.MONTH, month);
currentDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
}
while (currentDate.getTime().before(onOrAfter))
{
@@ -505,10 +561,79 @@ public class CalendarRecurrenceHelper
}
else
{
// eg the first Tuesday in February every year
int dayOfWeek = DAY_NAMES_TO_CALENDAR_DAYS.get(params.get("BYSETPOS"));
// TODO
}
// eg the third Tuesday in February every year
int dayOfWeek = -1;
int instanceInMonth = 1;
// There are two forms...
if (params.containsKey("BYDAY"))
{
dayOfWeek = DAY_NAMES_TO_CALENDAR_DAYS.get(params.get("BYDAY"));
instanceInMonth = Integer.parseInt(params.get("BYSETPOS"));
}
else
{
// Implies the first one in the month
dayOfWeek = DAY_NAMES_TO_CALENDAR_DAYS.get(params.get("BYSETPOS"));
instanceInMonth = 1;
}
// Find when it is this year
Date origDate = currentDate.getTime();
currentDate.set(Calendar.MONTH, month);
currentDate.set(Calendar.DAY_OF_MONTH, 1);
toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
Date thisYear = currentDate.getTime();
currentDate.setTime(origDate);
// Have we missed it for the year? If so, go to next year
if (currentDate.getTime().after(thisYear))
{
currentDate.set(Calendar.YEAR, currentDate.get(Calendar.YEAR) + interval);
currentDate.set(Calendar.MONTH, month);
currentDate.set(Calendar.DAY_OF_MONTH, 1);
toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
}
else
{
// Otherwise move to it
currentDate.setTime(thisYear);
}
// Move forward to the required date
while (currentDate.getTime().before(onOrAfter))
{
currentDate.set(Calendar.YEAR, currentDate.get(Calendar.YEAR) + interval);
currentDate.set(Calendar.MONTH, month);
currentDate.set(Calendar.DAY_OF_MONTH, 1);
toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
}
// Roll on until we get valid matches
while (true)
{
if (until != null)
{
if (currentDate.getTime().after(until))
{
break;
}
}
dates.add(currentDate.getTime());
if (firstOnly)
{
break;
}
currentDate.set(Calendar.YEAR, currentDate.get(Calendar.YEAR) + interval);
currentDate.set(Calendar.MONTH, month);
currentDate.set(Calendar.DAY_OF_MONTH, 1);
toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
}
}
}
private static void addMonthToDayOfMonth(Calendar c, int dayOfMonth, int monthInterval)