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
Google Doc Integration
- The following configuration must be added to your alfresco-global.properties in order to enable the googleeditable repository behaviour:
googledocs.username=myuser@bob.com
googledocs.password=pwd123pwd
googledocs.googleeditable.enabled=true
Google Docs Share Integration
- Enabled via share-config (see share-config-custom.xml.sample for details)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
The tagging service and checkout/checkin weren't quite playing nicely
together due to the way the copy policy was being triggered. A new
"before copy" policy was added, to complement the "on copy complete"
policy, and the tagging service updated to use this.
A tagging test which calls checkout/checkin was added that verifies
that the tag scopes now behave correctly under this action.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19692 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
Fallout:
1. Policy handling for 'onCopy' has been changed to 'getCopyCallback'
2. All existing policy usage was refactored to control behaviour more closely
3. The default child association behaviour has changed:
3.1 Types and aspects control their own child association behaviour
3.2 cm:folder recurses into primary children, but merely copies the secondary association
3.3 cm:rule recurses into primary children
3.4 unless behaviour is defined for a child association, there is no recursion or copying
4. Node association behavior has changed
4.1 There is no copying of node associations. Each type and aspect must handle this by
recording nodes and fixing up the required associations in the onCopyComplete.
4.2 If there is a requirement, this can be added to the callback later
See 'org.alfresco.repo.copy.AbstractCopyBehaviourCallback' and derived classes for examples.
Areas to test with particular attention:
1. Normal copy behaviour
2. Copy of documents with discussions
3. Check-in check-out
4. Check-in, check-out of documents where a discussion was added to working copy
5. Copies of documents with thumbnails
6. Copies of documents with rules
7. Copying of hierarchies that contain rules to copy to another location within the hierarchy
8. Copying into folders where named children already exist
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12999: Fixed read-only bootstrap of SiteAVMBootstrap and removed incorrect use of 'assert'
13000: Added log4j to Eclipse classpath (unexported)
13001: Merged V2.1-A to V3.1
9127: Performance improvement to folder copy
9151: *RECORD-ONLY* Fix index back up failing with missing files
13002: Merged V2.1-A to V3.1
9174: Further fixes for ACT-2588 (Lucene backup read-write locks)
9279: Fix ADB-84. PHP module is not restricted by the upper version
10191: Fix for ADB-77: Need to have as the sender's email address the email address of the user triggering the rule
13006: Merged V2.1-A to V3.1
10893: Fixes for ADB-78 & ADB-98
- Fixed service getter/setter pattern as well
10903: Fix for ADB-115 ACT-4355
13010: Made AVMLockingBootstrap resilient to read-only mode
13011: Better message for InvalidStoreRefException
13013: Merged V2.1-A to V3.1
9189: Composite Conditions Support Part 1 of 2 (repo)
9190: Composite Conditions Support Part 1a of 2 ( missed file from repo)
13015: Port of Adobe CIFS/FTP configuration changes
13017: Convert avoids folders given by '--svn-status' option
13018: Merge V2.1A to V3.1
7746: (record-only) Added ability to specify a custom CIFS authenticator class
8533: (record-only) Added the <disableNativeCode/> configuration tag, disable use of JNI code on Windows
8700: (record-only) Update to prevent any native calls via configuration code
8705: (record-only) Filer out the '0.0.0.0' bind address
8864: (record-only) Added the getBean() method for custom authenticators to get access to beans
9054: (record-only) Added the 'AIX' platform type for use in the platforms="..." attribute
8863: (record-only) Fix passthru socket connection timeout, added 'protocolOrder' and 'offlineCheckInterval' config values
12144: (record-only) CIFS virtual circuit fixes
13020: Merged V2.1-A to V3.1 (Composite Actions)
9191: Composite Conditions Support Part 2 of 2 (client)
9243: Composite Conditions Support Part 1 of 2 (client)
9245: Composite Conditions Support Part 2 of 2 (repo)
13021: Merged V3.0 to V3.1
13008: Merged V2.2 to V3.0
12824: (record only) Change admin access to the web project staging store to be read-only in the virtualization view - ETWOTWO-933
13024: Ported CIFS configuration changes from Adobe V2.1A, missed checkin.
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V2.1-A:r9127,9151,9174,9189-9191,9243,9245,9279,10191,10893,10903
Merged /alfresco/BRANCHES/V3.1:r12999-13002,13006,13010-13011,13013,13015,13017-13018,13020-13021,13024
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
12140: Merged V2.2 to V3.0
11732: Fixed ETWOTWO-804: Node and Transaction Cleanup Job
11747: Missed config for Node and Txn purging
11826: WCM - fix ETWOTWO-817
11951: Fixed ETWOTWO-901: NodeService cleanup must be pluggable
11961: Merged V2.1 to V2.2
11561: ETWOONE-224: when renaming duplicates during copy association names where not renamed
11583: (ALREADY PRESENT) Updated NTLM config example in web.xml - adding missing servlet mappings
11584: Fix for ETWOONE-209 - JavaScript People.createGroup() API now correctly checks for actual group name when testing for existence
11585: Fix for ETWOONE-214 - View In CIFS link now works even when users des not have view permissions on the parent folder
11612: Fix for ETWOONE-91: the description textarea in the modify space properties web form eats one leading newline each time it is submitted
11613: Fix 2.1 build and adjust implementation of ETWOONE-224 fix
11621: Fix for ETWOONE-343
11669: Improved debug from index tracking when exceptions occur
12141: Avoid annoying Spring WARN messages for ClientAbortException
12143: File that should have been deleted in CHK-5460 (rev 12140)
12177: Fix failing FS Deployment Tests since introduction of transaction check advice.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12507 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
11509: ETHREEOH-394: Incorrect message in activity feed when user accepts an invitation to a site
11510: Fix to set position
11511: Fix for ETHREEOH-533: Dialogs access via ExternalAccessServlet return to blank empty container.jsp page when Close button is clicked
11512: Fix DM ACL deletion after merge forward for shared and defining ACLs.
11513: Merged V2.2 to V3.0
11501: Expose if set permissions are inherited or not and fix relatd behaviour for import/copy
11514: Fix for ETHREEOH-476 (Impossible to create Site Invite Workflow) & ETHREEOH-254 (Default value at 'Start Advanced Workflow Wizard' page)
11515: Fix for ETHREEOH-446 and ETHREEOH-447
11517: Fix for ETHREEOH-225: Web Forms with repeating elements don't work
11518: Merged V2.2 to V3.0
11343: ACL upgrades may require a COW - it now warns when this happens.
11369: Always lock against staging - ETWOTWO-763
11519: Merged V2.2 to V3.0
11467: Fixed ETWOTWO-774: CreateVersionTxnListener.afterCommit() throws NPE
11468: More defensive coding on AVM txn listeners (avoid NPEs)
11475: More defensive checks to avoid NPE
11520: Merged V2.2 to V3.0
11478: Keep creator and owner as orihinally set in AVM - Fix for ETWOTWO-604
11521: RuntimeExec: Added optional directive SPLIT: to force argument tokenization
11522: Limited tests to just check the command format not execute it for "dir . .."
11523: Undid revision 11520 (Merged V2.2 11478)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12449 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8630: Merged V2.1 to V2.2
8513: Fixed AR-2157: Integrity checking fails when target roles are present on child associations
8517: Fixed AR-2171: NPE restoring large hierarchy
8519: New workflow description field limited to 100 characters (AWC-1938)
8520: Removed copy of mysql connector to tomcat distribution
8529: Fix for pop-up task panel, when task has due date
8537: Fix for AWC-1951
8538: AR-2141: Problem copying large hierarchical folder structures
8594: Closing of servlet output stream in TemplateContentServlet
8616: Fix for WCM-1134 (editing rich text area, causes relative links to become absolute in IE)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5141 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@51352 .
- FLOSS
- Some files will need a follow-up
-root/projects/repository/source/java/org/alfresco/repo/avm/wf/AVMRemoveWFStoreHandler.java (not yet on HEAD: 5094)
-root/projects/repository/source/java/org/alfresco/filesys/server/state/FileStateLockManager.java (not yet on HEAD: 5093)
-onContentUpdateRecord (not on HEAD)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- WARNING: this change requires a new DB as the WCM model has changed significantly, yes I have probably broken a few WCM things :)
Previously the following statements were true:
- Most of the model constants were defined in the ContentModel class - including web-client Application specific model items
- WCMModel class was a mix of WCM repository and WCM application model constants
- The applicationModel.xml definition file contained both web-client Application and WCM application model definitions
- The wcmModel.xml definition file contained both WCM repository and WCM application model definitions
The following statements are now true:
- All web-client application specific model constants have been moved from ContentModel to a new model constants class ApplicationModel
- A new WCM application model has been defined with the prefix "wca" and URI: http://www.alfresco.org/model/wcmappmodel/1.0
- All WCM application specific model constants have been renamed/moved from ContentModel/WCMModel to a new model constants class WCMAppModel
- The mix of WCM application specific model definitions in contentModel.xml and applicationModel.xml has been moved to a new definition file wcmAppModel.xml
- A patch is not required for standard Alfresco as only WCM definitions have actually changed
. Fix to issue created during workflow id/name refactor
. Fix to allow forms in the Available Content Forms panel to have correct sandbox/username context for action dialog
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4448 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261