22215: Fix compilation error
22240: ALF-4207: Download servlets show error page with permissions error rather than login page when non-guest user has insufficient permissions
22241: ALF-4469: External Access Servlet should also show status 403 errors to non-guest users, as in ALF-4207
22244: ALF-4599: CIFS access to alfresco with Kerberos authentication creates wrong users with domain suffix
ALF-4395: recognize Kerberos machine accounts with lower case names
22247: ALF-4397: Properly handle null values in SortableSelectItem.compareTo()
22248: Merged DEV/TEMPORARY to V3.3-BUG-FIX
21963: ALF-4390: ModuleManagementTool is not returning error code in case of failure
Error code constants and appropriate System.exit(code) invokations were added.
22260: ALF-4597: InviteContentUsersWizard was caching permissions in a non-type-specific cache
- removed the cache - didn't allow for dynamic model updates either
22269: Merged V3.3 to V3.3-BUG-FIX (RECORD ONLY)
22268: Merged V3.3-BUG-FIX to V3.3
- Merged across all differences from V3.3-BUG-FIX
22270: Incremented revision number
22467: Merge from V3.3 to V3.3BUG-FIX. Fix for ALF-4741.
V3.3: 22466 Merge from V3.2 to V3.3. Fix for ALF-4741.
V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry.
22667: Merged DEV/TEMPORARY to V3.3-BUG-FIX
22665: ALF-4825: Unlocking checked out content cause both original & working copy un-usable.
Do not include unlock in the actions list when a node has a working copy.
22691: Add missing "logAbandoned" (= false) prop to config - follow on to r15133 (related to ALF-4020 / ETWOTWO-562)
22710: ALF-3948 - from time to time we have exception "Failed to init dictionaryRegistry"
22718: Merge from V3.3 to V3.3-BUG-FIX
r 22715 Merge from V3.2 to V3.3
r 22713 Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.
22722: Merged V3.3 to V3.3-BUG-FIX
22271: ALF-3712: Merged HEAD to V3.3
22249: Bin contents were not being packaged.
22272: Merged DEV/TEMPORARY to V3.3
22067: ALF-4479: when using webdav inline edit on webdav + MS Word 2003 +IE6, one gets: Unable to check in Content Node due to system error. Access Denied. You do not have the appropriate permissions to perform this operation.
- Do not unlock a working copy.
22273: Merged DEV/TEMPORARY to V3.3
21729: ALF-3112: Property parameterTemplates not resolved correctly for SimpleTemplateActionDefinition
The temporary fix for unconfigurable valueSeparator property.
https://jira.springframework.org/browse/SPR-7429
22274: Merged DEV/TEMPORARY to V3.3
21993: ALF-4396: webdav "supportedlock" propfind request returns malformed response
WebDAV supported lock elements were wrapped by “lockentry” elements according to the WebDAV specification.
22276: ALF-3890: FTP Change Working Directory (CWD) command works with root-relative paths with more than one component
22277: Merged DEV/TEMPORARY to V3.3
22076: ALF-3579: Open the Details Page URL removes the header, navigation bar etc
The identifiers for modify action tag and details' actions tag should be different in the details pages. For documents:
in the filelink-details.jsp and document-details.jsp. For spaces: in the space-details.jsp and spacelink-details.jsp.
22285: Merged HEAD to V3.3
22284: Fix for ALF-3063 "Incorrect behaviour on filtering by tag in Repository". Labels updated to more accurately reflect behaviour.
22299: Fix for ALF-3893: lucene.indexer.mergerTargetIndexCount is redundant
- this property is now used to control the merging of indexes as was intended
22309: Merged DEV/TEMPORARY to V3.3 (Approved by Roy)
21035: ALF-2588: RM: Export and import of file plan causes disposition errors
When content is imported from acp the actionId that points to the action NodeRef is old in the imported content and NullPointerExcepption appears.
To avoid this we changed DispositionScheduleImpl. Now it stores the action that has different name and ID (when action is create it name equals id) in a separate map. And when getDispositionActionDefinition(String id) method is called it tries to retrieve the action from this map, if it hasn’t been found earlier.
22325: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr
- unit test pass
22334: Merged HEAD to V3.3
22331: Fixes: ALF-3558: Input and variable encoding issues in Share Calendar & API JSON data.
22355: ALF-4489: Special Characters Create Stack Overflow Exception in the Group Admin Console for Share in Internet Explorer.
Fixed missing encoding and also added guard code to prevent stack overflow problem in case of future error.
22356: Fix for ALF-4384 - missing JSP page directive
22360: Fix for ALF-4428: Incorrect behaviour of Consumer and Contributor permissions with Quickr
- unit test pass
- no abstain allowed
22365: Merged DEV/TEMPORARY to V3.3
21874: ALF-2641: WebDav Permission Issues - MAC OSX Finder
The createExclusive field was introduced instead of m_scope. New algorithm of lockscope determination was added.
Also ALF-4008 compliant fix provided with this.
21812: ALF-4008: save a MS Word change over webdav after a 2-3 minutes delay causes the error 'XXX.doc is currently in use. Please try again later.'
Modified LOCK method, it gets a scope from NodeRef property if m_scope field is not defined.
22367: Merged DEV/TEMPORARY to V3.3
21442: ALF-2587: WEBDAV error in Windows 7
- variant generateLockDiscoveryXML methods were factored into a single one capable of generating a namespaced LOCK response compatible with Windows 7 when its user agent header is detected.
22368: Merged DEV/TEMPORARY to V3.3
20919: ALF-2834: All day events created in Outlook not appearing in Meeting Workspace
Different date format is used by Outlook when creating all day meeting request and meeting request specifying date and time. The code was changed to handle both situations accordingly.
22369: Merged DEV/TEMPORARY to V3.3 (With simplifications)
21470: ALF-3796: Locale is not always set/reset on every request thread
- A GlobalLocalizationFilter sits in front of ALL requests and sets a default fallback locale on I18NUtil
- Moved BaseServlet.setLanguageFromRequestHeader into this filter and made sure it always falls back to a default locale
- Subsequent filters / servlets in faces chain may override this with user preferred locale after authentication
22370: ALF-3868: Fix for compatibility with Sun Directory Server
22371: Merged DEV/TEMPORARY to V3.3
21811: ALF-4067: Display Value for Action Constraint breaking a java eval in Share
When a node doesn't have a ContentModel.PROP_TITLE property it is added to AllowableValues with PROP_NAME value.
21795: ALF-4067: Display Value for Action Constraint breaking a java eval in Share
The fix introduces the code which doesn't add a node to AllowableValues if it doesn't have a ContentModel.PROP_TITLE property.
22378: ALF-3796: Fixed compilation error - BaseServlet.setLanguageFromRequestHeader replaced by global filter
22380: ALF-3761: War bundles + extension samples now include alfresco-global.properties in correct position in hierarchy
22386: ALF-3887: Two versions of geronimo-activation are shipped
- Removed the older version
22402: WCM - add more debug logging only
22405: Change notification handler not enabled by the server configuration bean. ALF-4715.
22407: Merged DEV/TEMPORARY to V3.3
22231: ALF-4096: Share point module is causing file descriptor leaks.
The following changes were added to VtiIfHeaderAction and GetDocumentMethod:
- code that copies data between streams was replaced by org.apache.commons.io.IOUtils.copy()
- correct stream closing was added for all cases including exceptions while copying
22411: Merged DEV/TEMPORARY to V3.3
21864: ALF-4371: Error occurs if user try to find event from meeting place
Replaced incorrect NamespaceService.CONTENT_MODEL_PREFIX with NamespaceService.CONTENT_MODEL_1_0_URI in QName creation.
22412: Merged DEV/TEMPORARY to V3.3
22018: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching.
People searches in Alfresco and share are restricted by “cm:person” type.
21988: ALF-4403: Search on users in JSF client and SHARE do not specify "cm:person" type clause in the query leading to incorrect results in user searching.
People searches in Alfresco and share are restricted by “cm:person” type.
22418: ALF-4578: Avoid ConcurrentModificationException in AVMDeploymentTarget
22420: Fixed ALF-958: Target associations aren't copied
- Added CopyBehaviourCallback. getAssociationCopyAction
- Default behaviour:
- Remove existing associations of same type when copying OVER an existing node (e.g. check-in)
- Copy the association using a new target if the target is copied in the same call
- Copy the association to the original target if the target is not copied in the same call
- Abstract behaviour (for those that have implemented a CopyBehaviourCallback):
- Remove existing associations of same type when copying OVER an existing node (e.g. check-in)
- Only copy the association to a new target if the original target is copied
22421: ALF-4641: Strip ticket parameter on login page redirect to avoid endless redirect loop
22422: Merged DEV/TEMPORARY to V3.3
21201: ALF-1804: Passthru server check gets confused when a server goes offline
22423: Merged DEV/TEMPORARY to V3.3
21891: ALF-3356: Error changing own user role from coordinator to consumer
When a user changes the Roles, all Permissions are immediately deleted and new selected permissions are created. If all permissions are deleted then the user doesn't have access for permissions creation.
If the user currently has permission change permission the currently set of permissions is cleared and new permissions are added from a System User authority.
22424: Merged DEV/TEMPORARY to V3.3
21182: ALF-1786: Remote Opensearch request mimetype missing
SearchProxy was changed to provide original User-Agent header. HTTPProxy was extended to set request headers. New overridable method setRequestHeaders was added to provide ability of setting headers.
22425: Merged DEV/TEMPORARY to V3.3
22165: ALF-197: When returning to the first step of Advanced Workflow creation from second or third steps it's always Adhoc Task chosen there
The selectedWorkflow variable was reseting every time on "Choose Workflow" step
22426:Merged DEV/TEMPORARY to V3.3
21323: ALF-687: Error when invoking webservices via SSL repository location url.
Add a new overload of ContentUtils.putContent() method with the isSSL argument at the end.
If this parameter value is true then SSLSocket is used and Socket otherwise.
22428: ALF-3490: Unfriendly error messages from WebDAV when content doesn't exist
- Generalized ALF-4207 solution so that the error page instead displays a status 404 message
22429: Merged DEV/TEMPORARY to V3.3
21325: ALF-3502: Logging in FacesHelper.getManagedBean on failure to create bean
Detailed logging of the EvaluationException for ValueBinding was added.
22430: Merged DEV/TEMPORARY to V3.3
20974: ALF-2695: mimetypes-extension-context.xml.sample does not use the correct classes
Changed the type of the bean id="mimetypeConfigService" from “"org.alfresco.config.xml.XMLConfigService” to “org.springframework.extensions.config.xml.XMLConfigService”
Renamed mimetypes-extension-context.xml.sample file to file mimetypes-extension.xml.sample. The file mimetypes-extension-context.xml.sample was interpreted like spring context file. It wasn’t correct.
22431: Merged DEV/TEMPORARY to V3.3
21099: ALF-3046: UI - Import feature not available to contributor user
The fix also covers related bug ALF-2802.
Permission ‘Write’ was replaced by ‘CreateChildren’ for import action because contributor has ‘AddChildren’ (not ‘Write’) permission.
22432: Merged DEV/TEMPORARY to V3.3
20973: ALF-3244: alfresco-sample-website.war does not deploy to bundled Tomcat
The cause of the corrupted alfresco-sample-website.war deployment is the usage of the SSIFilter in the application.
Only Contexts which are marked as privileged may use SSI features. For this reason, the context has been marked as privileged in META-INF/context.xml
22433: Merged DEV/TEMPORARY to V3.3
21190: ALF-3751: Unintentional copy/remove of 'Web Forms' space removes form associations in Web Projects
Parent validation before deleting was added. Now deleted web form is removed from Web Project only if this form is located in original Web Form folder.
22434: Merged DEV/TEMPORARY to V3.3
21490: ALF-4099: Customer concern about String comparison operators == vs equals
Comparison operator was replaced by equals/EqualsHelper.nullSafeEquals in the ContentFilterLanguagesMap DocumentNavigator UIAjaxTagPicker Presence classes.
DocumentNavigator.getAttributeName() method was changed because the previous method's logic always returned escapedLocalName in any case.
22436: Merged DEV/TEMPORARY to V3.3
22063: ALF-4494 : Share show error if versionable document has no version history.
1. evaluator.lib.js was modified to prevent NPE if no version history exists for document.
2. Result was manually tested.
22437: ALF-2796: java.naming.referral is set to "follow" in the LDAP contexts to avoid PartialResultExceptions on LDAP sync
22466: Merge from V3.2 to V3.3. Fix for ALF-4741.
V3.2: 22465 Fix for ALF-4741. Repository Web Scripts can produce a corrupted response after a transaction collision/retry.
22469: Fix for CIFS long directory path results in duplicate folder displays. ALF-3938.
Removed (hopefully) last of the hardcoded buffer length limits.
22472: Fixed ALF-4670: XAM retainUntil value does not propagate down the space hierarchy
22473: Fixed ALF-4656: Deleted Content Backup should ignore unrecognised URLs
- Also fixes ALF-4657: Content stored on XAM is not cleaned up correctly
- Errors in the listeners are logged only
- ContentStoreCleanerListener checks and warns if the URL is unsupported
22474: Fix to web.xml to correctly validate and therefore deploy on JBoss5.1.0
22485: Fix for NFS losing contents during edit or copy. ALF-4737.
22492: ALF-4652 XAM bug fixes and improvements: Respect 0 'retentionPeriodDays'
22501: Fixed ALF-4763 XAM-enabled nodes must not go to the archive://SpacesStore
22504: Fix for MS Word mimetype is changed when editing via CIFS. ALF-3772.
22520: ALF-4768: WCM (w/ virt svr) - submit (no need to virtualize direct submit workflows)
22526: Externalised setting of BINARIES, plus added bin with jars and dlls
22561: ALF-4792: WCM virt svr - add experimental option for lazy deployment (defer startup of dependent webapps until accessed)
22611: Fixed ALF-1893: Windows 7 SSP Read-only.
Note: Relies on the patched Excel and PowerPoint mimetypes, but also falls back to file exension.
22612: Merged HEAD to BRANCHES/V3.3:
22609: Resolve ALF4822, ALF4818
22628: ALF-3239: Added encoding elements to mysql db url
22656: Fix for Solaris/Gedit problem, keep a mapping for the original file handle to the new path after a rename. ALF-4843.
22673: ALF-4845: Person and Group member deletion performance fix
- Don't batch load all a group's members when trying to delete one of them!
- Can result in infeasibly large hibernate sessions when trying to delete a person / LDAP sync in a repository with very large groups
- Switched off batch loading in NodeService.removeChild()
- Avoided unnecessary use of removeAuthority in PersonService.deletePerson()
22674: Merged DEV/TEMPORARY to V3.3
22653: ALF-661: There is no way to determine the protocol, hostname and port from a javascript kicked off by JBPM
These variables are now available for use in workflow and action javascript and they are wired to the corresponding parameters that already exist in the sysAdmin subsystem.
urls.alfresco.protocol
urls.alfresco.host
urls.alfresco.port
urls.alfresco.context
urls.share.protocol
urls.share.host
urls.share.port
urls.share.context
See bug for example usage
22676: Merged HEAD to V3.3:
20306: Google Doc integration fixes:
- Fixed up inconsistancies in powerpoint and excel mimetypes set throughout the code
- Unit tests failures for excel sheets fixed
- Able to now create and checkout docs, sheets and presentations successfullly
- Docs, sheets and presentations downloadable and viewable
- Fixed ALF-2700
(See ALF-4827)
22715: Merge from V3.2 to V3.3.
r. 22713. Fix for ALF-4946 Possible NullPointerException during creation of thumbnails whose names are null-valued.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22725 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
20167: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20166: Fix ALF-2765: Renditions created via 3.3 RenditionService are not exposed via OpenCMIS rendition API
20232: Fix problem opening AVM web project folders via FTP. ALF-2738.
20234: ALF-2352: Cannot create folders in Share doclib without admin user in authentication chain
20235: Fix for unable to create folders in web project via CIFS. ALF-2736.
20258: Reverse-merged rev 20254: 'When dropping the mysql database ...'
20262: Merged V3.3-BUG-FIX to V3.3
20251: Fix for ALF-2804 - Unable to browse into folders in Share Site in certain situations.
- Browser history filter object in incorrect state after page refresh.
20264: Updated Oracle build support (to fix grants)
20282: Merged PATCHES/V3.2.0 to V3.3
20266: Test reproduction of ALF-2839 failure: Node pre-loading generates needless resultset rows
20280: Fixed ALF-2839: Node pre-loading generates needless resultset rows
20283: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20194: AVMTestSuite - scale down unit tests (slightly)
20247: AVMServiceTest.testVersionByDate - build (add delay)
20290: Fixed ALF-2851 "Drag n Drop issues in IE6 & IE7"
- Reordering rules-list with drag and drop didn't work at all because each rule was created using a template that had the "id"-attribute set, which made IE confused after using HTMLELement.clone() even though the id was resetted
- Both customise-dashlets & rules-list got an error when "throwing" away the dashlet or rule instead of releasing it "carefully", reason was becuuase IE didnt capture the x:y-position which made the animation fail. Now no animation is done if x:y isn't found.
20296: Merged PATCHES/V3.1.0 to V3.3 (RECORD ONLY)
20249: Merged V3.1 to PATCHES/V3.1.0
14565: Updated version to include revision number (x.y.z)
20246: Merged V3.1 to PATCHES/V3.1.0
13841: Build fix
20245: Merged V3.1 to PATCHES/V3.1.0
16185: AbstractLuceneIndexerAndSearcherFactory.getTransactionId() must return null when there is no transaction
20241: Merged V3.1 to PATCHES/V3.1.0
14187: Fix for ETHREEOH-2023: LDAP import must lower case the local name of the association to person.
16167: ETHREEOH-2475: Fixed nested transaction handling in AbstractLuceneIndexerAndSearcherFactory to allow duplicate user processing in PersonServiceImpl to actually work
16168: ETHREEOH-2797: Force patch.db-V2.2-Person to apply one more time to fix up corrupt users created by LDAP Import
- Problem due to ETHREEOH-2023, fixed in 3.1.1
- Also corrects ldap.synchronisation.defaultHomeFolderProvider to be userHomesHomeFolderProvider
- Also requires fix to ETHREEOH-2475 to fix up duplicate users
20221:Merged PATCHES/V3.1.2 to PATCHES/V3.1.0
20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2
19793: Merged HEAD to V3.2.0
19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future.
19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions.
Various OOo-related transformations are returned as available but fail on our test server with OOo on it.
Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations.
I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason.
19707: Return value from isTransformationBlocked was inverted. Fixed now.
19705: Refinement of previous check-in re OOo transformations.
I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state.
19702: Fix for HEAD builds running on panda build server.
OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code.
It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable.
20220: Created hotfix branch off TAGS/ENTERPRISE/V3.1.0
20297: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
20268: Increment version number
20267: ALF-550: Merged V3.2 to PATCHES/V3.1.2
17768: Merged DEV/BELARUS/V3.2-2009_11_24 to V3.2
17758: ETHREEOH-3757: Oracle upgrade issue: failed "inviteEmailTemplate" patch - also causes subsequent patches to not be applied
20217: Merged PATCHES/V3.2.0 to PATCHES/V3.1.2
19793: Merged HEAD to V3.2.0
19786: Refactor of previous test fix. I have pushed down the OOo-specific parts of the change from AbstractContentTransformerTest to OpenOfficeContentTransformerTest leaving an extension point in the base class should other transformations need to be excluded in the future.
19785: Fix for failing test OpenOfficeContentTransformerTest.testAllConversions.
Various OOo-related transformations are returned as available but fail on our test server with OOo on it.
Pending further work on these failings, I am disabling those transformations in test code whilst leaving them available in the product code. This is because in the wild a different OOo version may succeed with these transformations.
I had previously explicitly disabled 3 transformations in the product and I am moving that restriction from product to test code for the same reason.
19707: Return value from isTransformationBlocked was inverted. Fixed now.
19705: Refinement of previous check-in re OOo transformations.
I have pulled up the code that handles blocked transformations into a superclass so that the JodConverter-based transformer worker can inherit the same list of blocked transformations. To reiterate, blocked transformations are those that the OOo integration code believes should work but which are broken in practice. These are blocked by the transformers and will always be unavailable regardless of the OOo connection state.
19702: Fix for HEAD builds running on panda build server.
OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code.
It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable.
20204: Moved version label to '.6'
20298: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
20281: Incremented version number to '10'
20272: Backports to help fix ALF-2839: Node pre-loading generates needless resultset rows
Merged BRANCHES/V3.2 to PATCHES/V3.2.0:
18490: Added cache for alf_content_data
Merged BRANCHES/DEV/V3.3-BUG-FIX to PATCHES/V3.2.0:
20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
20299: Merged PATCHES/V3.2.1 to V3.3 (RECORD ONLY)
20279: Incremented version label
20211: Reinstated patch 'patch.convertContentUrls' (reversed rev 20205 ALF-2719)
20210: Incremented version label to '.3'
20206: Bumped version label to '.2'
20205: Workaround for ALF-2719 by disabling patch.convertContentUrls and ContentStoreCleaner
20149: Incremented version label
20101: Created hotfix branch off ENTERPRISE/V3.2.1
20300: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/V3.3:
20293: ALF-767: remove-AVM-issuer.sql upgrade does not account for column (mis-)order - fixed for MySQL, PostgreSQL and Oracle (DB2 & MS SQL Server already OK)
20301: Merged PATCHES/V3.2.1 to V3.3
20278: ALF-206: Make it possible to follow hyperlinks to document JSF client URLs from MS Office
- A request parameter rather than a (potentially forgotten) session attribute is used to propagate the URL to redirect to after successful login
20303: Fixed ALF-2855: FixAuthorityCrcValuesPatch reports NPE during upgrade from 2.1.7 to 3.3E
- Auto-unbox NPE on Long->long: Just used the Long directly for reporting
20319: Fixed ALF-2854: User Usage Queries use read-write methods on QNameDAO
20322: Fixed ALF-1998: contentStoreCleanerJob leads to foreign key exception
- Possible concurrent modification of alf_content_url.orphan_time led to false orphan detection
- Fixed queries to check for dereferencing AND use the indexed orphan_time column
- More robust use of EagerContentStoreCleaner: On eager cleanup, ensure that URLs are deleted
- Added optimistic lock checks on updates and deletes of alf_content_url
20335: Merged DEV/V3.3-BUG-FIX to V3.3
20334: ALF-2473: Changes for clean startup and shutdown of subsystems on Spring 3
- Removed previous SafeEventPublisher workaround for startup errors and associated changes
- Replaced with SafeApplicationEventMulticaster which queues up events while an application context isn't started
- Now all subsystems shut down cleanly
- Fixes problem with FileContentStore visibility in JMX too!
20341: ALF-2517 Quick fix which means rules which compare the creation/modification date of content should now correctly be applied when content is uploaded to a folder.
20346: ALF-2839: Node pre-loading generates needless resultset rows
- Added missing Criteria.list() call
20347: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20231: Fixed ALF-2784: Degradation of performance between 3.1.1 and 3.2x (observed in JSF)
20356: Merged DEV/BELARUS/HEAD-2010_03_30 to V3.3 (with corrections)
19735: ALF-686: Alfresco cannot start if read/write mode in Sysadmin subsystem is configured
1. org.alfresco.repo.module.ModuleComponentHelper was modified to allow “System” user run write operations in read-only system.
2. Startup of “Synchronization” subsystem failed with the same error as was occurred in issue during modules start. org.alfresco.repo.security.sync.ChainingUserRegistrySynchronizer was also modified to allow “System” user run write operations in read-only mode.
20361: Merged HEAD to BRANCHES/V3.3: (RECORD ONLY)
20345: Fix ALF-2319: CMIS 'current' version mapping is not compliant with spec
20354: Update test to reflect changes to CMIS version mapping.
20363: Merge from V3.2 to V3.2 (all record-only)
c. 19448 OOoJodConverter worker bean correctly handles isAvailable() when subsystem is disabled.
c. 19484 JodConverter-backed thumbnailing test now explicitly sets OOoDirect and OOoJodconverter enabled-ness back to default settings in tearDown
c. 20175 Fix for ALF-2773 JMX configuration of enterprise logging broken
20376: Altered URL of online help to point at http://www.alfresco.com/help/33/enterprise/webeditor/
20395: set google docs off
20398: Fixed ALF-2890: Upgrade removes content if transaction retries are triggered
- Setting ContentData that was derived outside of the current transaction opened up a window
for the post-rollback code to delete the underlying binary. The binaries are only registered
for writers fetched via the ContentService now; the low-level DAO no longer does management
because it can't assume that a new content URL indicates a new underlying binary.
- The contentUrlConverter was creating new URLs and thus the low-level DAO cleaned up
live content when retrying collisions took place. The cleanup is no longer on the stack
for the patch.
- Removes the ALF-558 changes around ContentData.reference()
20399: Remove googledocs aspect option
20400: PurgeTestP (AVM) - increase wait cycles
20422: Added ooo converter properties
20425: Merge V3.3-BUG-FIX to V3.3
20392 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English
20365 : Merge DEV to V3.3-BUG_FIX
18011 : ETHREEOH-3804 - IMAP message body doesn't appears in IMAP folder when message subject is equal to the attachment name
20332 : Build fix - rework to the ImapServiceUnit tests.
20325 : build fix
20318 : MERGE DEV TO V3.3-BUG-FIX
20287 : ALF-2754: Alfresco IMAP and Zimbra Desktop Client.
20317 : ALF-2716 - imap mail metadata extraction fails when alfresco server locale is non English This change reworks the received date metadata extraction.
20316 : ALF-1912 : Problem with IMAP Sites visibility Now only IMAP favouries are shown. Also major rework to the way that this service uses the FileFolderService.
20315 : ALF-1912 Updates to the FileFolderService to support the Imap Service - add listDeepFolders - remove "makeFolders" which moves to its own Utility class. - update to JavaDoc
20429: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20171: 3.3SP1 bug fix branch
20174: Fix for ALF-960 and ALFCOM-1980: WCM - File Picker Restriction relative to folder not web project
20179: ALF-2629 Now when a workflow timer signals a transition it also ends the associated task.
20433: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20184: ALF-2772: Added new test case to RepoTransferReceiverImplTest and fixed the fault in the primary manifest processor.
20196: Temporary fix to SandboxServiceImplTest, which reverses the fix to ALF-2529.
20434: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3: (RECORD ONLY)
20213: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX
r20176 Merge from V3.2 to V3.3.
r20175. JMX configuration of enterprise logging broken (fix).
20215: (RECORD ONLY) Merge from V3.3 to V3.3-BUG-FIX
r20178 JodConverter loggers are now exposed in JMX.
20218: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
20195: Form fields for numbers are now rendered much smaller that ...
20248: (RECORD ONLY) Merging HEAD into V3.3
20284: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
20177: Add 'MaxPermSize' setting for DOD JUnit tests
20305: (RECORD ONLY) Merged BRANCHES/V3.3 to BRANCHES/DEV/V3.3-BUG-FIX:
20236: Add Oracle support for creating/dropping "databases" (users) in continuous.xml
20264: Updated Oracle build support (to fix grants)
20435: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20233: Part fix for ALF-2811: DOD5015 module breaks CMIS tck
20239: Final part of fix for ALF-2811: DOD5015 module breaks CMIS tck
20250: Merge from DEV/BELARUS/HEAD-2010_04_28 to V3.3-BUG-FIX
20230 ALF-2450: latin/utf-8 HTML file cannot be text-extracted.
20253: ALF-2629 Now tasks should correctly be ended when an associated timer is triggered. Should no longer cause WCM workflows to fail.
20254: ALF-2579 Changed teh status code on incorrect password to '401' to reflect that it is an authorisation error.
20263: Fix for ALF-2500: query with a ! in contains search make it strange
20265: Fix for ALF-1495. Reindexing of OOo-transformed content after OOo crash.
20436: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20292: (RECORD ONLY) Latest SpringSurf libs:
20308: (RECORD ONLY) Latest SpringSurf libs:
20366: (RECORD ONLY) Latest SpringSurf libs:
20415: Latest SpringSurf libs:
20437: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20270: Build times: SearchTestSuite
20273: Fix for ALF-2125 - Accessing a deleted page in Share does not return an error page, instead the document-details page breaks
20274: Fix for ALF-2518: It's impossible to find user by user name in Add User or Group window at Manage permissions page (also allows users to be found by username in the Share Admin Console).
20277: Fix for ALF-2417: Create Web Content Wizard if cancelling/aborting Step Two - Author Web Content, any asset being uploaded gets locked
20291: Reduce build time: Added security test suite to cover 17 security tests
20439: Merged BRANCHES/DEV/V3.3-BUG-FIX to BRANCHES/V3.3:
20302: Fixed ALF-727: Oracle iBatis fails on PropertyValueDAOTest Double.MAX_VALUE
20307: VersionStore - minor fixes if running deprecated V1
20310: Fixed a bug in UIContentSelector which was building lucene search queries incorrectly.
20314: Fix for ALF-2789 - DispatcherServlet not correctly retrieving Object ID from request parameters
20320: Merged DEV/TEMPORARY to V3.3-BUG-FIX
20313: ALF-2507: Not able to email space users even if the user owns the space
20324: Fixed ALF-2078 "Content doesn't make checked in after applying 'Check-in' rule in Share"
20327: Fix Quickr project to compile in Eclipse
20367: ALF-2829: Avoid reading entire result set into memory in FixNameCrcValuesPatch
20368: Work-around for ALF-2366: patch.updateDmPermissions takes too long to complete
20369: Part 1 of fix for ALF-2943: Update incorrect mimetypes (Excel and Powerpoint)
20370: Version Migrator (ALF-1000) - use common batch processor to enable multiple workers
20373: Version Migrator (ALF-1000) - resolve runtime conflict (w/ r20334)
20378: Merged BRANCHES/DEV/BELARUS/HEAD-2010_04_28 to BRANCHES/DEV/V3.3-BUG-FIX:
20312: ALF-2162: Error processing WCM form: XFormsBindingException: property 'constraint' already present at model item
20381: Fixed ALF-2943: Update incorrect mimetypes (Excel and Powerpoint)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20571 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- undeleted and reinstated use of org.alfresco.util.Pair
- undeleted org.alfresco.util.PropertyCheck which is used in the deployment code.
- undeleted other org.alfresco.util.* classes which probably should never have been moved to spring surf.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
18717: SAIL-166: Refactor CMIS to use shared services and resolve objectIds and error codes consistently
18731: SAIL-169: CMIS REST versioning compliance
18732: Fix failing change log test.
18768: Add displayName and queryName attributes to rendered properties (in CMIS AtomPub binding).
18775: Fix exception reporting when retrieving items that do not exist (in CMIS AtomPub binding).
18784: Fix CMIS REST change logging
18785: SAIL-174: CMIS Relationship lookup by association ID
18812: SAIL-183: Support orderBy argument for getChildren and getCheckedOutDocs in CMIS REST and Web Service bindings
18823: CMIS WS Bindings were moved to 1.0 cd07 schema.
18838: Update to latest Chemistry TCK.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18847 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
17363: Fix to DbNodeServiceImple to allow restored nodes.
17384: Minor comments
17451: Fix ETHREEOH-2751 / ETWOONE-340 - specialising a node through an action doesn't set default values from model
17459: ETHREEOH-2391 - Invite pending task now has lots of properties
17465: Repo side fix for ETHREEOH-3010: Inbound and outbound Mltext multiple property are not converted correctly
17478: Fix ETHREEOH-3340 - WCM - Revert to snapshot failure (fix AVM getListing -> AVNSync compare -> WCM revertSnapshot)
17483: (record only) Merged V3.1 to V3.2 (record-only)
17482: (record-only) due to earlier back-merge
17493: Fix for ETHREEOH-3342: index.recovery.mode example is incorrect
17494: Fix for ETHREEOH-3027: missingFullTextReindexTrigger (from index-recovery-context.xml) job does not work.
17510: Fix for ETHREEOH-1147: Indexing large indices can lead to Java Heap space.
17511: Fix for ETHREEOH-1271: It is possible to add one category more than one time to the same content or space
17513: ETHREEOH_3366: Altered DictionaryDAOImpl so that passing a null QName into getType and getAspect does not result in an NPE
17531: ETHREEOH-1186: Corrected rssfeed.get.js so a user can configure a RSS Feed dashlet that has been placed on their own dashboard
17550: ETHREEOH-2317: Rule not fired when document has no content
17556: Fixed ETHREEOH-1229: Can't delete space that contains "translation without content"
17558: Fix for ETHREEOH-3356: Forms fail to persist if property or association name has an _ (underscore) in it
17572: Changed caching of person NodeRefs so that duplicates are detected better
17573: Fixed UTF-8 for file with encoded chars
17576: LockAcquisitionException message specific to failed release of taken-over lock
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.2:r17363,17384,17451,17459,17465,17478,17483,17493-17494,17510-17511,17513,17531,17550,17556,17558,17572-17573,17576
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18140 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
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
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
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
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
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
13173: Merged V2.1-A to V3.1
10964: Fix for ADB-81: String 'Template' in Japanese is not good format
10971: Fix for ADB-85: Configure dashboard wizard: long items description get truncated
10972: Fix for ADB-95: All templates should be parameterized using a such that they pickup the server name and port number of the current installation
10973: Fix for ADB-117: Configure Dashboard Wizard. Layout word (Step 3) not localized for japanese and french
13174: Merged V2.1-A to V3.1
10975: Fix for ADB-118: Content attributes not localized [client templates]
13182: Merged V2.1-A to V3.1
11058: Fix for ADB-121: Next & Finish button remain disabled in 'Create Content in your home space' wizard even after entering name when locale is set to French
11059: Fix for ADB-128: Date format is different for 'Manage Content Rules' in Japanese Locale
13190: Merged V2.1-A to V3.1
11070: Fix for ADB-120 ACT 4773
13192: Merged V2.1-A to V3.1
11195: Fix for ADB-130: The 'Finish' button doesn't work after editing the content
13193: Merged V2.1-A to V3.1
8395: Remove user and group admin actions from Admin console [added config switch - off by default]
8584: Removed option for user to change password [added config switch - off by default]
10203: Fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
10374: Further fix for ADB-96: Remove modify button on the User Options Page in the Web UI [added config switch - off by default]
13194: Merged V2.1-A to V3.1
12095: Fix for ADB-131
13195: Merged V2.1-A to V3.1
12097: Fix for ADB-133, ADB-134
12102: Fix for ADB-139
13196: Merged V2.1-A to V3.1
12350: Fix for ADB-142
13197: Merged V2.1-A to V3.1
12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
12878: Merged record-only for V2.1-A to HEAD
12877: Fix for ADB-147: Prevent users from selecting the same action twice in the action wizards
13198: Merged V2.1-A to V3.1
12977: Fix for ADB-158: Intermittent error while accessing the login page
13142: Another fix for ADB-158: Intermittent error while accessing the login page
13199: Merged V2.1-A to V3.1
11589: Fix for ADB-95: All templates should be parameterized
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13570 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13023: ISO date fix for ETHREEOH-1215
13153: Merged V2.1-A to V3.1
9026: - Added "My Content" link to error page
- Manual merge of Safari fixes
- Fixed exploded build target after recent removals
13155: Restored line removed in merge
13156: Merged V2.1-A to V3.1
9027: *RECORD-ONLY* Further Safari rendering fix
9028: Removed use of generics from JSP so it compiles in JBoss
13161: Merged V2.1-A to V3.1
9051: *RECORD-ONLY* Fix for ACT 2806 (linked content was returning 404 error)
13162: Merged V2.1-A to V3.1
8680: *RECORD-ONLY* Added back "too_many_users" message as it got removed
13164: Merged V2.1-A to V3.1
8699: Added DOCTYPE line
8994: Added Copyright for Sun due to Rhino debugger use.
9388: *RECORD-ONLY* ACT-3263 - Localization of "username" and "password" in login.jsp
13166: Merged V2.1-A to V3.1
9748: *RECORD-ONLY* Fix for ACT 3455 (ADB-90) - Editor role can not check out documents
10199: Fix for ADB-86: Clicking 'Cancel' while adding a composite condition for a Rule on a space in CS ES has no effect
13167: Merged V2.1-A to V3.1
10673: Fix for ADB-110/ACT-4247: Review/Change Records Management URLs and make it compatible to Adobe's build
10674: Fix for ADB-109: setting log4j.rootLogger to WARN thows unexpected warn when accessing My Home
13168: Merged V2.1-A to V3.1
10883: *RECORD-ONLY* Fix for ADB-124: Change Search field length to 1
10905: Fix for ADB-114 ACT 4425. Also will fix ALFCOM-1895 when merged to HEAD.
10961: Fix for ADB-44: Create menu link should not be visible if the menu is empty
10962: Fix for ADB-61: Alfresco breadcrumbs + Navigator become inconsistent....
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13567 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
13129: Merged V2.1-A to V3.1
8598: Fix for ADB-41 (ACT 1657)
13139: Merged V2.1-A to V3.1
8674: First phase of using group display name in UI
13148: Merged V2.1-A to V3.1
8679: Completion of using group display name in UI
13149: Merged V2.1-A to V3.1
8690: Fixed ADB-33 again
13150: Merged V2.1-A to V3.1
8775: Fix ACT-2399
13152: Merged V2.1-A to V3.1
8941: ACT-2631: added max users message to send email action page
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12310: Merged V2.2 to V3.0
12306: Merged V2.1 to V2.2
12212: Final set of XSS and HTML encoding fixes for ETWOONE-90
12312: Merged V2.2 to V3.0
12311: Merged V2.1 to V2.2
11667: Fix for ETWOONE-389 - Current page number not always visible on the browse screen.
12316: Fix for merge issue
12317: Merged 2.1 to 3.0
12313: Fix for regression introduced when fixing ETWOONE-91. Also fixes ETHREEOH-1043
12319: Final set of XSS fixes specific to 3.0 codeline see ETWOONE-90
12321: Missing file from previous checkin
12324: Merged 2.2 to 3.0
12320: Merged 2.1 to 2.2
11682: Fix for ETWOONE-87: Behavior of delete cascade
12326: Merge 2.1 to 3.0
11615: Fix for ETWOONE-188: After session has timed out, expanding a space in the Navigator results in unfriendly error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
10982: Merged V2.1 to V2.2
10273: Fix for ETWOONE-317: Error from regenerate renditions wizard when templates are updated
10985: Merged V2.1 to V2.2
10717: Fix for ETWOONE-14: System Error message appears while clicking 'Manage Task' icon in ...
10742: Fix for ETWOONE-119: A user created with space characters at the begin and at the end can't login
10758: Fix for ETWOONE-183: URL addressability of forum spaces and topics
10760: Fix for ETWOONE-339: URL Addressability to discussions causes display issue
10761: Fix for ETWOONE-196: Attempt to post to the same forum by two or more users simultaneously leads to error appearance and impossibility to post for some of them
10772: Fix for ETWOONE-225: Validation.js does not properly handle trailing whitespace
10986: Added Hibernate src to Eclipse project
11004: Remove annoying exceptions on shutdown
11005: Minor javadoc fix
11012: Fixed ETWOTWO-423: Optionally inject the Open Office document converter instance to the transformer
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@11202 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
10931: Merged V2.1 to V2.2
9931: Fix for https://issues.alfresco.com/jira/browse/ETWOONE-295
10094: Further fix for ETWOONE-241: SAXException - XML parser apparently is not thread safe
10101: Resolve ACT 1282: wcm workflow falling over on Oracle while hitting in clause limit of 1000 expressions.
10188: https://issues.alfresco.com/jira/browse/ETWOONE-74 (Part 1)
10447: ETWOONE-328: performance improvement added to rule trigger code
10455: Fix for ETWOONE-306.
10292: Fix for ETWOONE-92: If two users update the same contents at the same time, you get InvalidNodeRefException
10293: Fix for ETWOONE-116: Send email action does not handle invalid email address
10294: Fix for ETWOONE-164: when a powerpoint 2007 pptx is stored in alfresco ...
10341: Action Evaluator request level cache
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10934 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8289: Added jpeg2000 mimetype
8302: Fix for Adobe (ACT 1487)
8306: Solution for Adobe raised ticket ACT 1384
8310: Fix for location based breadcrumb when navigating discussions
8432: ADB-48 - in case of multi-domain lookup, also consistent with AWC LoginBean
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9163 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8265: Added catch blocks for the permissions service access denied exception to various file/folder operations
8286: Merged V2.1 to V2.2
8256: Fix broken WCM workflow.
8257: Partial fix for AWC-1850
8283: Merged V2.1-A to V2.1
8264: Fine-grained debug logging for exceptions causing transaction retries.
8288: Should fix workflow problems. Hard to test since almost nothing works right now.
8291: Added Peter's fixes to improve deployment start scripts
8294: Update deploy script from Peter
8298: Fix for WCM-1058:
8300: Commented out admin dashlet (active_tasks)
8359: Fix AR-1735: Customer-requested POI upgrade
8367: Fix for AWC-1639
8368: Fix for WCM-1102
8389: Revert changes between r8072 and r8251 from Schema2XForms.java
8401: Fix for WCM-1105
8407: Minor typo fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8206: Merged V2.1 to V2.2
8136: Fixed AR-2043: XPathMetadataExtractor extracts empty strings
8169: Fixes to Office add-in for ACT-267 - saving over an existing non-versionable file.
8172: Fix for AWC-1838
8221: Merged V2.1 to V2.2
8210: Fix for AR-1830 - Search not returning expected results for umulat characters
8211: Fix for AWC-1463 - MyWebForms and MyWebFiles templates now check for existance of stores before displaying them
8222: Merged V2.1 to V2.2
8216: Fix for AWC-1357
8223: Missing Serializable interface (for web UI clustering)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8083: Merged V2.1 to V2.2
8066: RM-31 and related issues (ACT-729)
8068: Fix for AR-1997
8084: Fixed script error on notify page of invite website user wizard
8086: Merged V2.1 to V2.2
8075: Clear()ing a hibernate session, is not always enough to guarantee that transactions not use unbounded amounts of memory
8076: Turn off test that needs to be fixed real soon now.
8092: Implementation for: http://issues.alfresco.com/browse/AR-1744
8093: Fixed upgrade scripts for V2.1.2 to V2.2 upgrades
8096: Fix for AWC-1578 and AWC-1814
8097: Added new indexes missing from scripts and made index names consistent.
8098: Fix for AWC-1548
8100: Removed use of QName from alf_permission table
8102: Fix for AWC-1690
8103: test was == on id that used to be long but is now a Long
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
7700: Added store level ACLs.
7705: Merged V2.1 to V2.2
7701: Fixes a number of problems with FS deployment. Should work on windows now.
7712: AWC-1473: Fixed rendering of sidebar in Safari
7718: Merged V2.1 to V2.2
7704: Fix for HSQL column name clash - NEXT is reserved, so now NEXT_ID
7719: Build fix after Qname changes
7730: Build fix for email group.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8446 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261