- Minor JLAN changes (backward compatible)
- CIFSAuthenticator implements an interface (to allow dynamic proxying to authentication subsystem)
- CIFSAuthenticator accesses ServerConfiguration via ServerConfigurationAccessor interface and doesn't retain references to config sections (again to allow dynamic proxying and hot swapping)
- ConfigSections have way of directly setting container initialised authenticators, sharemappers, etc.
- Authenticators, etc. still support initialisation from config service in backward compatible manner.
- Most of ServerConfigurationBean moved to AbstractServerConfigurationBean superclass.
- New org.alfresco.filesys.config package with ServerConfigurationBean implementation and supporting classes that can be initialised by a Spring container.
- File server authenticators moved into authentication subsystem. TODO: Kerberos and NTLM
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13795 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12999: Fixed read-only bootstrap of SiteAVMBootstrap and removed incorrect use of 'assert'
13000: Added log4j to Eclipse classpath (unexported)
13001: Merged V2.1-A to V3.1
9127: Performance improvement to folder copy
9151: *RECORD-ONLY* Fix index back up failing with missing files
13002: Merged V2.1-A to V3.1
9174: Further fixes for ACT-2588 (Lucene backup read-write locks)
9279: Fix ADB-84. PHP module is not restricted by the upper version
10191: Fix for ADB-77: Need to have as the sender's email address the email address of the user triggering the rule
13006: Merged V2.1-A to V3.1
10893: Fixes for ADB-78 & ADB-98
- Fixed service getter/setter pattern as well
10903: Fix for ADB-115 ACT-4355
13010: Made AVMLockingBootstrap resilient to read-only mode
13011: Better message for InvalidStoreRefException
13013: Merged V2.1-A to V3.1
9189: Composite Conditions Support Part 1 of 2 (repo)
9190: Composite Conditions Support Part 1a of 2 ( missed file from repo)
13015: Port of Adobe CIFS/FTP configuration changes
13017: Convert avoids folders given by '--svn-status' option
13018: Merge V2.1A to V3.1
7746: (record-only) Added ability to specify a custom CIFS authenticator class
8533: (record-only) Added the <disableNativeCode/> configuration tag, disable use of JNI code on Windows
8700: (record-only) Update to prevent any native calls via configuration code
8705: (record-only) Filer out the '0.0.0.0' bind address
8864: (record-only) Added the getBean() method for custom authenticators to get access to beans
9054: (record-only) Added the 'AIX' platform type for use in the platforms="..." attribute
8863: (record-only) Fix passthru socket connection timeout, added 'protocolOrder' and 'offlineCheckInterval' config values
12144: (record-only) CIFS virtual circuit fixes
13020: Merged V2.1-A to V3.1 (Composite Actions)
9191: Composite Conditions Support Part 2 of 2 (client)
9243: Composite Conditions Support Part 1 of 2 (client)
9245: Composite Conditions Support Part 2 of 2 (repo)
13021: Merged V3.0 to V3.1
13008: Merged V2.2 to V3.0
12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933
13024: Ported CIFS configuration changes from Adobe V2.1A, missed checkin.
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r9127,9151,9174,9189-9191,9243,9245,9279,10191,10893,10903
Merged /alfresco/BRANCHES/V3.1:r12999-13002,13006,13010-13011,13013,13015,13017-13018,13020-13021,13024
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11106: Leniency in AVM CAL upgrade to avoid customer upgrade issues ACT-4500
11129: ETWOTWO-460 Service Port for alfresco runtime
11144: Proper clean-up of deleted node's properties and aspects
11146: Modifications to enable 'alternatives' when running patches
11153: Fixed masked NPE when checking 'alternative' patches
11154: Some neat reporting when a patch doesn't execute as a result of an alternative patch having run
11161: ETWOTWO-91
11163: ETWOTWO-733: CheckOutCheckInService.getWorkingCopy(NodeRef) returns nodes ...
11165: Merged V2.1 to V2.2
10983: Close stream for audit config
11192: ETWOTWO-169 - Editing FSR Deployment Receiver causes password to be lost
11210: Merge of refactored AVM Filesystem storeCreated Processing from 2.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11227 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Added file access/change/modification timestamp tracking for open files via the file state cache.
Added set file information support for setting creation and modification timestamps, used by MS Office to transfer original timestamp to new document.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8265: Added catch blocks for the permissions service access denied exception to various file/folder operations
8286: Merged V2.1 to V2.2
8256: Fix broken WCM workflow.
8257: Partial fix for AWC-1850
8283: Merged V2.1-A to V2.1
8264: Fine-grained debug logging for exceptions causing transaction retries.
8288: Should fix workflow problems. Hard to test since almost nothing works right now.
8291: Added Peter's fixes to improve deployment start scripts
8294: Update deploy script from Peter
8298: Fix for WCM-1058:
8300: Commented out admin dashlet (active_tasks)
8359: Fix AR-1735: Customer-requested POI upgrade
8367: Fix for AWC-1639
8368: Fix for WCM-1102
8389: Revert changes between r8072 and r8251 from Schema2XForms.java
8401: Fix for WCM-1105
8407: Minor typo fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7121: Merged V2.1 to V2.2
7049: Fix for unreported duplicate component ID error (very rarely seen) in browse WCM sandbox JSP
7058: Fixes failure to rollback correctly on failed alfresco->alfresco deployment.
7074: Added filtering/access control checks to the AVM virtualization view.
7083: Added transaction handling to calls involving preview store
7084: xmlsec library update to 1.4.1
7092: Missing config update from the AVM filtering checkin.
7124: Merged V2.1 to V2.2
7091: Fix to several issues found with Regenerate Renditions wizard and FormsService
7125: Merged V2.1 to V2.2
7093: Fixes to workaround some deployment issues being experienced by a customer.
7094: Fix for previous build failure
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7373 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
