Derek Hulley 51e37ecf1a Merged V3.2 to HEAD ...

15908: Merged V3.1 to V3.2 (record only)
      15907: Merged V3.2 to V3.1
         15683: Fixed potential concurrency issues in HeartBeat and LicenseComponent
   15972: Merged V3.1 to V3.2
      15429: **Record only** I18N message IDs for JSF dashlets
      15947: ETHREEOH-2565: The content size shown in the preview popup is incorrect
      15952: Part of fix for ETHREEOH-2493 - missing html encoding on webscript 404 html status page.
      15953: Fix for ETHREEOH-2364 - LDAP sync missing last name displayed as null.
      15956: Fix for ETHREEOH-2714 - html encoding in Create New User summary page.
      15957: Merged DEV-TEMPORARY to V3.1
         15865: Fix for ETHREEOH-2673
      15958: Merged DEV-TEMPORARY to V3.1
         15885: ETHREEOH-2615: Localization Issue - Japanese UI
      15959: Merged DEV-TEMPORARY to V3.1
         15882: ETHREEOH-2644: Sending Email using Template throws exception
      15962: Fix for ETHREEOH-2390
      15963: Fix ETHREEOH-1962: Hibernate flush ordering incorrect for alf_qname
      15965: Merged DEV/BELARUS/V3.1
         15949: ETHREEOH-2689: When upgrading from 2.1.7e to 3.1.0e/3.1.1e user roles are mapped incorrectly
      15966: Merged V2.2 to V3.1
         15948: (RECORD ONLY) Backport of the fix provided for ETHREEOH-1719.
      15969: Prep for ETHREEOH-2295 fixes and associated merges.
      15970: Merged DEV-TEMPORARY to V3.1
         14360: ETHREEOH-1571, ETHREEOH-1656, ETHREEOH-1404, ETHREEOH-953, ALFCOM-2650, ETHREEOH-1572, ETHREEOH-1574
         15331: ETHREEOH-2295 - LayeredFile: Layer file/folder is present when original file/folder is removed
         15824: ETHREEOH-2295 - higlight stale object
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.1:r15865,15882,15885,15949
   Merged /alfresco/BRANCHES/DEV/3.1SP2:r14360,15331,15824
   Merged /alfresco/BRANCHES/V2.2:r15948
   Merged /alfresco/BRANCHES/V3.1:r15907,15947-15962,15964-15970
   Merged /alfresco/BRANCHES/V3.2:r15908,15972


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2009-10-13 20:33:02 +00:00

..

evaluator

Merged V3.1 to HEAD

2009-03-12 12:04:24 +00:00

executer

Merged V3.2 to HEAD

2009-10-13 20:33:02 +00:00

scheduled

Merged V3.1 to HEAD

2009-03-05 10:53:18 +00:00

ActionConditionDefinitionImpl.java

Updated copyright

2007-02-19 17:17:36 +00:00

ActionConditionDefinitionImplTest.java

Updated copyright

2007-02-19 17:17:36 +00:00

ActionConditionImpl.java

Merged V3.1 to HEAD

2009-03-11 03:22:35 +00:00

ActionConditionImplTest.java

Updated copyright

2007-02-19 17:17:36 +00:00

ActionDefinitionImpl.java

Updated copyright

2007-02-19 17:17:36 +00:00

ActionDefinitionImplTest.java

Updated copyright

2007-02-19 17:17:36 +00:00

ActionImpl.java

Fixed one of the failing tests for rules coverage:

2007-06-16 00:40:19 +00:00

ActionImplTest.java

Updated copyright

2007-02-19 17:17:36 +00:00

ActionModel.java

Merged V3.1 to HEAD

2009-03-11 03:22:35 +00:00

actionModel.xml

Merged V3.1 to HEAD

2009-03-11 03:22:35 +00:00

ActionsAspect.java

Fixed MOB-426: Refactor CopyService: Apply new pattern to existing policy handlers

2009-04-09 14:48:02 +00:00

ActionServiceImpl.java

Fixed MOB-426: Refactor CopyService: Apply new pattern to existing policy handlers

2009-04-09 14:48:02 +00:00

ActionServiceImplTest.java

Merged V3.1 to HEAD

2009-03-11 03:22:35 +00:00

ActionServiceRemote.java

Merged V3.1 to HEAD

2009-03-11 03:22:35 +00:00

ActionServiceTransportImpl.java

Adds the barely necesaries for post deployment actions for alfresco->alfresco.

2007-07-12 23:15:14 +00:00

ActionTestSuite.java

Merged V3.1 to HEAD

2009-03-11 03:22:35 +00:00

ActionTransactionListener.java

Enhancements to FSR.

2008-09-25 15:10:58 +00:00

AsynchronousActionExecutionQueue.java

Updated copyright

2007-02-19 17:17:36 +00:00

AsynchronousActionExecutionQueueImpl.java

MOB-412: Decouple thread local authentication methods from AuthenticationComponent into new AuthenticationContext super-interface. The AuthenticationContext is a delegate of AbstractAuthenticationComponent and can be accessed directly by low-level classes (e.g. schema bootstrap) before the authentication subsystem is available.

2009-03-23 14:01:29 +00:00

AsynchronousActionExecutionQueuePolicies.java

Tagging Service: tag scope refresh added. Async action execution policy added.

2008-08-07 10:25:05 +00:00

BaseParameterizedItemDefinitionImplTest.java

Updated copyright

2007-02-19 17:17:36 +00:00

BaseParameterizedItemImplTest.java

Updated copyright

2007-02-19 17:17:36 +00:00

CommonResourceAbstractBase.java

Updated copyright

2007-02-19 17:17:36 +00:00

CompositeActionConditionImpl.java

Merged V3.1 to HEAD

2009-03-11 03:22:35 +00:00

CompositeActionConditionImplTest.java

Merged V3.1 to HEAD

2009-03-11 03:22:35 +00:00

CompositeActionImpl.java

Updated copyright

2007-02-19 17:17:36 +00:00

CompositeActionImplTest.java

Updated copyright

2007-02-19 17:17:36 +00:00

ParameterDefinitionImpl.java

Updated copyright

2007-02-19 17:17:36 +00:00

ParameterDefinitionImplTest.java

Updated copyright

2007-02-19 17:17:36 +00:00

ParameterizedItemAbstractBase.java

Updated copyright

2007-02-19 17:17:36 +00:00

ParameterizedItemDefinitionImpl.java

Updated copyright

2007-02-19 17:17:36 +00:00

ParameterizedItemImpl.java

Updated copyright

2007-02-19 17:17:36 +00:00

RuntimeActionService.java

Enhancements to FSR.

2008-09-25 15:10:58 +00:00