12 Commits

Author SHA1 Message Date
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
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
405c00bd8e Fixed bean name
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2744 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-03 15:07:51 +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
6ddab4043e Changed to java.util.concurrent package for concurrency test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2663 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-18 19:31:06 +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
701657f2f1 Full Repository Export / Import Support - first checkpoint
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-30 18:38:03 +00:00
Derek Hulley
b3c0377af7 Fixed fallout from Hibernate upgrade.
- VersionCounter DAO was using unsupported getHibernateTemplate.save() method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-18 11:40:14 +00:00
Roy Wetherall
2bdace676d - Added update and inboundAndUpdate as example rule types that can be commented in.
- Added parameter to content update policy to indicate whether it is new content being updated
- Added triigers to support update rule type

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2275 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-01 14:26:17 +00:00
Roy Wetherall
0c7117681e - Fixed auto-version and added 'initialVersion' attribute to versionable aspect
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2150 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-19 15:55:27 +00:00
David Caruana
43dbda8de7 1) JCR Checkout/Checkin support
2) Fix issue with auto version when cm:versionable is first applied and version snapshot is created at end of transaction even though one may have been made explicitly in the transaction (moved condition to rule, not contained action)
3) Fix Search test after previous search change

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-10 17:41:32 +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