Derek Hulley 419606be51 Merged V3.2 to HEAD ...

17620: Merged DEV_TEMPORARY to V3.2
      17599: Fix for ETHREEOH-3308: xf:switch cannot be used in repeating field type
   17634: Put back AVM concurrency checks (reverse r17405)
   17644: Fixed up some comments and added return value to in-txn recording of deleted nodes
   17647: Fixed read-only detection of ContentStoreCleaner
   17648: Merged DEV fixes for ETHREEOH-3473 and ETHREEOH-3454 - DB script and iBatis-related changes
   17649: Fixed problem after merge-in: ETHREEOH-3641: build 270: cannot install on PostgreSQL
   17652: Fix ETHREEOH-3376 - Reindexer failure: requires rollback (Cluster)
   17658: Removed failing concurrency test for split person cleanup
   17659: Merged V3.1 to V3.2
      17308: Fixed ETHREEOH-2310: Upgrade from 2.1 E Sp7 to 3.1.1 E build 225 - Duplicate alf_node_status entries detected
             Fixes ETHREEOH-3606 (same as CHK-10454)
   17661: Fixed DB2 iBatis problems related to http://issues.apache.org/jira/browse/IBATIS-536
   17666: ETHREEOH-3376 / ETHREEOH-3637 - reindexer failure in a cluster (dictionary repo bootstrap)
   17678: Follow-on to r17666 (for RM custom model)
   17685: Merged DEV_TEMPORARY to V3.2
      17676: ETHREEOH-3187: Creating Web Content based on Web Form with most elements-read-only/default failed
   17695: Temporarily comment-out testSubmitChangedAssets1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17632,17636,17676
   Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_09:r17599
   Merged /alfresco/BRANCHES/V3.1:r17308
   Merged /alfresco/BRANCHES/V3.2:r17620,17634,17644,17647-17649,17652,17658-17659,17661,17666,17678,17685,17695


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

2010-01-20 11:30:46 +00:00

..

xforms

Merged V3.2 to HEAD

2010-01-20 11:30:46 +00:00

Form.java

DM Forms - fix web forms with inline URIs (eg. company press release sample)

2007-12-04 14:32:21 +00:00

FormDataFunctions.java

Merged V2.2 to HEAD

2008-10-07 09:07:27 +00:00

FormImpl.java

Fix to unreported issue where FormImpl class was not correctly deserializable, it would not correctly reinitialize from serialized state due to a static initialisation block relying on a FacesContext being available.

2009-10-23 09:01:41 +00:00

FormInstanceData.java

Merged V3.2 to HEAD

2010-01-19 13:18:50 +00:00

FormInstanceDataImpl.java

Merged V3.2 to HEAD

2010-01-19 13:18:50 +00:00

FormNotFoundException.java

Merged V2.1 to HEAD

2007-09-10 13:21:08 +00:00

FormProcessor.java

Merge of all UI clustering changes originally applied to 2.2

2008-02-15 14:59:11 +00:00

FormsService.java

Merged V3.0 to HEAD

2008-12-18 15:08:14 +00:00

FormsTest.java

Merged V3.2E to HEAD

2010-01-18 15:32:57 +00:00

FreeMarkerRenderingEngine.java

Merged V3.1 to HEAD

2009-06-23 14:34:50 +00:00

FreeMarkerUtil.java

Merged V2.0 to HEAD

2007-03-07 11:46:17 +00:00

RenderingEngine.java

WCM - fix ETHREEOH-569, ETHREEOH-571, ETHREEOH-3123 (after deleting web form)

2009-10-23 11:04:11 +00:00

RenderingEngineTemplate.java

Merged V3.2E to HEAD

2010-01-19 11:50:05 +00:00

RenderingEngineTemplateImpl.java

Merged V3.2E to HEAD

2010-01-19 11:50:05 +00:00

Rendition.java

Merged V3.2 to HEAD

2010-01-19 13:18:50 +00:00

RenditionImpl.java

Merged V3.2 to HEAD

2010-01-19 13:18:50 +00:00

ServletContextFormDataFunctionsAdapter.java

Updated copyright

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

XMLUtil.java

Merged V2.9 to HEAD

2008-09-01 10:29:50 +00:00

XMLUtilTest.java

Merged V2.9 to HEAD

2008-09-01 10:29:50 +00:00

XSLFORenderingEngine.java

Updated copyright

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

XSLTRenderingEngine.java

Merged V2.1 to HEAD

2007-11-12 23:52:46 +00:00