27 Commits

Author SHA1 Message Date
Britt Park
7f79a2a498 Merged up to HEAD.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-06-16 19:18:30 +00:00
Britt Park
9d6b8bdf26 Another merge. I was bored.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-19 00:38:14 +00:00
Britt Park
bfd0d2a337 Afternoon merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-17 22:42:03 +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
Derek Hulley
40a7f6edc7 Fixed missing setters for some patches
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2670 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-20 10:18:03 +00:00
Derek Hulley
776314da72 svn merge -r 2570:2595 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root
svn merge -r 2597:2649 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-12 14:58:21 +00:00
Derek Hulley
d9a5b76e63 Fixed AR-525:
basePatch bean has the following beans injected and held as protected fields
        transactionService
        namespaceService
        searchService
        nodeService
        authenticationComponent


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2645 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-11 10:49:43 +00:00
Derek Hulley
75ce410028 Fixed merge error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2572 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-22 18:19:35 +00:00
Derek Hulley
d4d33c1e34 Merge V1.2.0 BRANCH to HEAD
svn merge -r 2566:2569 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-22 16:21:14 +00:00
Derek Hulley
506e408ca7 Merge V1.2.0 BRANCH to HEAD
svn merge -r 2519:2565 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-22 12:23:43 +00:00
Kevin Roast
1858509d3a . Patch to load email templates content into older schema (first patch to perform an import)
. Updated schema version to 10

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-10 15:51:17 +00:00
Kevin Roast
d8b2e56aa3 . Addition of Email Templates folder (in Data Dictionary) to Bootstrap spaces.xml
. New patch to apply Email Templates folder to older schemas

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-03 17:39:32 +00:00
Gavin Cornwell
e667abaac6 Changed forums icons to use browse bean's small icon resolver and required patch
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2513 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-02 22:33:32 +00:00
David Caruana
32990f3d62 Allow for export of all Repository content including version store. Required:
- supporting content in ANY properties (for Content Service and Exporter)
- moving Content related permission to sys:base as type can support a property of datatype CONTENT

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2505 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-28 17:11:17 +00:00
David Caruana
cab7aa3b4e AW-542 Guest user can not see any Categories
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2456 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-21 16:12:12 +00:00
David Caruana
6cb16abef4 Fix AR-431, AR-432.
Modified the Repository bootstrap mechanism so it's performed after all other initialisation and the order of bootstrap is explicit.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-16 15:11:53 +00:00
Derek Hulley
9be5d15ad1 Fixed AWC-487: Added patch to grant required permissions to 'Saved Searches' folder
Fixed I18N of SavedSearchFolderPatch
Neatened up patch logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2276 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-01 15:36:03 +00:00
Andrew Hind
6bcc456fcd Fixes to guest permissions and patch
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2251 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-30 16:50:58 +00:00
Derek Hulley
7955eb623a Fixed AR-359: Property values never persisted as Serializable unless absolutely necessary. Bumped schema version up to 4.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2246 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-30 01:45:32 +00:00
Andrew Hind
fc8b53f844 Patch for guest set up
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2243 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-29 21:18:12 +00:00
Derek Hulley
0e7fda10a1 More generic use of Spring <import> using classpath*:...*.xml notation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2209 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-26 00:32:44 +00:00
Derek Hulley
dc6bc0d726 Patch service I18N. Added permission data patch for AR-344. Bumped up schema version to 3.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2206 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 19:07:06 +00:00
Derek Hulley
8e3b143bb3 Pointed to PatchExecuter to transactional PatchService
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 10:02:57 +00:00
Derek Hulley
58d9cc95a5 Pointed to PatchExecuter to transactional PatchService
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2194 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 09:56:58 +00:00
Derek Hulley
cca8a75096 Put in changes that I applied to the wrong files originally
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 09:00:44 +00:00
Derek Hulley
e6f160ca9f First real patch: Saved Searches folder fix.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-20 17:53:05 +00:00
Derek Hulley
b4220a973b Moved patch config files
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2160 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-20 14:43:33 +00:00