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
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
c2e407165e
Changed AVMNodeConverter.ToAVMVersionPath() to return a
...
Pair<Integer, String>.
Fixed avm.jsp which got busted by last checkin.
Added implementation of AddChild to AVMNodeService.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-30 17:51:15 +00:00
Britt Park
39a18df7f2
Yet another merge from head to WCM-DEV2.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-12 18:55:07 +00:00
Britt Park
17284e4dae
More touch ups to AVM permissions stuff. ACLs are properly copied on write.
...
OrphanReaper cleans up ACLs. Tests of same.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-06 20:53:38 +00:00
Britt Park
920c487867
Cleanup of ACL reading/writing for PermissionsDaoComponent. All access is
...
through the AccessControlListDAO interface.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-06 00:41:41 +00:00
Britt Park
1fd96d13d5
This changes PermissionsDaoComponentImpl to work with NodeRefs instead
...
of Nodes so that Permissions can be used with AVM nodes. It needs
to be factored a little bit differently, so consider this a WIP.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-05 14:17:34 +00:00
Britt Park
820da6ecab
Merge from HEAD to WCM-DEV2.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-02 18:19:00 +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
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
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
80215dd3a0
Morning merge.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2919 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-18 14:26:58 +00:00
Britt Park
eb073b24f1
Another file that didn't merge in.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2916 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-17 22:47:52 +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
1d601e1be7
Morning merge.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2889 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-14 16:21:55 +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
d3708a3675
Added primary path to the properties archived against a node.
...
Fixed bug in caching of ChildAssociationRef in the ChildAssoc object
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2797 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-09 15:22:28 +00:00
Derek Hulley
8c92948879
Low-level archive and restore functionality
...
- Full tests of archive and restore against the contentModel.xml
- TODO: Test permissions of archive store
- Currently on a single, simple restoreNode method on NodeService
- TODO: NodeRestoreService implementation to provide helpers around mass restoration, purging, etc
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2782 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-06 02:55:27 +00:00
Derek Hulley
fcad8b7a1f
Content and folder node archival
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-04 16:04:55 +00:00
Derek Hulley
56e9002855
More robust concurrency handling of cached references
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2750 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-03 23:06:59 +00:00
Derek Hulley
f08c44025d
Ensure initialization of the Hibernate association bags
...
- If uninitialized (e.g. by a size() call), then the new assocations added are queued for addition
- These then become duplicated within the session (not the DB) and appear as duplicate associations during integrity checking
Fixed test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2741 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-03 12:33:26 +00:00
Derek Hulley
3166554a95
Fixed permission bug appearing as Hibernate null issue.
...
Added an index on the "NodeRef" portion of the node table.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-02 11:05:20 +00:00
Derek Hulley
ba0f72cae7
Removed unused folder and hopefully get rid of phantom file in the process
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-01 20:07:47 +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
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
58bec08e99
Fixed AR-434: Ensure that persisted empty string properties are never returned as null
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2446 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-19 21:21:57 +00:00
Derek Hulley
440fa299b4
Content URLs are now generated with an extra HOUR folder to handle high volume input in one day better
...
Added cleanup job for content stores
- content is moved into (alf_data)/contentstore.deleted and mirrors the live content store
- We'll make a call about disabling the trigger for the job, but currently it will fire at 4am
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2422 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-16 20:01:57 +00:00
Derek Hulley
cdede309e5
Removed some unused code
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-31 05:38:24 +00:00
Derek Hulley
de11c59226
More tests for property persistence and fixes to ensure that d:any always returns the same type as put in
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2247 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-30 02:57:19 +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
Derek Hulley
78052faade
Patches that were not executed (but considered) are not output on startup
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2198 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 12:13:32 +00:00
Derek Hulley
d7964671b4
Fix NullPointerException
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2193 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 09:09:23 +00:00
Derek Hulley
744535fa73
Patch application on startup reports progress
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2190 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-24 23:49:16 +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
02dc9ced9b
Patch checkpoint.
...
Service descriptor changes including introduction of schema number.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2161 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-20 14:45:16 +00:00
Derek Hulley
b4550ffa98
Fix issue where store.protocol column was longer than node.protocol, thereby causing SQLServer2000 schema creation to fail
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2144 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-19 11:18:17 +00:00
Derek Hulley
1fadfb3952
Fixes for patch mechanisms; Javadocs; Some field renaming
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2130 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-18 01:53:57 +00:00
Derek Hulley
47449b1555
Checkpoint checkin of patch code.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-16 19:49:34 +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