Derek Hulley 352e065b07 Merged v3.1 to HEAD ...

12864 *RECORD ONLY*: Created V3.1 branch from HEAD (Labs 3D)
   12871: Fix UTF-8 encoding for activity feed (ETHREEOH-1197 on V3.1 branch)
   12872: Fix WCM refactor which affected "My Web Files" (ETHREEOH-1207 on V3.1 branch)
   12892: Updated svn:mergeinfo for DEV/LIVECYCLE-3.1 to V3.1
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r12864,12871-12872,12892
      Merged /alfresco/BRANCHES/DEV/LIVECYCLE-3.1:r12580,12768,12886


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

2009-03-10 13:08:01 +00:00

..

Actions.java

Source Association methods added to jscript/freemarker APIs

2007-12-12 11:53:43 +00:00

Association.java

Source Association methods added to jscript/freemarker APIs

2007-12-12 11:53:43 +00:00

AVM.java

Merged v3.1 to HEAD

2009-03-10 13:08:01 +00:00

AVMNode.java

Merged V2.2 to HEAD

2008-03-11 10:43:37 +00:00

AVMScriptStore.java

Source Association methods added to jscript/freemarker APIs

2007-12-12 11:53:43 +00:00

BaseScopableProcessorExtension.java

Refactor of template and script services to allow easy addition of further template and script processors.

2007-04-20 17:13:34 +00:00

Behaviour.java

Source Association methods added to jscript/freemarker APIs

2007-12-12 11:53:43 +00:00

CategoryNode.java

Source Association methods added to jscript/freemarker APIs

2007-12-12 11:53:43 +00:00

CategoryTemplateNode.java

Split of the template node functionality into new interface hierarchy and appropriate base classes impl.

2007-03-23 16:26:09 +00:00

ChildAssociation.java

Source Association methods added to jscript/freemarker APIs

2007-12-12 11:53:43 +00:00

Classification.java

Source Association methods added to jscript/freemarker APIs

2007-12-12 11:53:43 +00:00

ClasspathScriptLocation.java

Merged BRANCHES/DEV/WEB-PROTO-3.0 to HEAD

2008-03-19 12:13:38 +00:00

ContentAwareScriptableQNameMap.java

Merged V3.0 to HEAD

2009-01-16 14:20:15 +00:00

CrossRepositoryCopy.java

Script specific Node class renamed to ScriptNode.

2007-06-12 15:10:48 +00:00

ExecuteScriptJob.java

Source files missing new license header

2007-03-09 09:38:24 +00:00

NativeMap.java

Merge Web Script framework extraction.

2007-11-27 19:45:50 +00:00

People.java

Merged V3.0 to HEAD

2008-12-19 10:21:51 +00:00

Presence.java

First cut of online presence status for spaces

2007-11-02 16:29:25 +00:00

RhinoScriptProcessor.java

Merged V3.0 to HEAD

2009-01-05 11:38:51 +00:00

RhinoScriptTest.java

Merged V3.0 to HEAD

2008-12-22 12:17:00 +00:00

Scopeable.java

Template extension spring configuration support

2007-03-09 12:30:34 +00:00

ScriptableHashMap.java

Updated copyright

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

ScriptableQNameMap.java

Merged V3.0 to HEAD

2009-01-16 14:20:15 +00:00

ScriptAction.java

Source Association methods added to jscript/freemarker APIs

2007-12-12 11:53:43 +00:00

ScriptBehaviour.java

Updated copyright

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

ScriptBehaviourTest.java

Updated copyright

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

ScriptLogger.java

Added support for warn logging level messages to ScriptLogger utility classes and updated forms JS script to use it

2009-02-10 16:55:00 +00:00

ScriptNode.java

Merged V3.0 to HEAD

2009-01-16 14:20:15 +00:00

ScriptTestUtils.java

Change file modified date on returned content from web script of type 'ContentStream', fix for SLNG- 894, change relating to SLNG-989, assertNotNull added to JS unit test API

2008-08-04 12:06:19 +00:00

ScriptUtils.java

Merged DEV/FORMS to HEAD (all activity from branch creation r12855 through r13056)

2009-02-04 15:03:18 +00:00

ScriptVersion.java

Merge JS Versions API from DEV/SEAMIST r9707

2008-07-11 14:10:28 +00:00

Search.java

Fix for SLNG-1085 - Doclist data webscripts with sites starting with numbers

2008-09-11 20:37:59 +00:00

Session.java

Source Association methods added to jscript/freemarker APIs

2007-12-12 11:53:43 +00:00

test_onAddAspect_cmCountable.js

Merged 1.4 to HEAD

2006-12-18 13:45:11 +00:00

test_onCreateChildAssociation.js

Fixed test script to handle the extra isNewNode flag for onCreateChildAssociation

2007-06-18 15:29:24 +00:00

test_onCreateNode_cmContent.js

Merged 1.4 to HEAD

2006-12-18 13:45:11 +00:00

test_script1.js

Fix up script service tests to expect native JavaScript array return types instead of assuming java arrays

2007-06-06 17:16:43 +00:00

test_script2.js

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

test_script3.js

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

test-context.xml

Merged 1.4 to HEAD

2006-12-18 13:45:11 +00:00

ValueConverter.java

Fix for ALFCOM-1666 - Null pointer when calling ScriptNode in Java (for workflow)

2009-03-09 10:37:00 +00:00