17495: Changed xforms-samples name to wcm-sample
17496: Minor fixes for day and week views when rendering new events
17497: *RECORD ONLY* Added Enterprise logo local copy.
17498: ETHREEOH-2933 - User can see contents of the moderated site if user is not a member of the site
- Site containers are now private and non member's can't see content.
- fix only applies to new moderated sites.
17499: ETHREEOH-2322 - Office Plugin: filename overlaps the plugin UI if longer than 40 characters without spaces
17500: Temorary build fix for site visibility
17508: ETHREEOH-1268 - Pages and Components show varying degrees of success handling "site not found" errors.
17509: Fix for ETHREEOH1733 - Wrong display of multi day events in Share
17514: View In Browser action for document list and document details actions.
17515: Merged DEV-TEMPORARY to V3.2
17471: ETHREEOH-3193: 'capitalize' in output path pattern works differently for templates (vs. XSDs)
17516: Missing css file from Edit Offline changes. Also "Checked out on/by" text changed to "Editing started on/by". Tags now comma separated
17517: Merged DEV-TEMPORARY to V3.2
17474: ETHREEOH-1211: Can't See Images in TinyMCE
17518: Office add-in: ETHREEOH-3361 - Workflow name is visible only before symbol &, ETHREEOH-2735 - Total number of founded items is not shown
17519: 3.2E help links
17520: 3.2E help links, plus ETHREEOH-1536 - Incorrect "insert into current document" function work for unsupported files in MS Office Addin
17522: Fix for ETHREEOH-3257 - Event becomes All day again after editing it to not All day
17526: Fix for unreported issue when rendering an edited event after the view is filtered via tag component causes an script error
17528: Fixed ETHREEOH-3364 " Admin Console - Group Search needs to show searching message and disable further requests while search is running"
- Disabling search button & message displaying "Searching..." after 2 seconds for long searches for the following components:
* Admin Console: Users - search user, add group
* Admin Console: Groups - search group, add group, add user
* Site: Members: People - search members, add people
* Site: Members: Groups - search membergroups, add group
* Site: Members: Pending invites - search invites
* Site: Doclib: Assign Workflow - add users
* People Finder
* Site Finder
- All component listed above uses max search result except the following where webscript services lacks support for it:
* Admin Console: Users - add group
* Admin Console: Groups - search group, add group
* Site: Members: Pending invites - search invites
- Bugfix: When minSearchTermLength is set to 0:
* Group Admin Console: switched to browse view
* User Admin Console: didnt do a search
- Bugfix: For some components minSearchTermLength & maxSearchResults were brought in as strings causing the global search's max result to be 1001 instead of 101
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18126 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17460: Refactored calendar views into separate objects
17466: Remote API part of fix for ETHREEOH-3268.
- Added simple webscript to return details of the authentication system, such as account creation allowed.
17473: ETHREEOH-3268 - UI part of fix.
- Add External Users is now disabled in Share if Alfresco instance does not support creating new users i.e. if LDAP or similar is used.
17479: ETHREEOH-2409 - Doc Library Details page displays incomplete action list; usability issue
17480: My Tasks dashlet - prevent display of fake date used for sorting
17484: Fixed ETHREEOH-2305 "It's impossible to implement a Search request with empty search field in Site Members area."
- Default settings can be applied in web-framework-config-application.xml:
<min-search-term-length>1</min-search-term-length>
<max-search-results>100</max-search-results>
and later be overriden in the properties section for each searchable components binding file.
- The components that override the min-search-term-length default value and set it to "0" are:
site-finder, site-members & site-groups
17485: Merged DEV_TEMPORARY TO V3.2
17468: Problem rendering field description (MultilingualTextAreaGenerator) for app:folderlink
17486: Merged DEV_TEMPORARY to V3.2 (record-only)
17487: Partial fix for ETHREEOH-3308 (xf:switch cannot be used in repeating field type), fixes 'extra' set of fields seen when using a maxOccurs of more than 1
17489: MERGED DEV/TEMPORARY to V3.2
ETHREEOH-3068 - WCM Create Web Content Wizard
17492: Fix for ETHREEOH-2598 documents uploaded via Share interface are not incremented as versions with CIFS/SMB interface.
- Auto versioning of documents now correctly handled via CIFS edit if an appropriate rule is applied to a doclib
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18123 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17429: Fixed ETHREEOH-2319 "Share - Sticky image or videos in web view"
17435: Fixed EETHREEOH-3325 "Add group button is disabled on Admin Console - New User page"
17445: Fixed ETHREEOH-3306 "Large number of root groups causes Groups admin tool to lockup the sever and Share"
- Search panel is now the default panel and the loading of root groups only occurs if you click the "Browse" button and change to the browse panel
17446: Fix for unreported issue where the InMemoryTicketComponent did not check for null value from ticketsCache.
Can occur on tomcat sesson expire and caused NPE to be logged.
17449: Merged V3.1 to V3.2
17257: *RECORD ONLY* Merged V3.2 to V3.1
13685: ACT 8490 - TinyMCE fails if told to load unsupported language (interim fix only) (ETHREEOH-1615)
17372: First part of fix for ETHREEOH-2519.
17448: Merged DEV-TEMPORARY to V3.1
17390: ETHREEOH-1619: Letters and special symbols can be typed in Date value of property while creation of Content Rule and it leads to error
17391: ETHREEOH-1058: It is possible to send invite email message with no subject from Web Project Wizard Step Seven - Email Users page
ETHREEOH-1060: It is possible to send empty invitation email from Web Project Wizard Step Seven - Email users page
17452: Fixed ETHREEOH-3306 "Large number of root groups causes Groups admin tool to lockup the sever and Share" part 2
- A "no result"-message was displayed to the user even though no search had been performed, now replaced by a usage message
17453: Fixed ETHREEOH-2329 " Search doesn't work correctly on Groups page"
17454: Fix for ETHREEOH-3084 - Error message appears in My Web Files part of My Alfresco Dashboard after configuring of the dashboard.
- added new JavaScript and Template APIs to retrieve child nodes of a specific type - using fast direct DB NodeService call.
17455: Fixed ETHREEOH-2329 " Search doesn't work correctly on Groups page" part 2
- Added the prefix "*" to admin console group search as well to make it consistent
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18122 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17355: Fix for ETHREEOH-2894 - TinyMCE html source edits are not persisted in some cases within forms
17360: Fixed IE error when rendering site and container pickers
17364: IE6 layout fix for DocLib toolbar and long filenames. Follow-up fix for r17360. Fix workflow pop-up.
17370: Fixed ETHREEOH-2926 "There is no restriction that's why layout is broken."
- new title limit is 256
- also moved Configure link to the toolbar as for the ret of the dashlets
- title words that are longer than the column are hidden (for all dashlets)
17371: Fixed styling in all themes for sites & search menu that was changed a bit after the last focus/accessability changes
17374: ETHREEOH-2513 - Null Pointer if log level is DEBUG
17376: Fixed ETHREEOH-2920 "Spaces are not trimmed in the string entered into Search User/Group field"
17379: Fixed ETHREEOH-1722 & ETHREEOH-1723 - subject & message must contain characters
- ETHREEOH-1722 "It is possible to send e-mail with Subject that consists of spaces"
- ETHREEOH-1723 "It is possible to send e-mail with empty Message field"
17382: Merged DEV-TEMPORARY to V3.2
16735: ETHREEOH-1382: It's impossible to find files with short names on Staging Sandbox
- User friendly message "Not enough information was entered to perform a search, at least one value must be entered or alocation selected to search within. Text fields require a minimum of 3 characters"
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18118 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17307: Merged DEV/BELARUS/V3.2-2009_10_19 to V3.2
17121: ETHREEOH-2999: Accessing Recent snapshots fails in a web project that is created from an already existing project
17223: ETHREEEOH-2999: (post-review changes)
17346: ETHREEOH-2824 - further perf improvement for multiple single submits (to active workflow sandboxes) from large modified list
17375: Fix ETHREEOH-1643 - WCM revert file & version history, including a few unreported WCM / UI revert file issues
17380: ETHREEOH-1643 - fix build/test fallout
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
18088: ETHREEOH-3787: Addition of liferay-display.xml to define category for demo portlet
18053: Build fix: Re-enable log ins to Alfresco web app when not running in a portlet container
- Removed direct dependencies between FacesHelper and portlet API
18037: Merged DEV/DAVEW/SURFPORTLET to V3.2
17669: Changes to enable surf rendering from a portlet
- New DispatcherPortlet forwards portlet requests to the DispatcherServlet as servlet requests.
- A new filter 'lazily' creates users' dashboard pages to avoid the need to have to redirect from site-index.jsp
- Build against JSR 286 portlet 2.0 API jar
- Exclude portlet API jar from war to avoid ClassCastExceptions
- Lazily init portlet authenticators to avoid ClassNotFoundExceptions when not running in a portlet container
- Fix web.xml schema validation problems
- UserFactory session keys given unique prefix to avoid class with Liferay shared session attributes
- Liferay deployment descriptor to enable user principal name resolution
- Fixed subsystem problem that prevented the override of a property with the empty string in alfresco-global.properties. Stopped 'unprotected' external auth from working.
18019: ETHREEOH-3770: LDAP sync now supports attribute range retrieval to get around limits imposed by Active Directory on multi-valued attributes
- Meant that groups with more than 1000 members were getting truncated in Active Directory
- Now switched on in ldap-ad and off in ldap subsystem
- Also switched off result set paging in ldap subsystem by default for wider compatibility with non-AD systems
17759: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
17755: ETHREEOH-3739: build 283: Upgrades from 3.1.1 and 3.1.2 fail on JBoss 5.1
- The getFile method was created for ImapFoldersPatch to retrieve acp file for ACPImportPackageHandler.
- This method tries to load ACP file from file location and if it is unsuccessful then creates temporary file from resource input stream.
- In other words we apply aproach from ImporterBootstrap.
17600: ETHREEOH-1002: Avoid using HTTP 1.1 chunked transfer encoding to send heartbeat data because some proxy servers can't cope with it!
- Unit test can now parse chunked and un-chunked HTTP requests
17597: Further optimizations to authority caching
- Don't invalidate entire user authority lookup cache when user added to or removed from an authority
17588: Fix up authority caching
- Need to include tenant domain in cache key
- Also reinstated cache of user recursive group memberships for performance purposes
17559: ETHREEOH-3440: Authority search performance improvements
- AuthorityDAO now uses Lucene (again) to do wildcard style authority searches by name, type and zone
- Retrieval by exact name, type and zone still performed by DB methods
- DB methods now optimized to avoid having to load group child nodes to determine group membership
- Authority cache now stores authority node refs by name to reduce authority resolution queries
- ScriptGroup avoids hammering repository with multiple searches to determine group membership
17545: ETHREEOH-3371: Fixed group searches to search within the default zone and thus hide 'invisible' WCM and Share groups.
17527: ETHREEOH-3375: Use static inner class for cache key to avoid non serializable exceptions
17523: ETHREEOH-3337: Fix NPEs in RepoServerMgmt operations
- Transactional cache can have entries with non-null keys and null values
17521: ETHREEOH-3158: Proper handling of user validation failures in Kerberos Authentication filters.
17490: Fix failing HeartBeatTest
- Prevent possibility of both test and non-test public keys being used at the same time
17481: Fix build for Jan
- Removed JDK 1.6 String.isEmpty() references
17472: Follow-on for ETHREEOH-2648 - tighten guest login, eg. if no guest configured (in auth chain)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17475: ETHREEOH-3295: Fix to AuthorityMigrationPatch
- Forces transaction retry if worker thread reaches child authority before a parent authority
- Tested on Kev's 3.1.1 repository with ~20,000 bulk loaded users and ~2,000 Share sites
- Now completes in 5 minutes as opposed to 45
17461: ETHREEOH-3268: Added MutableAuthenticationService.isAuthenticationCreationAllowed () to allow conditional display of external user invitation UI
17450: ETHREEOH-2762: Correction to previous fix. Do not generate new name when working copy copied back on check in.
17440: ETHREEOH-3295: Fixed logging in FixNameCrcValuesPatch
17439: ETHREEOH-2762: Improved behaviour when a working copy is copied
- Working copy aspect already removed the working copy aspect on copy
- Now derives a new name from the node checked out from and a UUID, preserving the extension
17438: ETHREEOH-2690: Fix sequencing of jgroups system property setting
- declared dependency between internalEHCacheManager and jgroupsPropertySetter
17436: ETHREEOH-3295: Further performance improvements to AuthorityMigrationPatch
- authority created at same time as all its parent associations to save lots of reindexing, as per LDAP sync
- multi-threaded BatchProcessor (as used by LDAP sync, FixNameCrcValuesPatch) used to process work in 2 threads in batches of 20, report progress every 100 entries and handle transaction retries
- BatchProcessor now promoted to its own package
17394: Fix for license issue in local enterprise builds.
- Replace Community with Enterprise in version.properties during enterprise war building
17365: ETHREEOH-3229: Visited and fixed all SearchService result set leaks
17362: ETHREEOH-3254: Eliminate needless ping to LDAP server in LDAPAuthenticationComponentImpl.implementationAllowsGuestLogin()
17348: ETHREEOH-3003: Fix NPE in Hyperic when LicenseDescriptor has null fields
17316: Merged V3.1 to V3.2
17315: ETHREEOH-3092: PersonService won't let you create duplicate persons anymore.
17314: ETHREEOH-3158: Fix RepoServerMgmt to work with external authentication methods
- AuthenticationService.getCurrentTicket / getNewTicket now call pre authentication check before issuing a new ticket, thus still allowing ticket enforcement when external authentication is in use.
17312: ETHREEOH-3219: Enable resolution of JMX server password file path on JBoss 5
17299: Merged V3.2 to V3.1 (Record only)
17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
17297: ETHREEOH-1593: Changed name of username cookie and fixed login.jsp to decode it properly
- thanks Kev!
17292: ETHREEOH-1842: Ticket association with HttpSession IDs tracked so that we don't invalidate a ticket in use by multiple sessions prematurely
- AuthenticationService validate, getCurrentTicket, etc. methods now take optional sessionId arguments
17269: Fix failing unit test
- reinstate original behaviour of AbstractChainingAuthenticationService.getAuthenticationEnabled()
17268: Fix InvitationService
- Runs as system to do privileged AuthenticationService actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17246: ETHREEOH-3208: User profiles for users authenticated by immutable subsystems are now read only
- Introduced MutableAuthenticationService interface, only implemented by Alfresco native authentication service
- Split out those methods from AuthenticationService that mutate the user store and added isAuthenticationMutable()
- Now both Alfresco Explorer and Share user profile / password edit link rendering is conditional on isAuthenticationMutable
- Works with authentication chain containing mixture of internally and externally authenticated users
17247: Fix failing unit tests
- rm-public-services-security-context.xml needed to be brought in line with public-services-security-context.xml (and will forever more!)
17248: ETHREEOH-1593: alfUser cookie value should be base 64 encoded to allow for non-ASCII characters
17253: *RECORD ONLY* ETHREEOH-2885: web.xml must conform to the schema to work on JBoss
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18098 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17294: Fix for ETHREEOH-3194 - It's impossible to find Blogs and Discussions by title.
17301: Activity Service fixes (ETHREEOH-1362 & ETHREEOH-1741)
17302: Fix for ETHREEOH-2849 JPG to GIF transformation fails when using imagemagick cmd line options listed in our wiki
17305: AVM - fix AVMStoreDescriptor ( creator/createDate) returned by getStores
17306: Fix for ETHREEOH-1578 - Incorrect behavior of Calendar in Month view ...
17318: Merged V3.1 to V3.2
17317: Fix for ETHREEOH-3236 It is impossible to change start location, everything is reverted to My Alfresco
17320: Merged V3.1 to V3.2
17287 - Fix for ETHREEOH-110- It is impossible to browse events by tags
17326: iBatis mapping fixes for AVM on Oracle (including ETHREEOH-3205)
17327: Merged V3.1 to V3.2
17324: Fix for ETHREEOH-2723 Script error appears when trying to edit Home Space Name for user
17329: Merged V3.1 to V3.2
17180: Merged V2.2 to V3.1
17164: Fixes for deletion of large hierarchies: (ETHREEOH-2161 and ETHREEOH-2650)
17179: (RECORD ONLY) Merged V3.1 to V2.2 ...
17330: Fix for SiteActivityTest failure (caused by earlier -ve test data)
17331: Merged V3.1 to V3.2
17190: Further fixes for ETHREEOH-2161: Delete process hangs when deleting large directory structure (with rules applied)
17207: Fix fallout from work on ETHREEOH-2161: Delete process hangs when deleting large directory structure (with rules applied)
17215: Added back firing of policies for archive stores
17351: Build fix check in to DBNodeService. Will be followed by full fix when available.
17353: Applied TransactionListenerAdapter
___________________________________________________________________
Modified: svn:mergeinfo
Reverse-merged /alfresco/BRANCHES/V3.1:r13091
Merged /alfresco/BRANCHES/V2.2:r13089,13091,14190-14191,14199,14210,14216,14229,14655,14825,14869,17164,17179
Merged /alfresco/BRANCHES/V3.1:r17180,17190,17207,17215,17287,17317,17324
Merged /alfresco/BRANCHES/V3.2:r17294,17301-17302,17305-17306,17318,17320,17326-17327,17329-17331,17351,17353
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18056 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17262: Fix for ETHREEOH-2898: Share Login - using return with auto-complete clears login screen details
17264: Fix for ETHREEOH-2368 Added category is not visible in "Categories" in Side Bar even after the page is refreshed.
17266: Merged V3.1 to V3.2
17265: ETHREEOH-3213 - Error occurs if you try to Configure of Site Wiki dashlet if wiki page name contains russian letters
17279: Fix for ETHREEOH-3110 - Error page if Add broken number by create(edit) ASR or FSR.
17281: Fix to unreported error where the NodeBrowser would not display nodes that ...
17283: ETHREEOH-3037 and ETHREEOH-2158
17286: Fix for ETHREEOH-3075 Encoding field is displayed as empty on Versioned details page.
17289: Merged V3.1 to V3.2
17288: Fix for ETHREEOH-3164 Link Destination (with modify properties of a space link) does ...
17291: Fix for ETHREEOH-2403 It's possible to create a content with spaces.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17201: Fix for ETHREEOH-1786: Time fields are displayed incorrectly
17202: Fix for ETHREEOH-1886: alf:hint tag in XSDs results in error
17204: Fix for ETHREEOH-1941: gMonth element is not correctly handled on creating web content based on web form process
17206: Fixed ETHREEOH-1134 "Incorrect behavior of tab indexes for windows"
17212: Fixed ETHREEOH-3063 "It is impossible to add tags after creating duplicate wiki page"
17214: Fix for ETHREEOH-1940: Problem with creating web forms containing mandatory boolean attributes with default values
17226: Fixed ETHREEOH-3105 "Error occurs when user add tag containing disallowed symbols."
17228: ETHREEOH-3181 - Tag inconsistence between JSF and Share client
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.2:r17201-17204,17206-17207,17211-17216,17219-17228
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18025 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17804: Branch for SpringSurf integration 2 to RemoteAPI - from HEAD r17789
17808: Part 3 of SpringSurf integration - RemoteAPI, Web-Client, Mobile and DOD5015 java code refactored to use SpringSurf Webscripts libraries, removed dependancies on existing WebScriptFramework project.
17812: Removed web-framework and webscript-framework projects. Updated build scripts to use SpringSurf dependencies for remote API and client projects and also removal of wf and wsf projects from builds.
17818: Various Spring app context and config changes to integration SpringSurf at the RemoteAPI and Web-Client project level.
- Build scripts fixed up
- Temporary web.xml changes until spring mvc dispatcher is hooked into /service urls
- The server starts up! No nothing else works yet, you know how this goes...
17819: Fix to incremental-webclient-tomcat-exploded build target to work on first deploy to a clean tomcat (affects HEAD also, not SpringSurf related).
17872: Refactor Web-Client web.xml to use Spring WebScripts Dispatcher Servlet
- servlet is configured to use the existing Spring application context instance as loaded by the ContextLoaderListener
Share web.xml TODOs for JBoss app-server support (currently missing from SpringSurf extraction)
17892: Upgraded Repository Spring dependant libraries to 3.0.0 release.
Upgraded to latest SpringSurf release (also running against Spring 3.0.0)
Various related fixes.
17893: Additional Spring3.0.0 migration fixes and libraries.
17899: Integrated another SpringSurf bug fix - to correctly add ClassPathStore instances to SearchPath objects.
17901: Fixes to handling of merging of models returned from the new Script Processors.
Share now works against a Repository that is running SpringSurf WebScripts and Spring 3.0.0.
17904: Latest SpringSurf libraries after latest changes.
TODO:
- NTLM filter needs moving to Share (not present in SpringSurf)
- MessagesWebScript - community tracking image needs adding to Share specific version (not present in SpringSurf)
- feedController - for rss feed service urls - needs testing
- Clustering config overrides - no longer work in SpringSurf, needs a rethink
- Mobile project is not working
- PHP module project
- JBossEnabledWebApplicationContext required for Share - currently missing from SpringSurf
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17906 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17682: Fixed up package structure of standalone alfresco-jlan configelement fa‡ade classes.
17684: Fix up build.xml for first set of spring-surf integration changes - tested alfresco/share server startup.
17697: Minor tweaks from V3.3_SPRING3 branch before spring-webscripts JAR integration.
17730: Updated to latest SpringSurf libs and fixed up build.xml.
17737: Share war built against SpringSurf libraries and deploys into tomcat.
- First pass of configuration and web.xml refactored to new structure
- Refactored Slingshot PageMapper and UserFactory classes to new interfaces
- Build scripts updated to use SpringSurf libraries to build Share - dependency on old WebScripts and WebFramework projects removed.
- Some cleanup related to SpringSurf Core project class removal
- NOTE: Share does not work yet, not even close, just builds and deploys WAR with no errors.
17738: Updates to WebFrameworkCommons - removes dependency on old WebScripts and WebFramework projects - now uses new SpringSurf libraries.
17739: Removed webscripts and webframework references from build targets for slingshot.
17740: Removed old WebStudio project and build scripts.
17747: Updated to latest SpringSurf dependent libraries.
Fixes to Share startup config - added page types.
17751: More refactoring of Share app-context config.
Moved StaticAssetCacheFilter to WebFrameworkCommons (as no longer present in SpringSurf).
Added SlingshotPageMapperFactory to complete classes required for Share SpringSurf customisation.
Updated SpringSurf jars to latest after recent SpringSurf SVN commits.
Slingshot surf-config.xml now loads custom app-context from backward compatibility locations.
URL rewrite config added to allow /service and /proxy URLs to work for backward compatibility.
Removal of more obsolete sections from Share web.xml.
17752: Share login and basic authentication and user generation path now working.
17775: Share dashboards and other pages now working under SpringSurf.
- Added latest SpringSurf libs after my recent commits for various fixes
- Added Share overriden PageViewResolver to handle Uri template matching - required for Share
- Fixed Logout
- Moved slingshot-region-chome to correct new location
17785: Removed obsolete system-templates dir.
Fixed slingshot app context to correctly pickup custom share config xml in web-extension.
Fixed up JSF client index.jsp to use new ConfigService class location.
17786: Updated SpringSurf libs after recent commits.
Share related fixes to app-context.
Share is now working! For the basic use cases i'm no longer seeing any issues; login, dashboards, creation of sites, document library etc. all seem to be working now.
A complete QA pass of the application will be required for 3.3.
TODO:
- NTLM filter needs moving to Share (not present in SpringSurf)
- MessagesWebScript - community tracking image needs adding to Share specific version (not present in SpringSurf)
- Clustering config overrides - no longer work in SpringSurf, needs a rethink
- Mobile project is not working
- Repository Remote API and Web-Client to work ontop of SpringSurf WebScripts (the next BIG bit...)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17789 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
15422: Fix deploy-virtual-tomcat macro for Spring 3
15391: Fix ContentStoreReplicatorTest for Spring 3
15390: Upgrade CXF to version 2.2.2 for Spring 3 compatibility
15385: Correction to previous checkin
15384: Fix ClassPathStore.createRelative() to work with Spring 3
- Relative resource path resolution with directory resources has changed
15346: Merged V3.3_SPRING3 to SPRING3
15310: Spring 3: Change to the way that FileContentStore broadcasts its existence to interested parties (for enterprise-only monitoring)
- Introduced new SafeEventPublisher singleton that queues up events until after the application context has finished refreshing
15309: Use AUTODETECT_NONE auto detect mode for JMX exporters to be compatible with Spring 3
15308: Fix IBATIS integration to be compatible with Spring 3
15307: Added missing runtime dependencies
- org.springframework.expression-3.0.0.RC2.jar
- org.springframework.asm-3.0.0.RC2.jar
15289: Move Alfresco stack to Spring 3
- Stage 1: get it compiling in eclipse and update ant scripts
- Still requires Web Framework contributions from Uzi
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17462: ETHREEOH-3346: New meaning to synchronization.synchronizeChangesOnly property
- In the LDAP sync performance optimizations we always used the differential queries to determine the users and groups to be updated. Deletions were determined by a separate query.
- This meant that if you ever did want to force the update of all users it wasn't possible.
- So now when the flag is false it means don't use differential queries in the scheduled sync job.
- The scheduled job now processes deletions regardless.
- The default value for the property is now true.
17431: ETHREEOH-3274: Refix NTLM support for share
- Fixed NPE introduced by ETHREEOH-2767
- Made web.xml validate against schema for JBoss
- Reintroduced missing open comment in webscript-framework-config-custom.xml.sample
17426: ETHREEOH-2997: Fix ticket parameter passing into NTLM/Kerberos WebDAV authentication filters
- A NPE was stopping it from working
17425: ETHREEOH-3282: Fixed NPE preventing upload from working with NTLM SSO enabled
17368: ETHREEOH-3197: Use utf8_bin collation in MySQL out of the box to avoid problems with comparison of accented characters
17361: ETHREEOH-3276: Don't attempt to start an LDAP sync when the repository is read only
17347: ETHREEOH-3206: Fix LocalFeedTaskProcessor to work with JBoss 5
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17075: Merged DEV-TEMPORARY to V3.2
16768: ETHREEOH-2359: System Error message appears while clicking "View Completed Task" icon for the task, if the user, whom the Adhoc task was assigned to, has been deleted
16792: *RECORD ONLY* ETHREEOH-1429: Unfriendly error occurs when two content managers create identical content items in appropriate user sandboxes
17078: Merged DEV-TEMPORARY to V3.2
16962: ETHREEOH-1289: It is possible to add one Web Form to Web Project twice and more times
17080: Merged DEV-TEMPORARY to V3.2
16960: ETHREEOH-1894: Unfriendly notifications appear when trying to edit unlocked content
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16713: ETHREEOH-2379 deployment missing crypto libraries.
16722: ETHREEOH-2798 - java.lang.NullPointerException while deleting a folder node with emptyTranslation
16752: ETHREEOH-2946 - Release a test server from inside an Approve/Reject task
16796: ETHREEOH-1841 - MBean error when running in a WebSphere cluster
16920: ETHREEOH-2796 - Word 97 To Text transformation fails
16955: Merge V3.1 to V3.2
14275: Invitation change for ETHREEOH-1456, Missed change from check in 14222.
14222: ETHREEOH-1456 - accepting a rejected invitation.
16963: ETHREEOH-3029 - Strange defaltOnLoadListsner in hibernate-context.xml
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16966 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Id is now decoded in the action links
- Added nodeName validator to webclient for groupids (and username) since that is what is used in share (means that "<" and ">" characters now are forbidden)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16841: Fix for ETHREEOH-3046 - discussion post replies and further post content now all set to UTF-8 encoding format.
16853: Merged V3.1 to V3.2
13681: Disable CMIS Web Services.
13958: ETHREEOH-1625 - Incorrect save file process via Office Addin
14026: ETHREEOH-1805 - update GET login web script description to recommend use of POST login web script instead.
16861: Merged V3.1 to V3.2
14162: ETHREEOH-1733 - multiday events display correctly
14273: fix for ETHREEOH-2031
14274: fix for event not adjusted by height issue in week view, after adding
16867: Merged V3.1 to V3.2
15429: The solution is to remove 'label' and 'description attributes' and add appropriate 'label-id' and 'description-id' attributes in
web-client\config\alfresco\web-client-config.xml for dashlets. Appropriate ids were added into webclient.properties.
16677: ETHREEOH-1208 - Upload/recall documents with apostrophe/accent via Alfresco Office plugin
16869: Merged V3.1 to V3.2
16848: Merged V2.2 to V3.1
15217: Fix for ETWOTWO-1268. Check for existence of desired control on first step of the dialog.
15218: Fix for ETWOTWO-1269. Remove node.hasPermission(PermissionService.CREATE_CHILDREN) from CheckoutDocEvaluator#evaluate method (like 3.2 version).
16849: Merged V2.2 to V3.1
15424: ETWOTWO-1349
16851: Merged V2.2 to V3.1
15432: **RECORD ONLY** Input characters validation script was modified to disallow !@#$%^&*().
15433: This check-in fixes ETWOTWO-1351, ETWOTWO-1352, ETWOTWO-1353 because their behaviour is similar.
16874: Merged DEV/TEMPORARY to V3.2
16789: ETHREEOH-1895: Incorrect working of Link Destination Details
16790: ETHREEOH-2372: Incorrect working of Link Destination Details
16791: ETHREEOH-2342: Error message appear when "Coordinator" try to remove himself from the space
16793: ETHREEOH-1364 & ETHREEOH-1367
16794: ETHREEOH-2358: Letters and special symbols can be typed in Date value of property while creation of Content Rule and it leads to error
16837: ETHREEOH-2631: two jsp:root elements cause compilation error in Weblogic 10.3.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16956 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
16684: Fixed ETHREEOH-2348 "Wrong WebProject description display"
- Description limited to 1000 chars
- The new values for name & description get displayed directly after update
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16780: Fix failing unit test
- HeartBeat now needs to be constructed inside a transaction.
16765: Merged DEV/BELARUS/V3.2-2009_10_05 to V3.2
16754: ETHREEOH-2534: SPP does not authenticate when authentication chain contains both alfrescoNtlm and passthru types.
- NTLM Authentication handler for Sharepoint module was implemented as singleton. But after it was integrated into Alfresco Authentication Subsystem, instance of this object is created for each type of NTLM authentication. As result static field with NTLM flags was rewrited for each instance. Bug was resolved by removing static indicator.
16751: LDAP sync improvements
- Correction to the way retried transactional errors are reported
- Addition of unit test for synchronization with a mock user registry generating a large volume of users, groups and associations
16749: Removed UserUsageBootstrapJob from scheduled jobs and moved UserUsageTrackingComponent to bootstrap
- files missed from CHK-9619
16748: User Usage Tracking Component bootstrapped synchronously to avoid its expensive queries across all users 'stepping on top of' other bootstrap activity such as LDAP synchronization
- Its startup messages are no longer masked out by log4j.properties
- Logged ETHREEOH-3009 regarding upgrade impact of new faster queries
16747: Lower impact of HeartBeat service on server performance
- More efficient AuthorityService APIs used to determine the total number of groups and users more efficiently
- Queries of all users and groups done synchronously at startup only
16746: Improvements for faster user and group lookup and association on a large repository (unfortunately intertwined)
- NodeService getChildAssocRefsByTypeQNames query rewritten to use a subquery to force a more logical evaluation order on MySQL
- NodeService getChildAssocs method made to use more efficient getChildAssocRefsByTypeQNames DAO call when a type qname but no assoc qname is specified
- NodeService getUsersWithoutUsage / getUsersWithUsage queries rewritten to avoid an expensive outer join on all users
- PersonService getPersonIgnoreCase query corrected to include the type QName ID of the child associations it is querying (thus avoiding unnecessarily triggering duplicate person removal)
- PersonService now supports an optional boolean argument to getPerson that indicates whether the auto-create + home folder creation behaviour should be triggered.
- AuthorityDAOImpl now uses false argument to getPerson call to avoid lazy home folder creation during creation of group associations
- AuthorityDAOImpl now specifies assoc type to getChildAssocs in getAllAuthoritiesInZone and findAuthorities calls so that the more efficient query variant is used
- Redundant personExists() call removed from authorityServiceImpl
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16725: Merged V3.1 to V3.2
16721: Merged DEV/BELARUS/V3.1 to V3.1
16483: Fix for ETHREEOH-2728 : WCM - Forms rendering issue using IE6
16889: Merged V3.1 to V3.2
16888: Merged V2.2 to V3.1
16694: Fix for ETHREEOH-1384/ACT 11135: Poor performance when using webscript based web forms
16787: Fixed Web-Client Eclipse project after recent chiba JAR file name change
16840: Resolution to issue in ETHREEOH-2633: Change to Common.js function implemented in CHK-5134 causes problems with missing icons in Navigator panel. Implemented configuration approach so that both modes can be supported.
16870: Fix for ETWOTWO-119 & ALFCOM-332: WCM config override issues where the OOTB web-client-config-wcm.xml file needed to be changed and the ability to define custom scripts to load to avoid the need to edit xforms.js or XFormsProcessor.java
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16740: Fix for ETHREEOH-2563 and ETHREEOH-2899.
16741: Fix for ETHREEOH-1781 - web-client-config-custom.xml.unicode.sample has incorrect comment.
16757: Merged DEV-TEMPORARY to V3.2
16730: ETHREEOH-2749: Entering a search containing a single quote breaks the script that performs next/previous page in OpenSearch JSF component
16731: ETHREEOH-2411: Error message appears when trying to create advanced workflow with long description
16732: ETHREEOH-1944: Navigation via shortcuts brings up incorrect dialogs
16761: Merged DEV-TEMPORARY to V3.2
16750: ETHREEOH-2405: system error if user goto Web Projects space from any web project which was deleted by another user.
16762: Displaying error title when error text is displayed
16763: Merged DEV-TEMPORARY to V3.2
16756: ETHREEOH-258: System Error message appears while clicking "Manage Task" icon in "My Completed Task" component for the task, if the user to whom the workflow was assign to is deleted.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16911 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15504: ETHREOH-2447: My Content page localisation failing - Localization is provided for all the ftl and xml files in WEB-INF\classes\alfresco\templates\webscripts\org\alfresco\portlets.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
15292: Solution for MOB-536 (Remove form-include virtualization server dependencies from Web Forms)
15299: Fix for ETHREEOH-896 and partial fix for ETHREEOH-1923: XForms layout issues
15501: MOB-947: Remove virtualisation server dependency from the TinyMCE control used in web forms. Preview URL has been replaced with a call to the 'avm' webscript.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16904 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16681: Fixed ETHREEOH-2454 "It's possible to create a group with less than 3 symbols in JSF client, but it's impossible to find it in Share client"
- Group name can now only be between 3-100 characters in webclient
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16901 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16700: Fix for ETHREEOH-2509 - Leaving a private site breaks All Sites search for any term found in documents user created in that site.
16703: Fix for ETHREEOH-2775 - "Show all" fails for user if permissions of folder that item was deleted from are changed to exclude them.
16705: Fixes to Site Links dashlet component.
16707: Fixed ETHREEOH-619 "User who is already a member of the site (or invite is pending) can be added to the invite list"
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16673: Merged V3.1 to V3.2
16307: ETHREEOH-2814-2815
16393: ETHREEOH-2840: Failed to send email to group EVERYONE
16395: Just forget to add this file during previous (16393) CHECK-IN.
16430: Added license header to new Java file - applied coding standards and code comments.
16669: Merged V2.2 to V3.1
16650: ETWOTWO-1288 - Create Web project Wizard-Step3 :XSS attack can be made when configuring ASR or FSR
16668: Fix for ETWOTWO-1289 - My Web Files (Forms) dashlets XSS attack can be made when web project's details has been edited
16676: Merged V3.1 to V3.2
16675: Fix for ETHREEOH-2773 - Manage System users: system error happens when search is performed by a query that contains a space
16699: Fixes to SURF samples Login page - as per ALFCOM-3447 and ALFCOM-3448 contributions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
16662: LDAP sync: improved group association filtering, referential integrity checking, deletion strategy and performance tuning of batch sizes
16648: ETHREEOH-2752: Improved ticket validation fix
- Invalidate user's tickets during person deletion rather than validation or it can mess up chained validation
16647: ETHREEOH-2534: Fixed Sharepoint NTLM authentication
- user details were never getting cached in the session
16579: Small improvement to LDAP error reporting
- Committed errors counted before successes in a logging interval
16515: LDAP sync performance
- Improved full sync strategy - run differential queries to work out required updates/additions and full queries to work out required deletions. Saves updating unchanged nodes.
- Use a TreeSet rather than a HashSet to gather group associations in an attempt to avoid blowing the heap size
16498: More LDAP performance improvements
- Uses thread pool with 4 worker threads and blocking queue to process returned results. The number of worker threads can be controlled by the synchronization.workerThreads property.
- Switched LDAP connection pooling back on again
- Group Associations processsed individually so that errors are collated and we get a better idea of their throughput
- Fixed potential bug. Group membership resolution done with isolated LDAP context to avoid cookies from paging creeping in.
16424: Try switching off LDAP connection pooling to see if it works better with our flaky server.
16414: Further LDAP fault tolerance
- Log causes of group member resolution failures where possible
16413: More fault tolerance for LDAP sync
- Always commit last sync times before overall sync is complete to avoid the 'forgetting' of differential sync information
- DN comparisons should be case insensitive to avoid issues resolving DNs to user and group IDs
16398: Improved monitoring and fault tolerance for LDAP sync
- When the batch is complete a summary of the number of errors and the last error stack trace will be logged at ERROR level
- Each individual error is logged at WARN level and progress information (including % complete) is collated and logged at INFO level after a configurable interval
- In the Enterprise Edition all metrics can be monitored in real time through JMX
- Sanity testing to be performed by Mike!
16319: Merged HEAD to V3.2
16316: ALFCOM-3397: JBoss 5 compatibility fix
- Relative paths used by LDAP subsystem configuration weren't being resolved correctly
- See also https://jira.jboss.org/jira/browse/JBAS-6548 and https://jira.springsource.org/browse/SPR-5120
16272: ETHREEOH-2752: Once more with feeling!
16261: ETHREEOH-2752: Correct exception propagation.
16260: ETHREEOH-2752: Fix ticket validation
- Current ticket was getting forgotten by previous fix
- Person validation in CHECK mode now done AFTER the current user is set, so that the current ticket is remembered
16243: ETHREEOH-2752: Improve ticket validation used by all authentication filters
- Now takes into account whether person actually exists or not
- Tickets for non-nonexistent persons are now considered invalid and cached session information is invalidated
- New BaseAuthenticationFilter superclass for all authentication filters
- Improved fix to ETHREEOH-2839: WebDAV user is cached consistently using a different session attribute from the Web Client
16233: ETHREEOH-2754: Correction to previous checkin.
- relogin for SSO authentication, logout for normal login page
- logout is default
16232: ETHREEOH-2754: Log Out Action outcome passed as a parameter
- relogin for SSO authentication, login for normal login page
- Means the log out link always leads to the correct place, even when the session has expired
- Also lowered ticket validation error logging to DEBUG level to avoid unnecessary noise in the logs from expired sessions
16220: ETHREEOH-2839: Fixed potential ClassCastExceptions when Alfresco accessed via WebDAV and Web Client links in same browser
- WebDAV side no longer directly casts session user to a WebDAVUser
- ContextListener no longer casts session user to web client user
- Web client side will 'promote' session user to a web client User if necessary via AuthenticationHelper
- All authentication filters made to use appropriate AuthenticationHelper methods
16211: ETHREEOH-2835: LDAP sync batches user and group deletions as well as creations
- Also improved logging of sync failures
16197: ETHREEOH-2782: LDAP subsystems now support search-based user DN resolution
- When ldap.authentication.userNameFormat isn't set (now the default) converts a user ID to a DN by running ldap.synchronization.personQuery with an extra condition tacked on the end to find the user by ID
- Structured directories and authentication by attributes not in the DN such as email address now supported
16189: ALFCOM-3283: Prevent errors when user accepts an invite when not logged in
- new isGuest attribute propagated to user object
- header component (used by accept-invite page) needs to avoid calling prefs and site webscripts for guest user
- Conditional stuff in header template changed to use user.isGuest
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16896 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
