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
13218: Partial fix for ETHREEOH-1259 - the null pointer exceptions are gone to be replaced by sensible error messages.
13220: Merged V3.0 to V3.1
13219: Build Fix for error in hand merge of r13141 from V2.2 to V3.0
13226: Clearer debugging of exceptions during NodeService cleanup
13228: ETHREEOH-1250
13229: Fix for ETHREEOH-1184: Share webscript configuration does not support international chars as values
13235: Add support to exclude admin and guest from person permission fix ups. Tidy up for ETHREEOH-1239
13239: Build Fix
13243: ETHREEOH-1308: Update AMPs to indicate unsupported status
13247: Build fix - do not delete admin :-)
13248: Fix build
13254: Fix for ETHREEOH-1351: Schemas containing an enumeration with an empty string ...
___________________________________________________________________
Modified: svn:mergeinfo
Merged /alfresco/BRANCHES/V3.0:r13219
Merged /alfresco/BRANCHES/V3.1:r13218-13220,13224,13226-13229,13231-13232,13234-13237,13239,13241,13243-13248,13250,13252-13254
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13612 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
Fix to apply 'versionable' aspect to documents that are being updated via the Share client but were initially uploaded via another route i.e. FTP or JSF Client.
Minor fix to doclist json to handle documents that have 'versionable' aspect applied but do not have any version history.
Code cleanup to ML document details.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
8105: Fix for AR-1828 - multiple users being created from web siteregistration
8107: Merged V2.1 to v2.2
8106: Fixed fallout from MetadataExtractors setting properties to thecorrect data type
8109: Fix for AR-2016
8119: AR-1778: putContent method in the ContentUtils class fail to upload*.java, *.txt, *.xml
8120: AR-1895: fix to web service SDK sample
8125: Test added to prevent regression of AR-1707
8126: Enhanced exception message when non-marking InputStream is used.
8131: Merged V2.1 to V2.2
8129: Merged V1.4 to V2.1:
8128: Fix AR-2041: NPE checking voids during index tracking
8140: AR-1762 - correct generation of download servlet URL
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8477 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
6436: Support for virtualized cookie paths, aggressive cleanup of sockets when virt server is down.
6439: Fix for WCM-619 & WCM-571
6440: Encoding of text/html files created inline using the web-client now has sensible default. AWC-1324.
6442: Fix for WCM-621 (reviewer can not view or run links report)
6443: Fix for AWC-1488. Dashboard
6444: Fix for WCM-693 issue with submitting a deleted directory if no workflow associated with web project.
6445: Icons for use in fix for WCM-522
6446: Office Add-Ins: Fix for AWC-1481 - Login dialog can appear recursively
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
TODO: Fix the "Modify Content Properties" to include the encoding as a changeable option.
Modified other entry points of content into the system. All calls to ContentWriter.setEncoding("UTF-8") need some serious examination.
It is no longer necessary to assume anything about the encoding. The worst case scenario is that we guess the encoding from the stream
without giving the user the chance to change it. This works for most non-interactive scenarios like CIFS, WebDAV and FTP, now.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6113 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
- fixing bug with default values for select widgets
- some more unit tests for repeating items, and xsd attributes
- parsing xsd when creating the form and presenting a combobox with element names that are possible root tag names
- ensuring that there can't be multiple output methods that output the same extension
- moving createxmlcontenttype to createformwizard in wcm where it belongs.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4112 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- fixed issue where the Add To List button was enabled when nothing was selected - caused null-ptr exception when pressed in this state
- fixed Next button enabled state when nothing is selected on the Configure Template Output Methods screen
. Removed "additional properties" checkbox and text in Create Web Content Wizard details page - not applicable for this wizard
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4052 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- fixed issue where the Add To List button was enabled when nothing was selected - caused null-ptr exception when pressed in this state
- fixed Next button enabled state when nothing is selected on the Configure Template Output Methods screen
. Removed "additional properties" checkbox and text in Create Web Content Wizard details page - not applicable for this wizard
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
. Permission evaluators added to AVM browse screen top-level actions and file/folder actions
. Permission evaluators added to Edit Details action in File/Folder Details screens
. Each user sandbox is now only visible to the assigned user and all Content Managers
. Import Website Content action hidden unless user has appropriate Write permissions to the main staging area (Content Managers only)
. Added Titled aspect to shtml content created through the XML Templating Service.
. Remove Create Content action from sandbox screen - makes no sense here until we can create via workflow or destination folder
. Fix nasty bug in Create Form Wizard where no default extension would be specified
- this led to the XForms generating files such as "myfile.xml" and "myfile." - the generated HTML did not have a file extension...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4048 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- renamed create-xml-content-type wizard to create-form wizard and moved it into the wcm source tree
- modified the create form wizard to accept 0 to n template output methods
- changed terminology from presentation template to template output method
- using associations to track output methods
- added file extension as property of templateoutputmethod to parameterize what the name of the output file should be
- auto adding .xml to file name in create web content if none specified.
- making associating an output method with a template optional
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4043 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Content Managers have access to all sandboxes, including staging sandbox
- Other invited users have appropriate permissions as per their role
- Users (except managers) are now restricted to making changes within their own sandbox - and commiting those changes
- TODO: add evaluators to hide inappropriate actions for users
. Minor bug fixes to Create XML Form wizard
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4041 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- renamed create xml content type to create form
- writing xsds and xsls into the data dictionary
- using search to implement TemplatingService.getTempalteTypes()
- adding fields to create form screen for the root tag name to use within the schema and for a display name within the dropdown (friendly non file name name)
- using aspects from the wcmModel to categorize and relate templates and templateoutputmethods
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4014 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- this has highlighted some interesting future issues with AVM NodeRef objects - as unlike the usual noderefs, they can change due to a rename or move!
. Fixed issue with navigating back to details and browse screens after a delete file/folder operation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Create Web Content action (HTML and plain text) now creates content in the current AVM store
- TODO: create in the correct sub-folder
- Refactoring of the modified Create Content Wizard into a new wizard Create Web Content Wizard
- Integrated XML form templating into the current website AVM path (still needs some testing/fixing up…)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Added Edit and Delete actions for AVM files and Delete action for AVM folders
- Available on the Modified Items list for a user and also in the website sandbox browse screens
- Edit is working using the inline editors for plain text and HTML files - XML form content editing to be integrated shortly!
- Edit for non-inline editable files is working (i.e. download file), but no "Update" action available at present for saving updates
- Delete will delete files/folders structures from the current sandbox, deleted files in a layer are shown in My Modified Files (see below)
- User sandbox My Modified Files now shows deleted files as differences (as ghosted out rows)
- Refactoring of the modified Create Content Wizard into a new wizard Create Web Content Wizard
- responsible for creating content in the AVM store rather than usual SpacesStore
- removed XML specific handling from Create Content Wizard (now only present in Create Web Content Wizard)
- Create Content action added to sandbox view - NOTE: does not yet create content in the AVM world!
- Added "jsp" filetype as plain text format mimetype (to allow inline-edit for JSP files as website content)
- Open/closed state of My Modified Files panel is remembered between screen refreshes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- "Websites" folder created under root of Company Home during bootstrap
- Bootstrap properties and getter helper added to import-export-context & web-client
- Beginnings of the Create Website wizard
- Action definition added for Create Website action
- Beginings of the model for avm webfolders and associated sub-structures
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
