Derek Hulley 182eece8f7 Merged V3.2 to HEAD ...

17502: Merged V3.1 to V3.2 (Fixes ETHREEOH-3155 & ETHREEOH-2653)
      17501: Merged V2.2 to V3.1
         17358: Improved debugging in Schema2XForms utility to help with resolving of repeating switch support for ETWOTWO-490
         17488: Fix for ETWOTWO-1006: xforms.js DEBUG output can cause performance issues with web forms
         17491: More XForms debugging improvements
   17503: Failover content transformer
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /alfresco/BRANCHES/V2.2:r17358,17488,17491
   Merged /alfresco/BRANCHES/V3.1:r17501
   Merged /alfresco/BRANCHES/V3.2:r17502-17503


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

2010-01-19 14:51:40 +00:00

..

xforms

Merged V3.2 to HEAD

2010-01-19 14:51:40 +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