34397: ALF-13064: Updated document lib WebScript to protect against access errors dealing with permissions of locked documents
34406: ALF-13069: Fix flash upload file selection page title corruption
34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode)
34439: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX
34438: Fix to issue where new Hazelcast based Share clustering was broken by a recent SpringSurf change to ServletRequestContextFactory bean config in libs rev 1028 or higher.
34443: ALF-11433: IE8 specific fix to ensure that document-picker panel is hidden before documents selected event is fired and for TinyMCE to set focus on editor so that content is added correctly
34457: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
34354: ALF-12995 - IMAP: File is modified when received as a message in IMAP account
34444: ALF-12169: Guest/guest/gUest username is now normalized to corresponding person's user ID during authentication, solving problems with synchronization with Active Directory's Guest account
34454: Java 1.6.0_31 for 3.4.9 and 4.0.2
34458: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
34392: ALF-13146: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
33813: ALF-12736: Stack specific: 'Getting updates failed' notification appears when non-admin user creats DWS
- From Pavel: "Some users from ldap don't have lastName. That is why NPE occurs."
34459: Merged V4.0 to V4.0-BUG-FIX
34391: Merged DEV to V4.0 (with corrections)
34390: ALF-13013 : It's impossible to change Activities Feed properties on Websphere
Now the Schedule subtree in JMX is set to the correct MBeanServer.
34407: Merged HEAD-2011_12_06 to V4.0 (4.0.1)
Updated copyrights
32813: ALF-4098: WCM: Assets in in-flight worflow are allowed to be edited.
Ability of editing assets submitted to 'in-flight' workflow has been removed:
- .AVMSyncService. service interface was expanded with new method .List<AVMDifference> compare(int srcVersion, String srcPath, int dstVersion, String dstPath, NameMatcher excluder, boolean expandDirs). to introduce ability of collecting all created/modified items in created/modified folder;
- all .AVMSyncService. implementations were expanded in accordance with changes in interface;
- new tests for newly created items, items in modified folder and for deleted items in modified folder were added
34414: ALF-11607: Bootstrap fails against database 'DB2/LINUXX8664'
- Patched hibernate jar to recognize DB2 64 bit Linux
34416: ALF-12992: Updated weblogic DD for SOLR
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12994: Merged V3.0 to V3.1
12931: Merged V2.2 to V3.0
12635: Fix for ETWOTWO-995: Diff performance degrades on large data sets
12742: Fix for ETWOTWO-981: WCM - regression - revert fails (eg. for content publisher)
12743: AVM - add missing tests to test suite & fix existing tests (including base setup)
12759: AVM - build/test fix - follow-on to r12742
12781: Fix PersonDAO - fixes AuthorityServiceTest which failed after adding AVMServicePermissionsTest
12932: Merged V2.2 to V3.0
12763: Support for ETWOTWO-975: AVMDifference now implements Comparable<AVMDifference>
12782: Fix for ETWOTWO-939: Content Contributor cannot edit their own items
12809: Test fixes after r 12782
12818: ETWOTWO-977 (Orphan Reaper) - removal of comment questioning cache interaction.
12933: Merged V2.2 to V3.0
12306: (record-only) Final set of XSS and HTML encoding fixes for ETWOONE-90 - already merged (see r12310)
12934: Merged V2.2 to V3.0
12311: (record-only) Fix for ETWOONE-389 - Current page number not always visible on the browse screen - already merged (see r12312)
12935: Merged V2.2 to V3.0
12320: (record-only) Fix for ETWOONE-87: Behavior of delete cascade - already merged (see r12324)
12322: (record-only) Fix merge issue (marked as Do Not Merge - see CHK-5607)
12936: Merged V2.2 to V3.0
12775: (record-only) ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException (back-port of r11966)
12937: Merged V2.2 to V3.0
12780: Fixed ETWOTWO-1003: DuplicateChildNameException not generated correctly (on Oracle)
12820: Update to ETWOTWO-926 (WCM Form Inline callouts to Web Scripts)
12825: Further ETWOTWO-926 update: provide compatibility with old token scheme as the original patch has already made its way into 3.0.1
12850: ETWOTWO-975 - Show Conflicts in Modified Items List
12938: Fix merge typo (follow on from r12931)
12941: Fix merge typo (follow on from r12931)
12998: Cleaned up svn:mergeinfo entries
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r12931-12938,12941
Merged /alfresco/BRANCHES/V2.2:r12306,12311,12320,12322,12635,12742-12743,12759,12763,12775,12780-12782,12809,12818,12820,12825,12850
Merged /alfresco/BRANCHES/V3.1:r12994,12998
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
1. Refines the semantics of ghost creation, so that they only appear when
warranted.
2. Implements a mechanism for filtering out files which should not appear in comparison
results or be pushed along by updates.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
to using SSL when needed. Restructured exports of AVM specific apis to authenticate
remotely and pass the ticket with each remote service call. These required some changes
to jndi-client and even to the web-client which uses the AVM remote interface within
the Alfresco server. Oh, the point of this is that since I'm writing some CLTs, I might
as well do them correctly; we'll need the option of security sooner rather than later.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4489 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
preferred parlance or submit if you have a certain background) is
substantially working, passing a handful of basic tests. Compare
harmlessly returns no differences always, so Kev can program against
it if he's so inclined.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3785 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
cm:avmcontent and cm:avmfolder are 'abstract'. cm:avmplaincontent is derived
from cm:avmcontent and is just a plain file. cm:avmlayeredcontent is derived
from cm:avmcontent and is (surprise) a layered file and has a d:noderef mandatory
property, cm:avmfileindirection, that is the (possibly non-existent) file that
the layered file is transparent to. cm:avmplainfolder is derived from
cm:avmfolder and is just a plain directory. cm:avmlayeredfolder is a layered
directory and has a property, cm:avmdirinderection, that is the (possibly
non-existent) directory that the layered directory is transparent to.
The ContentModel QName constants are.
TYPE_AVM_PLAIN_FOLDER
TYPE_AVM_LAYERED_FOLDER
TYPE_AVM_PLAIN_CONTENT
TYPE_AVM_LAYERED_CONTENT
PROP_AVM_DIR_INDIRECTION
PROP_AVM_FILE_INDIRECTION
One can now create all four flavors of avm nodes through
AVMNodeService.createNode(). The advantage of using these over the
corresponding AVMService methods is that since (for now) AVMService, is
permission and indexing unaware.
Backed out cm:mounted aspect and dispatching code in DbNodeServiceImpl.
(Dave and Derek, you may now relax) as we are implementing the UI with
AVM dedicated screens.
Finally, beginning interface for AVM node tree synchronization and comparison.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
