Derek Hulley
a67dce2f5e
Merged 1.4 to HEAD (Repository support for Records Management)
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4306 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4307 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4485 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4486 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4532 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4533 .
svn resolved source\java\org\alfresco\repo\jscript\Node.java
svn resolved config\alfresco\action-services-context.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-19 17:12:47 +00:00
Derek Hulley
ae7c03d291
Merged 1.4 to HEAD (Repo changes associated with Records Management)
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4227 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4228 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4242 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4/root/projects/repository@4243 .
svn resolved source\java\org\alfresco\repo\jscript\RhinoScriptService.java
svn resolved config\alfresco\script-services-context.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4663 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-19 16:47:27 +00:00
Derek Hulley
72bb79696d
Merged 1.4 to HEAD
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 .
svn revert root\common\common.xml
svn resolved root\projects\repository\config\alfresco\script-services-context.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-18 13:45:11 +00:00
Kevin Roast
a157e79f42
AVM JavaScript integration refactored to use new Spring bean config pattern (as per recent HEAD merge changes)
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4313 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-08 14:14:30 +00:00
Kevin Roast
d8d3756507
. WCM HEAD merge fixes
...
- fix ups
- removal of obsolete JBPM files
. Addition of AVM JavaScript integation files
- ability to retrieve AVM node references by Path or from the root node of a store by lookup
- getting and setting of AVM node properties and aspects
- walking of child nodes
- moving and renaming of AVM nodes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-08 11:09:24 +00:00
Britt Park
b2f9df29d1
Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
...
were both beyond me, and are just the raw conflict merge data. If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-08 05:17:40 +00:00
Britt Park
8031cc6574
Big honkin' merge from head. Sheesh!
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-27 01:01:30 +00:00
Britt Park
fae76d7896
Merge from head.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3314 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-07-13 07:06:30 +00:00
Britt Park
7d940d08e1
Big hunk of merge.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-06-28 17:31:18 +00:00
Britt Park
11037b2451
Morning merge.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-22 17:20:58 +00:00
Kevin Roast
ba9512439a
. First pass of the Alfresco JavaScript API wiki docs:
...
http://wiki.alfresco.com/wiki/JavaScript_API
- JavaDoc and minor API updates that made sense as I was writing the documentation :)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-08 14:55:05 +00:00
Kevin Roast
c9e5bd6c22
. Rhino JavaScript integration checkpoint:
...
- Added a new action to the repository for executing JavaScript files
- Added script action UI to rule framework, means we can execute a JavaScript file as part of a rule
- Lucene search and Saved Search functionality added to default data-model for scripts
- Added Scripts folder to Data Dictionary (created during bootstrap)
- Created patch to add the Scripts folder to existing schemas
- Added ScriptService to ServiceRegistry bean
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-03 12:01:21 +00:00
Kevin Roast
2b251c922b
. Checkpoint for the Rhino JavaScript engine integration:
...
- Additions to the Alfresco JavaScript data-model
. JUnit test for each entry point into Rhino and the ScriptService
- tests for various API calls on the Scriptable Node object
. More javadoc clean-up in templating and script services
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2726 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-28 10:56:48 +00:00
Kevin Roast
71f59c540e
Checkpoint for the Rhino Script engine integration
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-27 09:39:08 +00:00
