Andrew Hind
3449af14b5
Fix initialisation of permission model
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-04 11:13:48 +00:00
Derek Hulley
760cb0fe77
Merge 1.4 to HEAD
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4351 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4352 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4353 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4362 .
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-19 14:36:46 +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
Derek Hulley
8e0a637886
Merged 1.4 to HEAD
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4229 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4230 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4232 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4233 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4234 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4235 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4239 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4240 .
svn resolved root\projects\web-client\source\java\org\alfresco\web\app\AlfrescoNavigationHandler.java
svn resolved root\projects\web-client\source\web\WEB-INF\faces-config-beans.xml
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4241 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4242 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4243 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4244 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4244 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4245 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4245 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4246 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4247 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4248 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4248 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4249 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4250 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4251 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4251 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 .
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-18 13:18:44 +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
2c20af6d2b
Fixed the two tests that were failing in the continuous build. Disabled
...
four really long winded AVM performance and stress tests. This should speed
up the continuous build on the wcm branch. The tests should probably be set up
to run periodically with other long running exhaustive performance, and stress tests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4293 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-06 06:11:26 +00:00
Britt Park
111296d4dc
Heinous merge from HEAD. Seems to basically work. Be on guard however.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-18 02:24:36 +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
f7d9d83036
Merge from HEAD into WCM-DEV2. Also fixes build breakage in
...
jndi-client and catalina-virtual that I introduced earlier.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-07-24 18:27:41 +00:00
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
6bb9a0ab2a
Another merge.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-23 23:20:29 +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
Britt Park
4b881e72ad
Daily merge.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-12 20:22:46 +00:00
Britt Park
a22ddfb666
Morning merge.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-11 17:01:57 +00:00
Derek Hulley
7edcb18bc0
Schema changes and ID-based node storage
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-28 12:54:29 +00:00
Derek Hulley
f870a17a66
Fixed AR-546:
...
VersionCounterDao is enclosed in non-propagating transactions (via config)
version_counter row is locked while version number is incremented
Added tests to ensure failure before fixing
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-11 10:54:09 +00:00
Andrew Hind
57e7a4f77e
Added support for result set meta data
...
Added size limits for result sets
Updated/improved comments
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-23 15:14:22 +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
Derek Hulley
af536825b8
Split some lines of code up to enable debugging
...
Added toString() to facilitate reading of error logs
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2512 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-01 21:38:33 +00:00
David Caruana
42add2655c
Fix tests after moving some permissions.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-01 12:31:58 +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
47ecffb07e
Fix build issue - missed Guest to Consumer rename.
...
Tidy up ContextListener - removed all unused imports etc.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-22 10:05:06 +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
Derek Hulley
ab9b2bc196
9 granting permissions instead of 8
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2404 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-16 02:05:41 +00:00
Derek Hulley
35fba08088
Possible test fix. The list of settable permissions of [Contributor, Coordinator, Guest, Editor, Collaborator] looked right for 'content' and 'folder'
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2403 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-16 00:53:18 +00:00
Andrew Hind
f3e5093891
incorrect uri for 1.0 enterprise all permission
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2377 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-14 17:21:26 +00:00
Derek Hulley
ae6bed1eb4
Fix AR-350: Transactional caches for node ownership and permissions statuses
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2354 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-13 12:28:03 +00:00
Derek Hulley
1c0c31e10e
Breaking up some long lines to facilitate debugging.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-08 14:48:57 +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
Andrew Hind
9d432121bc
Guest fixes
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2173 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-23 11:27:32 +00:00
Andrew Hind
aed399f1cd
Removed recursive check for child read permissions.
...
This can be configured back.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2155 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-20 09:44:45 +00:00
Derek Hulley
572f151402
Fallout from Spring upgrade
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2138 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-18 16:30:33 +00:00
Andrew Hind
c7b9c343bc
Minor tidy ups
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2132 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-18 10:26:31 +00:00
Andrew Hind
4408850b7a
Guest and LDAP progress
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-17 14:17:39 +00:00
Andrew Hind
3d4425bdb0
Fix permission test for folder/cmobject permission move
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2121 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-17 08:44:35 +00:00
Gavin Cornwell
b7a861de33
Another build fix
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2120 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-16 22:49:43 +00:00
Gavin Cornwell
c1470bc5ed
Fixed build failure and updated invite content users to request content permissions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-16 17:02:12 +00:00
Kevin Roast
eff2ff343c
Re-added the "templatable" aspect back into the web-client config XML
...
Refactored cache in Permissions service so it can be re-used by other services e.g. Ownable
Added cache into OwnableService (Andy to validate on Monday)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-06 17:28:23 +00:00
Kevin Roast
0b80b960b8
. Fix to Permissions Cache to handle deleted nodes in correct order (i.e. before accessing the cache)
...
- fixes issue highlighted by ACLEntryVoterTest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2076 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-05 08:28:39 +00:00
Kevin Roast
e86d44aacb
First cut of Permissions Service performance cache
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2075 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-04 18:11:46 +00:00
Kevin Roast
af6dc02c9e
. Performance improvements to authenticating users per screen refresh (5% improvement for basic screens)
...
. Minor performance improvements to permissions in hot-spot areas (as identified from profiling)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2050 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-20 14:45:50 +00:00
Kevin Roast
77a19b56f7
. Added Quartz Scheduler init properties file - to configure lower priority threads by default
...
. Minor Permissions performance improvements (2-3%)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2046 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-19 16:20:16 +00:00
Derek Hulley
e1e6508fec
Moving to root below branch label
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-08 07:13:07 +00:00