20794: Merged DEV/V3.3-BUG-FIX to V3.3
20792: Fix for unit test failures introduced by check in 20771
20791: ALF-3568: Include axiom jars in WAS shared library to solve Quickr connector issues
20785: Merged DEV/BELARUS/V3.3-BUG-FIX-2010_06_14 to DEV/V3.3-BUG-FIX
20644: Function for the browser window closing was implemented. For IE browser the trick with window opener was used. Fixes ALF-1004: After closing Details Space, user doesn't return to his previous location
20784: Fix for ALF-3516: Enterprise 3.X / Impossible to Create a Blog with Special Characters in the Title (?/!)
20783: Fix for ALF-1087: Documents checked-out from Share do not have "Upload new version" action in Alfresco Explorer
20782: Added multiday timed event handling to week view
20775: Merged V3.3 to DEV/V3.3-BUG-FIX
20670: Fix for ALF-3260: XSS attack is made in Wiki tab if First/Last user name contain xss. Also fixed double encoding errors found during regression testing.
20772: Update to node browser to show namespace of attributes.
20771: ALF-3591 - transferring rules.
- also extends the behaviour filter.
20770: ALF-3186 - action parameter values are not fully transferred - need to handle d:any
20768: AVM - ALF-3611 (OrphanReaper + PurgeTestP + additional NPE fixes)
20765: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
20708: DB2 build - add create/drop db ant targets (use DB2 cmdline - since not possible via JDBC/SQL)
20722: DB2 build - run db2cmd in same window (follow-on to r20708)
20764: Fix unreported JSON encoding issue with links components
20762: Fix ALF-2599: Share - Cannot search for user currently logged on
20759: DB2: fix FullNodeServiceTest.testLongMLTextValues (ALF-497)
- TODO: fix create script when merging to HEAD
20756: DB2: fix JBPMEngine*Test.* (ALF-3640) - follow-on (upgrade patch)
20746: DB2: fix WebProjectServiceImplTest.testCreateWebProject (ALF-2300)
20744: DB2: fix JBPMEngine*Test.* (ALF-3640) - missed file
20743: DB2: fix JBPMEngine*Test.* (ALF-3640)
20729: AVM - fix purge store so that root nodes are actually orphaned (ALF-3627)
- also prelim for ALF-3611
20720: (RECORD ONLY) ALF-3594: Merged HEAD to V3.3-BUGFIX
20616: ALF-2265: Share 'Uber Filter' part 2
- WebScriptNTLMAuthenticationFilter detached from its superclass and renamed to WebScriptSSOAuthenticationFilter
- Now the filter simply chains to the downstream authentication filter rather than call its superclass
- This means the same filter can be used for Kerberos-protected webscripts as well as NTLM
- Wired globalAuthenticationFilter behind webscriptAuthenticationFilter in the filter chain in web.xml
- Configured webscriptAuthenticationFilter for Kerberos subsystem
20719: Merged DEV/TEMPORARY to V3.3-BUGFIX
20696: ALF-3180: when using NTLM SSO, a user needs to log in first into the web UI before being able to mount alfresco using CIFS
The absence of the missing person creation logic in “the org.alfresco.filesys.auth.cifs.PassthruCifsAuthenticator.authenticateUser()” method was fixed.
20718: Merged DEV/TEMPORARY to V3.3-BUGFIX
20659: ALF-3216: Incomplete settings for Lotus Quickr
The protocol,host,port and context are removed from properties and a dependency on the org.alfresco.repo.admin.SysAdminParams interface is introduced.
20711: Latest SpringSurf libs - fix for ALF-3557
20710: Merged HEAD to BRANCHES/DEV/V3.3-BUG-FIX:
20705: Fix ALF-3585: AtomPub summary can render first part of binary content resulting in invalid XML
20691: Merged DEV/TEMPORARY to V3.3-BUGFIX
19404: ALF-220: Editor can't rename files and folders via WebDav
The Rename method of FileFolderService was used in case of file renaming instead of move method in WebDAV MOVE command.
20663: ALF-3208 RenderingEngine actions should no longer appear in the list of available actions that can be fired using rules.
20656: ALF-2645: LDAP sync now logs 'dangling references' for debugging purposes
20651: ALF-485: FTP passthru authenticator logs authentication failures at debug level to avoid noise in the logs
20646: Merge V2.2 To V3.3
14301 : RECORD ONLY - ETWOTWO-1227 - fix to serialize FSR deployments.
14618 : RECORD ONLY - Merge HEAD to 2.2 13944 : After rename project deploy option disappears.
20637: ALF-3123: Avoid NPE on Oracle when loading empty string values persisted through JMX and the attribute service
20633: ALF-2057: LDAP synchronization lock now persists for a maximum of two minutes (instead of 24 hours!)
- The exclusive lock gained for LDAP sync from the JobLockService is now refreshed at 1 minute intervals and never persists for more than 2 minutes
20628: ALF-1905: Allow use of anonymous bind for LDAP synchronization (NOT authentication)
- Previously synchronization AND authentication shared the same setting for java.naming.security.authentication, meaning that if you tried to use anonymous bind for the synchronization side, the authentication side would complain.
- Now there are two independent environments declared for the 'default' synchronization connection and the authentication connection
- A new property ldap.synchronization.java.naming.security.authentication declares the authentication type used by synchronization. Set to "none" for anonymous bind.
20623: Fix for ALF-3188 : Access Denied when updating doc via CIFS
20620: Merge DEV to V3.3-BUG-FIX
20456 - ALF-1824 : Setting alfresco.rmi.services.host on linux does not use specified host/IP
20617: Merged DEV/BELARUS/V3.3-2010_06_08 to V3.3-BUG-FIX (with corrections)
20606: ALF-651: Web Services client ContentUtils.convertToByteArray is broken
- org.alfresco.webservice.util.ContentUtils.convertToByteArray() method has been updated to cover large Input Streams conversion.
- org.alfresco.webservice.test.ContentUtilsTest is a test for the new functionality implemented in the ContentUtils class.
- org.alfresco.webservice.test.resources.big-content.pdf is a large content for the ContentUtilsTest.testInputStreamToByteArrayConversion() test.
20613: Fixed ALF-1746: Metadata extractors are unable to remove ALL aspect-related properties
- putRawValue keeps hold of 'null' values
- All policies keep hold of 'null' values
- Only affects 'carryAspectProperties=false'
20609: Merged HEAD to V3.3-BUG-FIX
20578: ALF-3178 - Transfer Service - to transfer rule (ie. ruleFolder with it's children) the PathHelper should allow "-" (dash character)
20608: ALF-3178 - fix r20578 (mis-applied patch)
20594: WebDAV BitKinex compatibility fix - Let the XML Parser work out the body encoding if it is not declared in the Content-Type header
20588: (RECORD ONLY) Merged V3.3 to V3.3-BUG-FIX
- Merged across all differences from V3.3
20778: Added revision to version label.
20777: Fix for ALF-2451 - installer correctly configure Share port
20722: DB2 build - run db2cmd in same window (follow-on to r20712)
20721: DB2 build - fix create target and add "/c" to exit "db2cmd"
- TODO: add wait/timeout target, ideally checking for created DB
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16798: Fix for ETHREEOH-1305. Null Path error if user clicks on Next Item icon on View Details page.
16800: Fix for ETHREEOH-2884 - Language icon near the content is displayed as "NULL". User can't change any language.
16805: Merged DEV-TEMPORARY to V3.2
16789: ETHREEOH-1895: Performing "Done Editing" action simultaneously leads to NPE
16806: ETHREEOH-1898 - Delete icon missing from Shortcut list in Shelf
16807: Fix for ETHREEOH-2356 - Error message appears when user tries to apply template to locked content.
- missed one of the actions with the evaluator wrapping first time around.
16808: Minor javadoc update
16815: XHTML compliance fixes. Dashboard pages etc. now render as fully compliant XHTML again.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15908: Merged V3.1 to V3.2 (record only)
15907: Merged V3.2 to V3.1
15683: Fixed potential concurrency issues in HeartBeat and LicenseComponent
15972: Merged V3.1 to V3.2
15429: **Record only** I18N message IDs for JSF dashlets
15947: ETHREEOH-2565: The content size shown in the preview popup is incorrect
15952: Part of fix for ETHREEOH-2493 - missing html encoding on webscript 404 html status page.
15953: Fix for ETHREEOH-2364 - LDAP sync missing last name displayed as null.
15956: Fix for ETHREEOH-2714 - html encoding in Create New User summary page.
15957: Merged DEV-TEMPORARY to V3.1
15865: Fix for ETHREEOH-2673
15958: Merged DEV-TEMPORARY to V3.1
15885: ETHREEOH-2615: Localization Issue - Japanese UI
15959: Merged DEV-TEMPORARY to V3.1
15882: ETHREEOH-2644: Sending Email using Template throws exception
15962: Fix for ETHREEOH-2390
15963: Fix ETHREEOH-1962: Hibernate flush ordering incorrect for alf_qname
15965: Merged DEV/BELARUS/V3.1
15949: ETHREEOH-2689: When upgrading from 2.1.7e to 3.1.0e/3.1.1e user roles are mapped incorrectly
15966: Merged V2.2 to V3.1
15948: (RECORD ONLY) Backport of the fix provided for ETHREEOH-1719.
15969: Prep for ETHREEOH-2295 fixes and associated merges.
15970: Merged DEV-TEMPORARY to V3.1
14360: ETHREEOH-1571, ETHREEOH-1656, ETHREEOH-1404, ETHREEOH-953, ALFCOM-2650, ETHREEOH-1572, ETHREEOH-1574
15331: ETHREEOH-2295 - LayeredFile: Layer file/folder is present when original file/folder is removed
15824: ETHREEOH-2295 - higlight stale object
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/BELARUS/V3.1:r15865,15882,15885,15949
Merged /alfresco/BRANCHES/DEV/3.1SP2:r14360,15331,15824
Merged /alfresco/BRANCHES/V2.2:r15948
Merged /alfresco/BRANCHES/V3.1:r15907,15947-15962,15964-15970
Merged /alfresco/BRANCHES/V3.2:r15908,15972
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16887 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12786: Merged V2.2 to V3.0
12783: Merged V2.1 to V2.2
12779: ALFCOM-2277 - Copyright notice needs updating to be for 2009
12787: ALFCOM-2277 - Copyright notice needs updating to be for 2009 (continuation)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6609: Portlet UI (doclist, myspaces, mytasks) updates following design review
6610: AR-1270
6611: debugging WCM-778.
6612: Improved API documentation.
6613: Added store lookup cache to EHCache config for default and extended cluster sample
6614: AWC-1531 and AWC-1146. Link objects that have targets which the user does not have access to are now filtered from the view.
6615: AR-1664: Bootstraping from full export fails if file names differs only with a space: my file, my file
6616: Fixed AR-1519: Possible duplicate entries when moving nodes between stores
6617: Removed deprecated aspects; Added emailed aspect to messages; Added OOo command line options
6618: Fix for AWC-1350
6619: Fix for AWC-1509
6620: AWC-1179: Searching for users in Invite User Wizard is slow with large number of users
6621: Changed shutdown logic to avoid classloader cleanup race.
6622: Fix for AWC-1533 (can't save office docs to Company Home)
6623: Fix for AR-1705
6624: Better fix for AWC-1256 (links generated by tinyMCE editor)
6625: Fixed AR-1713: Transformers that do nothing don't break full text indexing
6626: Fixed AWC-1438: Added explcit TXT to PDF converter that wraps the PDFBox TextToPDF class
6627: Portlet templates now handle missing description property on web form
6628: Fix WCM-788
6635: Make workflow available for users who cannot see company home
Resolved conflicted state of 'root\projects\repository\source\java\org\alfresco\repo\workflow\jbpm\JBPMEngine.java'
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6580: AVM bulk import performance tweaks.
6582: WCM-767, WCM-768
6583: Fix for AWC-1528 (potential NPE in ErrorsRenderer)
6584: Fix for AWC-1256 (Links produced by inline HTML editor are incorrect)
6585: AR-1635: event listeners added in a beforeCommit event are now executed successfully
6586: AR-1561 Update Web Scripts readme.html to be consistent with "Category Search Sample" (or vice-versa)
6587: Fix for AWC-1390 (Paste all doesn't work for forum items)
6588: AR-1701 Script getDocument call doesn't check for non-existent content
6589: Fix for AWC-1530 - Saved search does not work for custom properties of type d:text with list constraint
6591: Improvement for submit speed.
6592: Removed obsolete tests.
6594: Index tracking sample to include AVM index tracking
6595: Added the AVM helpers methods from the FreeMarker AVM API that were missing from the JavaScript API
6597: Rationalize post commit execution hooks for deployment receiver
6598: Properly escape path names for ProgramRunnable.
6599: AVM store name lookup cache is (theoretically) clusterable.
6600: Some or other gramatically incorrect stuff about Chiba.
6601: Fix for AR-1121 and AR-1673
6602: AR-1655: Versioning is not MLText aware
6603: Updated messages from lang packs
6604: Fixed AR-1476: JCR import end element escaping
6605: Updated Japanese lang messages
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6746 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6535: adding in handlers for renames and deletes of webforms to update web project configurations.
6536: fix to monthpicker.
6537: Cluster sample config for ticketsCache defaults to replicating puts
6538: Invite web users wizard was not correctly initialising
6539: AWC-1474 - Email Space Users dialog - if no email recipients then show message
6540: Fixed remote classpath check for SDK projects
6541: AR-1544: Inbound Rules Being Fired on Name Property Update
6542: Fix for AWC-1216 - changed NavigationBean to spot when CIFS server is disabled (as the method has changed in repo)
6543: AR-1623: WebServices authentication errors during concurrent load test
6544: AWC-1253: AddContent action should be externally configurable/overridable
6545: Fixed AR-1586: Nicer message when installing older module or duplicate module
6546: AWC-1301: Access Denied viewing details of content with association
6547: AWC-1499: It is impossible to remove 'Complianceable' aspect with the help of Run action
6548: Missing file ... should fix build issues
6549: Missed file .. fixed build issue
6550: AWC-1092: sorting by version number in version history is alpha, not numeric
6551: AWC-1217: Cannot differentiate between two users with same name in user picker search results
6552: Fixed AR-1572: Export of ML-enabled documents can now be imported
6553: Removed tabs
6554: Fixed handling of SC_NOT_FOUND message
6555: Fixed AR-1627: Removed ability to flush transaction resources on demand
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6744 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Added new aspect definition to support Webscript custom views.
Web context path (i.e. /alfresco) is now automatically prefixed onto webscript urls specified in JSF runtimes.
Modified the existing webscript dashlet JSPs to remove the hardcoded /alfresco path.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5973 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Import action moved to top-level in the main browse screen now it is useful on a day-to-day basis.
The 'import' repository action (ImporterActionExecuter) extended to support import of any zip flavour file.
More zip flavour filetypes added to mimetype map.
Improved debugging output added to BasePathResultsMap for xpaths executed in templates.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5760 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
These files are their changes plus adjustments for formatting and immediate clashes
I anticipate that this will break the build, but there are too many changes coming to risk it.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5740 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
