Derek Hulley
0c10d61a48
Merged V2.0 to HEAD
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
- FLOSS
- Some files will need a follow-up
-root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
-root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
-onContentUpdateRecord (not on HEAD)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-16 06:44:46 +00:00
Paul Holmes-Higgin
31c250682b
Changed licence headers
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-08 18:59:58 +00:00
Gary Spencer
da8354996b
Delete file would report two status codes if a delete failed due to access denied. Fix for AR-1005.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5032 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-05 09:35:34 +00:00
Gary Spencer
5850d4a6f2
Don't show link nodes in FTP. Short term fix for AR-1198.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4995 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-01 11:40:29 +00:00
Gary Spencer
363bb82299
Start a transaction before calling into auth service during login. Fix for AR-1183.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-24 12:03:46 +00:00
Derek Hulley
ff07ea1e7d
Merged 1.4 to HEAD
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4192 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4197 .
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4205 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4206 .
svn resolved root\projects\repository\source\java\org\alfresco\filesys\server\config\ServerConfiguration.java
svn revert root\projects\repository\config\alfresco\version.properties
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4219 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4224 .
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4631 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-18 11:58:55 +00:00
Gary Spencer
2e2dbf62f1
Checkpoint of file state refactoring.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4417 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-22 11:11:54 +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
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
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
Gary Spencer
295d1cd0b6
Fix processing of SIZE command, not passing the session object to the getFileInformation() call (AR-443).
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2455 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-21 13:33:45 +00:00
Gary Spencer
f6eb2a5394
Fix bug in FTP root folder listing.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2328 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-08 18:44:24 +00:00
Gary Spencer
385d11b33a
Added guest user support to FTP server/filesystem authenticator. Changed authentication to use the standard authentication classes so FTP should work with LDAP and Kerberos setups.
...
Fixed server session transaction rollback problem.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-06 17:50:25 +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