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 |
|