17620: Merged DEV_TEMPORARY to V3.2
17599: Fix for ETHREEOH-3308: xf:switch cannot be used in repeating field type
17634: Put back AVM concurrency checks (reverse r17405)
17644: Fixed up some comments and added return value to in-txn recording of deleted nodes
17647: Fixed read-only detection of ContentStoreCleaner
17648: Merged DEV fixes for ETHREEOH-3473 and ETHREEOH-3454 - DB script and iBatis-related changes
17649: Fixed problem after merge-in: ETHREEOH-3641: build 270: cannot install on PostgreSQL
17652: Fix ETHREEOH-3376 - Reindexer failure: requires rollback (Cluster)
17658: Removed failing concurrency test for split person cleanup
17659: Merged V3.1 to V3.2
17308: Fixed ETHREEOH-2310: Upgrade from 2.1 E Sp7 to 3.1.1 E build 225 - Duplicate alf_node_status entries detected
Fixes ETHREEOH-3606 (same as CHK-10454)
17661: Fixed DB2 iBatis problems related to http://issues.apache.org/jira/browse/IBATIS-536
17666: ETHREEOH-3376 / ETHREEOH-3637 - reindexer failure in a cluster (dictionary repo bootstrap)
17678: Follow-on to r17666 (for RM custom model)
17685: Merged DEV_TEMPORARY to V3.2
17676: ETHREEOH-3187: Creating Web Content based on Web Form with most elements-read-only/default failed
17695: Temporarily comment-out testSubmitChangedAssets1
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_24:r17632,17636,17676
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.2-2009_11_09:r17599
Merged /alfresco/BRANCHES/V3.1:r17308
Merged /alfresco/BRANCHES/V3.2:r17620,17634,17644,17647-17649,17652,17658-17659,17661,17666,17678,17685,17695
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18165 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17363: Fix to DbNodeServiceImple to allow restored nodes.
17384: Minor comments
17451: Fix ETHREEOH-2751 / ETWOONE-340 - specialising a node through an action doesn't set default values from model
17459: ETHREEOH-2391 - Invite pending task now has lots of properties
17465: Repo side fix for ETHREEOH-3010: Inbound and outbound Mltext multiple property are not converted correctly
17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVNSync compare -> WCM revertSnapshot)
17483: (record only) Merged V3.1 to V3.2 (record-only)
17482: (record-only) due to earlier back-merge
17493: Fix for ETHREEOH-3342: index.recovery.mode example is incorrect
17494: Fix for ETHREEOH-3027: missingFullTextReindexTrigger (from index-recovery-context.xml) job does not work.
17510: Fix for ETHREEOH-1147: Indexing large indices can lead to Java Heap space.
17511: Fix for ETHREEOH-1271: It is possible to add one category more than one time to the same content or space
17513: ETHREEOH_3366: Altered DictionaryDAOImpl so that passing a null QName into getType and getAspect does not result in an NPE
17531: ETHREEOH-1186: Corrected rssfeed.get.js so a user can configure a RSS Feed dashlet that has been placed on their own dashboard
17550: ETHREEOH-2317: Rule not fired when document has no content
17556: Fixed ETHREEOH-1229: Can't delete space that contains "translation without content"
17558: Fix for ETHREEOH-3356: Forms fail to persist if property or association name has an _ (underscore) in it
17572: Changed caching of person NodeRefs so that duplicates are detected better
17573: Fixed UTF-8 for file with encoded chars
17576: LockAcquisitionException message specific to failed release of taken-over lock
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.2:r17363,17384,17451,17459,17465,17478,17483,17493-17494,17510-17511,17513,17531,17550,17556,17558,17572-17573,17576
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
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
12297: Fix mysql config instructions for case sensitive user names - DOC-68
12298: Merged V2.2 to V3.0
12257: Fixed ETWOTWO-952: MLText properties not intercepted when calling addAspect and createNode
12270: Fixed RhinoScriptTest to propogate exceptions for full recording by Junit
12271: Fixed NPE in ML interceptor when null node properties are passed to createNode
12282: Merged V2.1 to V2.2
11616: Fix for ETWOONE-218: Common.js function needs to be changed to support root context
12287: Merged V2.1 to V2.2
12229: WCM - disable/hide link validation by defrault (ETWOONE-106, ETWOONE-392)
12301: Merged V2.2 to V3.0
12288: Merged V2.1 to V2.2
12233: Fixed ETWOONE-124: Add the property UUIDBinding to ImporterBootstrap
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6556: AVM performance tweaks
6557: WCM-758.
6558: Fixes WCM-753.
6559: better handling of rename, copy and paste for form instance data and renditions. addresses WCM-752 and partially addresses WCM-559.
6560: Renamed JndiTest.java until we decide to keep it or not.
6561: Oops.
6562: probable fix WCM-669
6563: Build fix after the removal of flushing suport
6564: Fix for WCM-728
6566: Support for avm index clustering via tracking - WCM-762
6567: Test fix after flush changes
6568: Fixed AWC-1517: Can now create space based on existing top-level space
6569: misc IE fixes.
6570: Various changes to improve AVM import performance and submit performance.
6571: Session flushing is now deprecated and doesn't fail with an exception.
6572: Reduced the iteration count to stress nextResults calls a bit more
6573: WS query sessions put back into cache after more results have been fetched.
6574: AR-1347: RepositoryServiceSoapBindingStub.queryAssociated() returns nothing when direction=target
6575: Fixed AR-1680: XPath metadata extraction now handles Node, NodeList and String return values
6577: Fix for AWC-1518 (User Homes renaming issue, and unreported issue with client config overriding of users home location)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Summary pop-up panel fade-out anim removed (improves user experience).
Reorg of broken action evaluator class hiearchy (after ML UI changes).
More fixes to ML UI (browse.jsp missing component IDs breaks screen when panels collapsed then expanded).
Code reorg in interceptors to help performance.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- These worked on the branch a flaw showed up on HEAD
- Moved ContentReader spoofing up into FileFolderService and ContentService using an interceptor.
Fixed bug when attempting to delete an archived item that was ML.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5768 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
- Fixed parsing of locale string to use I18NUtil.parseLocale and not Locale constructor
- Fixed type conversion of properties returned from MLPropertyInterceptor's directNodeService
- Fixed handling of ALL_LANGUAGES filter selection
- Fixed MultilingualContentService NPE when checking for duplicate locales
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Web Client support for changing content filter language
- I18NUtil support for contentLocale
- MLPropertyInterceptor handling of properties inbound and outbound
TODO:
- Is new Locale("") valid?
- Some more tests to ensure property interceptor is working
- Move interceptor into .sample config file
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- MLText type is persisted as a Serializable (TODO: investigate alternative storage)
- 'nodeService' bean is filtered according to the default locale to provide only String return properties
- Go direct to the 'mlAwareNodeService' bean to get access to unfiltered MLText properties
- TODO: Proper value searches respecting Locale hierarchy
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4526 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
