17667: Branch for SpringSurf integration - from HEAD r17665
17668: Fix to ensure included scripts files are not loaded from a cached classpath loader.
17670: Part 1 of SpringSurf integration - changes relating to spring-surf-core-1.0.0.CI-SNAPSHOT.jar
17674: Part 2 of SpringSurf integration - changes relating to spring-surf-core-configservice-1.0.0.CI-SNAPSHOT.jar
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13265: Fix incorrect wiring of guest user name
13266: Merged V2.1A to V3.1
13252: Fix ADB-159: Generation of content model xml throws exception
13267: Remove accidental addition of folders
13280: IndexTransactionTracker logging changes
13281: Added bean to push properties from repository properties into the VM properties
13283: Added forgotten Hibernate diff file after JAWS-223 fix
13291: Fix ETHREEOH-1340: Alfresco Repository Draft CMIS Implementation" link refers to localhost
13297: Fix ETHREEOH-885: workflow mapAuthorityToName tests don't handle sub-classed objects correctly.
13308: First part of JAWS-215 - permission migration from V2.1-A to V3.1
13313: Build fix for 2.1-A to 3.1 ACL patch
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r13252
Merged /alfresco/BRANCHES/V3.1:r13265-13267,13277-13283,13286,13289,13291,13295,13297,13308-13313
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13175: Basic implementation of timestamp propagation
13176: Fixed ETHREEOH-1172: NodeService.getProperties sometimes returning instance of "Collections.SingletonList"
13184: Merged V3.0 to V3.1
13179: Merged V2.2 to V3.0
13141: Fix for ETWOTWO-1109: WCM - content publisher cannot submit modified assets (2.2.3-dev regress)
13144: Fix for repopened ETWOTWO-1082: AVM has concurrency limitations via CIFS/NFS/FTP ...
13180: Merged V2.2 to V3.0
13144: Fix for repopened ETWOTWO-1082: AVM has concurrency limitations via CIFS/NFS/FTP ...
13185: Logging enhancements to FileFolderService to aid debugging of ETHREEOH-1247
13187: Changed NPE to IllegalArgumentException
13191: Fix for ETHREEOH-1267 malformed JSON.
13203: Fix ETHREEOH-1309 regress
13205: Fixed typo of UNKNOWN
13206: DM index check - allow index transaction tracker to be reset, etc
13213: Fixed ETHREEOH-1313: System Property Overrides not working when using the installer
13214: WCM services - add/update unit tests - CRUD using different roles
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13179-13180
Merged /alfresco/BRANCHES/V2.2:r13141,13144
Merged /alfresco/BRANCHES/V3.1:r13172,13175-13176,13179-13181,13184-13189,13191,13203,13205-13206,13210-13215
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13484: ETHREEOH-1547: Do not set requiresNew flag and propagate exceptions in BaseDialogBean
13383: ETHREEOH-1220: Update LDAP-authentication-context to include allowGetEnabled entry to support Share
13381: ETHREEOH-1181: NTLM authentication periodically fails over CIFS - "Read-Write transaction started within read-only transaction"
13376: ETHREEOH-279: Friendly error message when cm:filename regular expression constraint is violated
13364: ETHREEOH-814: Correct character encoding issues in LDAP synchronization
13353: ETHREEOH-1444: Ability to run Alfresco from unexploded .war file with embedded license
13328: ETHREEOH-1400: Prevent TLD warnings on Weblogic startup
13183: Follow up to 13177: Fixes for Weblogic compatibility
13177: Fixes for Weblogic compatibility
13109: Build/test fix (to avoid unintentional import via application-context.xml)
13100: Checkpoint for new DM index check (enterprise-only)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
9845: Merged V2.2 to V2.9
9733: Merged V2.1 to V2.2
9281: Improvements to index AUTO recovery
9316: Fixed ETWOONE-193: Transactional caches not being cleaned up after rollback (2.1.4 regression)
9317: Fixed ETWOONE-194: Faster void handling during index tracking
9365: Improved performance for finding which snapshots have been indexed
9413: Support to retrieve read/write state of the transaction and ensure Lucene commits are handled last
9414: ACT-3245: Updating node properties and aspects don't bump the alf_node.version value
9415: Code cleanup: Removed unnecessary empty methods
9416: Fixed creation of multiple thread pools
9417: Full index recovery absorbs indexing exceptions by default
9418: Added AUTO index recovery option to sample in line with Wiki docs
9419: ETWOONE-194: Index tracking is too slow
9420: Fixed ETWOONE-201: Better logging and configurability for RetryingTransactionHelper
9421: Fixed ETWOONE-202: SPlit person cleanup doesn't break read-only transactions
9422: Follow up on CHK-3317: Removed use of JDK 1.6 NavigableMap interface
9423: Fixed unit test after CHK-3317
9424: More test fixes after CHK-3317
9425: Ensure that index tracking tests don't run too long.
9426: Made concurrent reindexing optional. It is on by default.
9509: ACT-3539: Mid-transaction locking on Lucene resources
9547: Multithreaded index tracking startup: Handle previously lagging single-threaded rebuilds
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
9018: MT: system-wide jobs should run across all stores/indexes
9204: Merged V2.2 to V2.9
8633: Merged V2.1 to V2.2
8629: Merged V2.1-A to V2.1
8493: Fixed ADB-51: ImporterBootstrap doesn't use transaction retrying
8494: EHCache and JGroup patches and upgrades
8546: ACT-1650: performance optimization
8550: Fixes to transactional cache handling
8553: Fixed tests: MLText is a Map, but will always have at least one entry, even that entry is null.
8583: ACT-954: IndexInfo files now reopen when they close (for whatever reason)
8640: Merged V2.1 to V2.2
8638: Used correct exception type for IO channel reopen logic
9102: Unit test to check that transactional cache size overrun is handled
9106: Merged V2.1 to V2.2
9043: Fixed AR-2291: SchemaBootstrap lock is only required before first SQL execution
9045: Fix AR-2291: SchemaBootstrap lock is only required before first SQL execution
9047: Fixed AR-2305: Index tracking in AUTO mode doesn't report anything on bootstrap
9048: Fixed AR-2300: Random-based GUID instead of time-based GUIDs
9049: Fix patches to only run once
9050 <Defered>: Changed getString() method to use the available buffer length rather than a hard coded value.
9060: Fixed ETWOONE-109 and ETWOONE-128: RetryingTransactionHelper fixes and improvements
9061: Fixed NodeRefPropertyMethodInterceptorTest
9075 <Defered>: Added delete permission check when marking a file for delete on close. ETWOONE-141/ACT-2416.
9080: Fixed EHCache source zip
9081: Fixed ETWOONE-118: Tomcat failed bootstrap doesn't clean up EHCache cluster structures
9085: Fixed ETWOONE-154: Added JSR107 Jar to WAR
9115: Fixed test: TransactionalCache uses LRU so repeatedly checking if a entry is there keeps it in the cache.
9206: Merged V2.2 to V2.9
8857: Improvements to ACL performance for large ACLs
8951: Always check permission entry changes are made at position 0
9219 <No change>: Made NTLMLogonDetails class Serializable, port of r8973.
9220: Added delete permission check when marking a file for delete on close. Port of r9075.
9222: Merged V2.1 to V2.9
8683: Early warning for nodes indexed in the wrong store (ACT-964)
8684: Enhanced tests
8685: Enhanced tests
8686: Additional tests
9223: Merged V2.2 to V2.9
9120: Merged V2.1 to V2.2
8740: Fix for AR-2173 - do no recheck case of the user name when validating tickets (it has been done)
9122: Additional unit test from support case.
9224: Merged V2.2 to V2.9
9076: Fixed ETWOTWO-426: Upgrading alfresco from 2.1.1 to 2.2 throws errors with Mysql 5.0.51
9104: Merged V2.1 to V2.2
9025: Fixed AR-2314, AR-2299: Optimizations after profiling
9105: Merged V2.1 to V2.2
8745: Fix AR-2233 (regression introduced by fix for AR-2221)
9121: Merged V2.1 to V2.2
9017: Fix index back up failing due to background index merge/deletions (inlcudes back port of CHK-2588)
9137: Incorporated additions from Will into AVM console (ETWOTWO-439)
9225: Merged V2.1 to V2.9
8641: Merged V2.1-A to V2.1
7729: Fix to Repository Web Service (queryAssociated) to allow reverse association lookup (ie. given target, get the source)
8673: Fix for AR-2098 - shorter URL form now has NTLM filter mapping example in web.xml
8682: Fix for AR-2005
8695: AR-2054.
8696: Improved sort test to include prefix form of field name
9226: Fix ALFCOM-994 (see also earlier change in r9223)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8105: Fix for AR-1828 - multiple users being created from web siteregistration
8107: Merged V2.1 to v2.2
8106: Fixed fallout from MetadataExtractors setting properties to thecorrect data type
8109: Fix for AR-2016
8119: AR-1778: putContent method in the ContentUtils class fail to upload*.java, *.txt, *.xml
8120: AR-1895: fix to web service SDK sample
8125: Test added to prevent regression of AR-1707
8126: Enhanced exception message when non-marking InputStream is used.
8131: Merged V2.1 to V2.2
8129: Merged V1.4 to V2.1:
8128: Fix AR-2041: NPE checking voids during index tracking
8140: AR-1762 - correct generation of download servlet URL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7127: Merged V2.1 to V2.2
7118: Fixed overly-eager applicability of patches brought forward from previous releases
7119: Fixed SQL script patch schema numbering
7245: Merged V2.1 to V2.2:
7238: Serializes alfresco->alfresco deployments to the same target.
7241: Added AVM index tracking into the built-in, cron-controlled config.
7242: More DEBUG messages for index tracking, where required.
7243: Fix for url encoding issue as found by by Ishii Akinori
7372: Merged V2.1 to V2.2
7289: Fix for AWC-1542 where utf-8 characters not displaying correctly in RSS feed output
7300: Bumped up session size management values to reduce potential issues with mix-style, shorter transactions.
7303: Portlet updates for MSIE problems in Liferay.
7304: Added the <cifs-url-suffix>. AWC-1671.
7317: Fix OO shutdown
7319: Catch for raising rule executions using null NodeRefs.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6950: Fix for forum issue (6111) when using xsl:include
6951: Partial fix for WCM-862
6952: Merged V1.4 to V2.1
6921: Reindex tracking refactoring.
6954: Merged V1.4 to V2.1
6927: Config and startup changes for index tracking
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
