- optional parentAuthority argument - when set will only search for authorities under a given group
- optional immediate flag - when false means do a recursive search. When true means only return first level. When true and parentAuthority is null means root groups.
- search expression - which is tested against the short name and the display name
- reworked all existing calls for new semantics
- this method is for UI search only - not for existence checking!
- removed some ill-informed calls
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19203 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17850 : Addition of AVM - DM deployment.
17905 : ETHREEOH-3809 - WCM - First test server deploy fails.
- added yet another transaction to read the previous snapshot transaction.
- added a new system test based upon the WCM services. The beginnings of testing against layered authored sandboxes.
17907 : ETHREEOH-3806 - WCM Contributor cant release test server.
- release test server now runs without permissions checks (like the deploy action does)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
18207: Merged DEV/TEMPORARY to V3.2
17887: ETHREEOH-3853: FF 3.0: Exception after double click on 'Add button'.
18068: ETHREEOH-3623: Script Error on page "Web Form Details"
18097: ETHREEOH-3826: System Error occurs on "More Actions" page for a Space after "Edit Details" page for the same Space has been previously opened
18168: ETHREEOH-3789: Rule with simple workflow moves document to incorrect space
18238: Fix for ETHREEOH-4000 - WebScript extensions readme.ftl template fixed.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18298 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17410: Merged V3.1 to V3.2
16667: (record-only) Fix ETHREEOH-2477 - group-based perms (MT env)
16883: Fix ETHREEOH-1544 - cannot paste an item, if cut from another web project (modifyLock errror)
16918: Fix ETHREEOH-3053 - Deployment of non-stale file in a stale layered folder removes the file from FSR
16947: (record-only) Temporarily comment-out testSubmitChangedAssets1 (intermittent permission failure)
17162: Fix ETHREEOH-2850 - submitting delete of (web form) xml instance does not submit the associated deleted renditions
17319: Fix ETHREEOH-3111 - ManageReviewTaskDialog (fix-up contributed patch)
17418: Merged V3.1 to V3.2
17141: Fix ETHREEOH-3088: Cut/Paste into self causes stack overflow
17216: Fixed ETHREEOH-3170: DB errors on MSSQL with Snapshot Isolation enabled while CIFS copying
17255: Fixed ETHREEOH-3180: Error appears when trying to search resources on Manage Task page
17419: Fix for ETHREEOH-3296: Enterprise 3.X / Permissions Error When Cut & Paste on Sub-Folder
17421: Review and tweaks of DB script port
17423: Follow-on for ETHREEOH-3088
17424: Missed check-in for ETHREEOH-3032 (CHK-10240)
17437: ETHREEOH-2790 - OpenOffice-startup-context.xml needs to also initiate the connection to OpenOffice
17441: Build fix: Fix AVM permission inheritance to match DM and fix common permission dao component
17470: Fix for ETHREEOH-3350: Admin Console - Viewing user properties for user without home folder throws exception
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r16667,16883,16918,16947,17141,17162,17216,17255,17319
Merged /alfresco/BRANCHES/V3.2:r17410,17418-17419,17421,17423-17424,17437,17441,17470
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
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
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
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
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
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
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
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
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
15596: Merged V3.1 to V3.2
14017: Fix ETHREEOH-1880 - remove (double-)reverse of WCM staging snapshot order
14112: Fix ETHREEOH-1758 - apply contributed patch
14447: Merged V2.2 to V3.1
14276: ETWOTWO-1224 / WCM-948 - browsing staging area during (commit of) large submit can cause AVMNotFoundException: Path /www/avm_webapps not found.
14452: Add WCM services-based unit test for ETWOTWO-1224 / WCM-948
14589: ETHREEOH-1646 - User Sandboxes aren't visible for Content Publisher
15604: Merged V3.1 to V3.2
14734: Merged V2.2 to V3.1
14718: ETWOTWO-1244 - unable to revert some snapshots ("Does not exist: xxx")
14852: Merged V2.2 to V3.1
14720: ETWOTWO-1183 - "Show All Sandboxes" checkbox should only be visible for "Content Publisher" or "Content Manager"
15032: Fix ETHREEOH-2240 - delete WCM web project (does not clean-up workflow sandboxes and also appears in archive store)
15037: Fix ETHREEOH-2240 - follow-on for Alfresco Explorer's Manage (Review) Task Dialog
15056: Fix ETHREEOH-2297 - WCM layered folder - problem deleting file
15072: Minor - fix remote AVM test
15605: Merged V3.1 to V3.2
15082: Merged V2.2 to V3.1
15081: AVM - add tests only
15083: Fix ETHREEOH-2296 - user conflict when updating an AVM layered file
15118: Merged V2.2 to V3.1
15115: Fix ETWOTWO-1265 - WCM locking not working as expected (+ add WCM services test)
15137: Fix ETHREEOH-2309 and ETHREEOH-227 - including refactor (& clean-up) of WCM-related actions
15156: Fix ETHREEOH-2078 & ETHREEOH-2040 - WCM - deploy to localhost causes "Must have at least one store" errors
15175: Fix ETHREEOH-2309 and ETHREEOH-227 - further clean-up of WCM submit/undo actions (for consistency)
15190: Minor: message updates for WCM submit/undo actions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16858 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13867: Fix for ETHREEOH-986 - long names in Explorer details view show correct width in FF browser
13869: Fixes for ETHREEOH-1387 and ETHREEOH-1390
13872: Fix for issue where custom-web-framework-application-context should be optional in the web.xml for web-framework project.
13909: Fix for ETHREEOH-1684
13910: Fix for ETHREEOH-1266
14015: Fixes for ETHREEOH-1864 and ETHREEOH-1840
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@14020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13424: ETHREEOH-1242: Sample LDAP authentication config breaks site invites in Share
13427: Fixes for ETHREEOH-1157: Propagate exceptions using ReportedException
13428: Fix ETHREEOH-1493: Upgrade from 2.1-A to 3.1 uses incorrect patch id and fixes_to_schema
13429: Specific fix for ETHREEOH-1157: duplicate/triplicate users not properly prohibited
13436: Merged V2.2 to V3.1
13435: Merged V2.1 to V2.2
12307: Merged DEV/V2.1SP7 to 2.1
11927: ETWOONE-396
12112: ETWOONE-396
13437: Fixed ETHREEOH-1498: Mismatched closing XML tag in ehcache-custom.xml.sample.cluster
13439: Fix for ETHREEOH-1157: JSF Dialogs Absorbing Exceptions
13456: Fixed ETHREEOH-1472: Changes to systemBootstrap cause bootstrapping ACP's not to work
13469: Upgrade patch to update internal version2Store counter (follow-on fix for ETHREEOH-1540)
13491: Chaining example for DOC-84
13492: Fixed paths in zip file
13494: Fixed GenericBootstrapPatch when overriding bootstrap views
13495: Added @version javadoc
13496: Minor logging updates
13497: Fixed ETHREEOH-1431: Authentication case sensitivity switch doesn't work
13500: Temporary fix for Sharepoint issue raised last week
13502: ETHREEOH-1575: It's impossible to create Change Request task
13511: Fix for ETHREEOH-1549: Impossible to create HTML web content
13529: Fix for ETHREEOH-1595
13531: Fix for ETHREEOH-1607: Error on chaining example xml - malformed comment
13537: Build fix ... exclude the system user from auto creation
13538: Build Fix - further contraints to aviod auto-creation of guest
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1:r12307
Merged /alfresco/BRANCHES/V2.2:r13435
Merged /alfresco/BRANCHES/V3.1:r
13424,13427-13429,13436-13437,13439,13442-13450,13452,13454-13456,
13469-13473,13475-13476,13479-13480,13491-13500,13502,13511,13529-13538
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- incl. taking Hibernate libs from 3.1 and adding missing file from earlier merge
13321: Fix ETHREEOH-1407: System error occur during "Undo Selected" action if no items are selected
13322: ETHREEOH-1206: Throwing Alfresco Exception on OnUpdateProperties behaviour resets Encoding field to Big (first entry)
13326: (RECORD ONLY) Removed 'dev' from version label.
13330: Fix ETHREEOH-1408: Incorrect button name at "Manage Task: Submitted" page
13337: Fix for ETHREEOH-1409 and further fix for ETHREEOH-1408
13338: Removed svn:mergeinfo
13346: Make startup bat script check JAVA can be found.
13351: ETHREEOH-1386 validate ASR and FSR hostname.
13359: ETHREEOH-1435: Share doesn't extract document metadata correctly
13360: Fix ETHREEOH-821: SDK dependencies
13369: Fixed distribute-sdk target for when it's run locally
13382: ETHREEOH-1437: Container creation induces an unexpected permission allocation in Share
13391: Shutdown backstop continues if logging throws errors.
13394: Fix ETHREEOH-1457 - MT coci issue with bootstrap (eg. data dictionary) content
13400: Activate JAWS-223: Adobe LC Hibernate Dialect Loading
13401: Support for JAWS-215, mysql and oracle
13413: Fix ETHREEOH-1458 - MT delete->archive
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.1:r
13321-13322,13326-13327,13330,13337-13339,13341-13347,13351,13354-13355,13358-13363,
13365,13367,13369,13382,13385-13392,13394,13400-13403,13405-13406,13413
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13409: Fix for ETHREEOH-1337 - to escape query characters in Site/People service filter methods.
13410: Fix for ETHREEOH-1272 - another missing pager control.
13425: Italian lang pack for TinyMCE editors. Fixes ETHREEOH-1491.
13430: Fix for ETHREEOH-1488.
Also IDs added to a couple of pagers - not causing a bug, but completes the pager fixes.
13464: Fix for ETHREEOH-1474 - now possible to use NTLM auth with Alfresco and SURF apps hosted in same app-server with same user browser session in different tabs.
Added additional NTLM filter debugging info for Session ID.
13483: Fix for ETHREEOH-1547 - System error happens when trying to create any Web Project.
Also fixes issue where webproject FormImpl objects did not deserialize correctly due to unsafe service call usage in constructor.
13501: Fix for ETHREEOH-965 - disallow guest login until explicit Guest support is added to Share.
13507: Fix for ETHREEOH-1586 - language selectable at login working again.
13512: Fix for ETHREEOH-1522 - wiki RSS feed template variable named incorrectly.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13598 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13249: Fix for ETHREEOH-1064 and ETHREEOH-1286 and fix for issue where New Page action not activated in Share Wiki page list.
13251: Final part of fix for ETHREEOH-1270 - Group pickers in JSF client now use new findAuthorities() API to find groups for user searches - over 10x quicker for installations with many groups.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13580 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13033: Back end support for ETHREEOH-1179
13038: JAWS-436 - refactor WCM submit dialog to use WCM sandbox service + update unit tests
13046: Merged V3.0 to V3.1
13043: Merged V2.2 to V3.0
13016: Fix for ETWOTWO-1088 (reset layer using flatten rather than delete & add, users can flatten in stores they own but not delete)
13049: Build/test fix (WCM AssetTest)
13057: Merged V2.1-A to V3.1
8770: Added Flex SDK module
8771: Added Flex SDK binary (swc)
DH: I'm not sure about the svn:eol-style property appearing here. SVN Clients?
13059: Added 'AIX' as a platform type, from Adobe V2.1A, missed checkin.
13060: [no comments]
13061: [no comments]
13063: [no comments]
13064: [no comments]
13066: [no comments]
13067: Add NodeService.getChildrenByName
13072: Added new NodeService.getChildrenByName() method to public-services-security-context.
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13043
Merged /alfresco/BRANCHES/V2.2:r13016
Merged /alfresco/BRANCHES/V3.1:r13033,13038,13046,13049,13057,13059-13061,13063-13064,13066-13067,13072
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13552 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12994: Merged V3.0 to V3.1
12931: Merged V2.2 to V3.0
12635: Fix for ETWOTWO-995: Diff performance degrades on large data sets
12742: Fix for ETWOTWO-981: WCM - regression - revert fails (eg. for content publisher)
12743: AVM - add missing tests to test suite & fix existing tests (including base setup)
12759: AVM - build/test fix - follow-on to r12742
12781: Fix PersonDAO - fixes AuthorityServiceTest which failed after adding AVMServicePermissionsTest
12932: Merged V2.2 to V3.0
12763: Support for ETWOTWO-975: AVMDifference now implements Comparable<AVMDifference>
12782: Fix for ETWOTWO-939: Content Contributor cannot edit their own items
12809: Test fixes after r 12782
12818: ETWOTWO-977 (Orphan Reaper) - removal of comment questioning cache interaction.
12933: Merged V2.2 to V3.0
12306: (record-only) Final set of XSS and HTML encoding fixes for ETWOONE-90 - already merged (see r12310)
12934: Merged V2.2 to V3.0
12311: (record-only) Fix for ETWOONE-389 - Current page number not always visible on the browse screen - already merged (see r12312)
12935: Merged V2.2 to V3.0
12320: (record-only) Fix for ETWOONE-87: Behavior of delete cascade - already merged (see r12324)
12322: (record-only) Fix merge issue (marked as Do Not Merge - see CHK-5607)
12936: Merged V2.2 to V3.0
12775: (record-only) ETHREEOH-872: Editing Email-notify-rules fails w/ ClassCastException (back-port of r11966)
12937: Merged V2.2 to V3.0
12780: Fixed ETWOTWO-1003: DuplicateChildNameException not generated correctly (on Oracle)
12820: Update to ETWOTWO-926 (WCM Form Inline callouts to Web Scripts)
12825: Further ETWOTWO-926 update: provide compatibility with old token scheme as the original patch has already made its way into 3.0.1
12850: ETWOTWO-975 - Show Conflicts in Modified Items List
12938: Fix merge typo (follow on from r12931)
12941: Fix merge typo (follow on from r12931)
12998: Cleaned up svn:mergeinfo entries
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r12931-12938,12941
Merged /alfresco/BRANCHES/V2.2:r12306,12311,12320,12322,12635,12742-12743,12759,12763,12775,12780-12782,12809,12818,12820,12825,12850
Merged /alfresco/BRANCHES/V3.1:r12994,12998
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12943: Port of support for ADB-47 from V2.1-A to 3.1
12948: Port of tests from CHK-2235 for ADB-20 from V2.1-A to 3.1
12965: Activated index tracker Quartz job by default
12974: Port for lazy creation of home folders with configuration from V2.1-A to V3.1: original CHK-2619, CHK-2716
12976: Merged V2.1A to V3.1
8562: (record-only) Fix to lazily create home folders - DO NOT MERGE
8694: (record-only) Added configuration for lazy or eager creation of home folders
12978: Merged V3.0 to V3.1
12920: Merged V2.2 to V3.0
12456: Wire up AVM locking service by interface to allow for potential over-ride
12457: Make AVM ChildKey case insensitive
12470: Merged V2.2.1-NBC-FIXES to V2.2
12156: Optimizations to WCMWorkflowEvaluator and WCMWorkflowDeletedEvaluator
12605: Hide annoying "Virtualisation Server not started" warnings (by making them debug)
12707: AVM console - "snap" also allows tag and description to be specified
12979: Build/test fix
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/DEV/V2.2.1-NBC-FIXES:r12156
Merged /alfresco/BRANCHES/V2.1-A:r8562,8694
Merged /alfresco/BRANCHES/V3.0:r12920
Merged /alfresco/BRANCHES/V2.2:r12456-12457,12470,12605,12707
Merged /alfresco/BRANCHES/V3.1:r12943,12948,12965,12974,12976,12978-12979
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13544 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
