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
svn merge svn://svn.alfresco.com:3691/alfresco/HEAD@5141 svn://svn.alfresco.com:3691/alfresco/HEAD@5140 .
- 5141 was carried to V2.0 prior to this
- No other actions are required
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Support for notification to virt server on dialog-driven revert operations.
No support yet for workflow-diriven revert notification (coming soon).
Details
-------
root/projects/catalina-virtual/source/java/org/alfresco/catalina/host/AVMHostConfig.java
Minor logging cleanup
root/projects/core/source/java/org/alfresco/util/VirtServerUtils.java
Trigger notification on submits of entire dirs: WEB-INF, WEB-INF/classes, WEB-INF/lib
(not just files within them)
root/projects/web-client/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
notify virt server on revert
root/projects/web-client/source/java/org/alfresco/web/bean/wcm/RevertAllDialog.java
notify virt server on revert all
root/projects/web-client/source/java/org/alfresco/web/bean/wcm/RevertSelectedDialog.java
notify virt server on revert selected
root/projects/web-client/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
minor cleanup
root/projects/web-client/source/web/WEB-INF/faces-config-beans.xml
Injecting AVMSyncService into AVMBrowseBean to allow virt server
notification to occur only when a comparison between reverted
versions shows it's absolutely necessary
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5030 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- AVM files and folders can be cut and copied to the clipboard
- AVM files and folders can be pasted (copied or moved) around a sandbox
- The usual "Copy of …" filename logic applies
- Cut and Copy actions now appear for AVM nodes (as appropriate for user permissions)
- Refactored logic for cut/copy into specific clipboard item classes - WorkspaceClipboardItem and AVMClipboardItem
. Fixed unreported issue where the DownloadContentServlet was unable to open content for AVM paths containing a space character
. Pager control border style alignment improvement
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- help cursor mouse over added to help icon
- incorrect alt text removed
- renamed output path pattern help jsp page to standard naming convention
. Found that all "Required Field" images in our JSPs with ALT text were not I18N - find-and-replaced all occurances with an I18Ned message
. Some more WCM UI improvements/fixes
. Fix up of 3rd Party Eclipse project after xalan library changes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- misc ui fixes per usability meeting this morning
- using action node path in XFormsBean since current path isn't reliable in workflow context
- getting location column to work in manage task screen. had to use actioncontext.id for wcm actions since path can be a Path object in workflow screens
- adding property resolvers to AVMNode for common props
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- refactoring to generate and regenerate methods to make it easier to use project level overridden properties, and to at some point (soon) make it possible to make error handling for rendering engines more robust
- added a web project object to encapsulate web project properties and provide a central location for getting forms and rendering engines with web project level overridden properties
- made select default workflow screen match wireframes
- using the same workflowdefault type in the wcm model for web projects and forms.
- using outputpathpattern aspect consistently
- using commons.io to parse paths
- using form name rather than noderef as parameter for selected form from content forms dashlet
- fixed bug where rendition properties noderef wasn't being properly associated with renditions causing problems with regenerate
- using multivalued properties to track renditions
- remove weird registerRendition/registerFormInstanceData calls. no longer necessary since generateRendition and regenerate are done within forminstancedata and rendition
- adding default workflow parameters as property of Form
- adding a unique name property to rendering engine templates to allow for looking one up by name
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- added utility methods to AVMConstants to extract information about stores from their names. this has to be reimplemented to look at store properties rather than inferring things from their names - but it works for now. this also centralizes all the usage of the store name to infer data about it so it'll make it easier later.
- made the problematic constants jon changed private to avoid having this problem happen again
- checked pretty much every usage of buildAVM<bla> to ensure that nothing else was broken. in the process removed the AVM part from the buildAVM<bla> part of the method to shorten it and since it's redundant with the classname AVMConstants in which their contained.
creating workflow sandboxes in a manner consistent with user sandboxes
- added a method to SandboxFactory to create workflow sandboxes. they're created with the name <storeId>--workflow-<guid>
- centralized workflow package creation code in AVMWorkflowUtil.
- refactored sandbox creation code to use new utility methods in AVMConstants and so that at some point it can be further refactored.
getting avm actions to show up in manage task screen for avm workflows
- modified the model to use different packageItemActionGroups for wcm workflows
- modified the AVMWorkflowEvaluator to allow all actions for items in a workflow package
- added some debug output to various classes
- made wcm navigation ids exposed throughout the app since they are now called from workflow jsps.
things that now work that didn't before:
- virtualization now works again with jon's new naming scheme
- some actions from the manage task screen.
known bugs introduced or remaining as a consequence of this change (i'll filed jira issues for these as soon as i commit this):
- i'm inaccurately counting the number of users in a sandbox since it's harder now to differentiate between user main sandboxes and all the other ones that are being created
- preview does not work on assets within the workflow sandboxes
- review and approve workflow does not appear to actually submit once approved. not sure if it did before
- lots of actions still do not work from manage tasks, though edit does appear to.
- i commented out the location column in the manage task screen since the path link was causing me troubles - need to put that back in.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- refactoring of revert functionality into Undo All and Undo Selected dialogs
. Performance enhancement to Node class - to cache Path value from NodeService and changed appropriate class to use this
. Fix to horribly broken values in AVMConstants
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4690 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- most actions such as Submit, Edit, Delete, Revert etc. are unavailable when an item is within a workflow
. Fix to preview url generation after executing an action in the Staging area that changed the UI context
. Another icon from Linton
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4638 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Import of website content
- Edits/uploads to WEB-INF/web.xml, WEB-INF/lib/*, WEB-INF/classes/*
- Addition of new user sandbox
- Removal of a user sandbox
. Fix to generation of website preview url in sandbox display when switching between root webapp folders
. Fix to issue when swapping between web projects that did not contain the same webapp context
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4611 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Fall back values are used if no virtualisation server is running (with a warning output to the log)
- Values are retrieved and cached for 10 seconds - so if the virtualisation server is started after the main Alfresco server then it will take up to 10 seconds for those values to be updated
. Adding missing NameMatcher impl to compare() call in AVMBrowseBean
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4602 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Creation of new root webapp folders via specific action or via Edit Web Project wizard
- Modification of default webapp folder in Edit Web Project wizard
- Switching of 'current' webapp for staging/sandbox views in the browse web project screen
- Filtering of files in sandbox modified file list by current webapp
- Submit All action correctly respects the current webapp
. A few minor UI tweaks to placement of menus and actions in web project/sandbox views
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4594 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
. Submit Dialog now requires comment+label field to be completed
. DNS name client-side check now allows captial A-Z characters
. Create Shortcut action now available for Website folder type
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4584 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
1. Refines the semantics of ghost creation, so that they only appear when
warranted.
2. Implements a mechanism for filtering out files which should not appear in comparison
results or be pushed along by updates.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4525 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- first pass of JSP layout
- multiple items or all items available for selection
- calculation of available workflows, from those assigned to form assets and assigned to the website
- creation of AVM workflow package
- starting of workflow containing AVM package (appears in users task todo dashlet!)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4524 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
- the web-app folder name specified at Web Project creation time is created by default and is the root folder for all sandbox operations
- a mechanism for selecting a different root webapp (or creating new root folders) can be easily added later (when there is time…!)
. Removal of two public workflow actions that have no params and therefore don't work as public actions in the UI
. Fix to user sandboxes component to allow any user to always have action to delete a user sandbox
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4445 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Each sandbox (and the user assignment to the web project) can be removed by a Content Manager role user
- This and the new 'Invite Web Project Users' functionality means sandboxes can now be added and removed from a existing web project
. Web-client ADMIN users can now perform any Content Manager action in the website view
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4440 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
. List of Recent Snapshots component added to Staging area information table
- TODO: finish implementing Revert to Snapshot action in the UI
. Date filter UI implemented for recent snapshots (as there will be lots!)
. Fixed issue with name/title confusion in FormsService.getForm(name) method
. Added Default Webapp field to Create Web Project wizard and added to WCM model for a web project
- TODO: implement this as default root path when browsing a sandbox
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4413 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- stub implementation of Submit All, Revert All
. Available Content Forms panel added to User Sandbox component
- shows forms assigned to the web project (configured in the Web Project wizard)
. Fix to RenderingEngineTemplateImpl refactor that was causing a null-ptr exception in the web project wizard
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
- Scrollable list of registered Form Templates
- Add to List feature to add selected form template to data list
- Remove Form Template
- Fist pass of Form Template Details page
. UISelectList component now support "rowIndex" property for single components rendered multiple times in a list
- This allows command buttons etc. to be rendered multiple times but have access to the correct row data during event handling
. Minor UI tidy ups to UIData based tables with "no items"
. Some code cleanup, use of logger pattern
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4270 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
Workflow packages. It's hooked up to the sumbit single file action in
the top level website screen in an exceedingly awkard way. The UI
doesn't complain about anything, nor does it display the contents of
the package.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4099 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
