Derek Hulley
00e81c0d66
Merged V2.2 to HEAD (QNames)
...
7624: QName Refactor Merge 1 of 9
7625: QName Refactor Merge 2 of 9
7626: QName Refactor Merge 3 of 9
7627: QName Refactor Merge 4 of 9
7628: QName Refactor Merge 5 of 9
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8436 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-06 18:12:25 +00:00
Derek Hulley
a49bfd311d
Merged V2.2 to HEAD
...
7575: Permission changes for AVM.
7577: Incorporated most of the feedback provided by Kevin C earlier today
7578: Removed directory not removed by patch
7579: EmailServer bug fixes
AR-1902: Double posts when emailing to a document
AR-1904: Attachments via email should be allowed on forum posts
AR-1903: (Partial Fix) Text attachments should be treated the same way as other attachments
7583: Fixed WCM-961 & WCM-962: Added confirm dialog for 'Delete All Deployment Reports' and 'Release Server' actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8434 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-06 14:43:55 +00:00
Jan Vonka
7f8a4f0d5b
User content usages & quotas - initial check-in
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7453 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-11-27 18:44:24 +00:00
Britt Park
19d195c423
Backing out stuff that should have gone on its own branch.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6890 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-10-01 15:47:06 +00:00
Britt Park
fb81fb4470
Checkpoint of light weight ACLs.
...
This is a fairly brute force strategy that allows permissions evalutations
with essentially no db access. It does a number of 'bad' things and I may
rip it out completely.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-14 12:39:07 +00:00
Derek Hulley
b166891218
Merged V2.1 to HEAD
...
6349: Build fix after ReadPermissions was added to the permission model
6350: CIFS file rename fixes
6352: Management of avmsubmittedaspect, particularly as applies to newly created directories
6353: Added assemble to ignore property pattern
6354: Deployment project build stuff
6355: Fix for AR-1245 (Do not authenticate in a read only TX as it could create a person object)
6356: Office 2003 Add-Ins - Fixes to installers to support Vista
6357: Office Add-In web scripts - Updated to support the new Office 2007 extensions (.docx, .xlsx, .pptx)
6358: Fix for AR-1392 - Audit string lengths
6359: Remove unwanted rule model from repo
Fix issue with update rules on spaces causing documents to be deleted in CIFS
6360: Office 2003 Add-In Installers, Vista fixes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6723 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-09-10 14:30:55 +00:00
Jan Vonka
56a0b7e164
Missing file - extra for r6391
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6395 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-08-02 08:14:28 +00:00
Derek Hulley
fb069d1680
Merged DEV/DEREK_2.1 to HEAD
...
- Removed Node.parentAssocs mapping
- Added parentAssocs transactional cache to NodeDAO
- Added concurrency detection to TransactionalCache
- Fixed cluster sample config
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5948 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-13 23:50:14 +00:00
David Caruana
7567867be1
- jBPM 3.1.2 to 3.2 upgrade
...
- Implementation of Workflow Timers (primarily for WCM content launch, but also useful in other scenarios)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-30 17:21:52 +00:00
Britt Park
bdae23b768
Interim checkin. Attributes basically work.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-18 23:25:53 +00:00
Derek Hulley
b37ec12379
Fix AR-1208
...
- Issuers were using Spring init to load data. The Hibernate database auto-update was switch on and this bypassed the SchemaBootstrap.
- Added an AvmBootstrap bean for initializing AVM components that require DB interaction
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-05 17:23:09 +00:00
David Caruana
211da07059
Workflow
...
- fix for XOR type joins where forked path were not ended properly and tasks on those paths were not removed
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4919 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-24 15:36:53 +00:00
Derek Hulley
df4fd38e52
Merged 1.4 to HEAD
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4145 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4146 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4159 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4160 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4164 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4165 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4165 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4166 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4176 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4178 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4179 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4181 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4145 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4146 .
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-18 11:21: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
3ad75520ca
Turned down the volume on several time consuming tests. Snapshot of currently
...
not working WCM workflow.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4247 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-27 19:29:02 +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
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
fff09ab01d
Aspects on AVM nodes are copied on write. Also missing configuration change
...
from last checkin.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3699 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-05 18:22:40 +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
6692c7a979
Merged AVMService into the rest of Alfresco. It all comes up in
...
the same ApplicationContext. Some adjustments to tests needed,
but everything is passing.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-07-26 13:47:40 +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
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
c3adde8ac4
Split sessionFactory bean so that most properties are on an abstract parent bean
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2649 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-12 11:16:03 +00:00
Derek Hulley
6fa5688f5f
Fixed permissions patch. Split hibernate and cache configuration property files
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-31 13:26:54 +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