Derek Hulley b3a235b6eb Merge 1.4 to HEAD ...

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4504 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4505 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4506 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4507 .
   svn resolved root\projects\core\source\java\log4j.properties
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4548 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4549 .
   svn resolved root\projects\repository\source\java\org\alfresco\repo\jscript\Node.java
   svn resolved  root\projects\repository\source\java\org\alfresco\repo\jscript\CategoryTemplateNode.java
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4603 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4604 .


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

2006-12-19 16:28:32 +00:00

..

Actions.java

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

Association.java

Merged 1.4 to HEAD

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

AVM.java

AVM JavaScript integration refactored to use new Spring bean config pattern (as per recent HEAD merge changes)

2006-11-08 14:14:30 +00:00

AVMNode.java

. Copy of nodes (recursive) now supported in AVM JavaScript integration

2006-11-08 15:37:40 +00:00

BaseScriptImplementation.java

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

Behaviour.java

Merged 1.4 to HEAD

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

CategoryNode.java

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

CategoryTemplateNode.java

Merge 1.4 to HEAD

2006-12-19 16:28:32 +00:00

ChildAssociation.java

Merged 1.4 to HEAD

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

Classification.java

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

ClasspathScriptLocation.java

Merged 1.4 to HEAD

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

Node.java

Merged 1.4 to HEAD

2006-12-19 16:01:52 +00:00

People.java

Merged 1.4 to HEAD

2006-12-19 14:58:16 +00:00

RhinoScriptService.java

Merged 1.4 to HEAD

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

RhinoScriptTest.java

Big honkin' merge from head. Sheesh!

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

Scopeable.java

Big honkin' merge from head. Sheesh!

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

ScriptableHashMap.java

Big honkin' merge from head. Sheesh!

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

ScriptableQNameMap.java

. Checkpoint for the Rhino JavaScript engine integration:

2006-04-28 10:56:48 +00:00

ScriptBehaviour.java

Merged 1.4 to HEAD

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

ScriptBehaviourTest.java

Merged 1.4 to HEAD

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

ScriptLogger.java

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

ScriptUtils.java

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

Search.java

Merged 1.4 to HEAD

2006-12-19 16:01:52 +00:00

Session.java

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

test_onAddAspect_cmCountable.js

Merged 1.4 to HEAD

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

test_onCreateChildAssociation.js

Merged 1.4 to HEAD

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

test_onCreateNode_cmContent.js

Merged 1.4 to HEAD

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

test_script1.js

. Checkpoint for the Rhino JavaScript engine integration:

2006-04-28 10:56:48 +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

Merged 1.4 to HEAD

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