Commit Graph

37 Commits

Author SHA1 Message Date
Derek Hulley
7ab2e83a19 Merged V2.2 to HEAD
8078: Merged V2.1 to V2.2
      8025: Fixes WCM-1039, problems with case insensitive name handling.
   8079: Merged V2.1 to V2.2
      8035: -- DONE SEPARATELY --
      8040: Fix AR-1985: SQL Server dialect is derived from Sybase dialect there need additional no-op script
      8046: Better Javadocs for getChildByName()
      8056: Fixed WCM-790: Date conversion for metadata extractors
      8057: Fixed WCM-790: Properties that don't convert can be discarded (default is to fail)
      8059: -- DONE SEPARATELY --
      8061: Fixes WCM-790: Fallout from CHK-2168 and CHK-2169
   8081: Fix for WCM-1018
   8082: Merged V2.1 to V2.2
      8016: Merged V2.1-A to V2.1
         8000: Additional indexes for AVM
         8013: Patch to introduce reverse indexes required for AVM


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-10 12:17:10 +00:00
Gavin Cornwell
90eff8cbf0 Merged V2.2 to HEAD
7389: Added Deploy action to user sandboxes
             Renamed DeploySnapshotDialog to DeployWebsiteDialog and AVMDeploySnapshotAction to AVMDeployWebsiteAction
             Updated UIDeployWebsite component to list unallocated test or live servers
             Updated DeployWebsiteDialog to update allocatedto property on server config when necessary
  7392: Incorporated panel graphics from Linton for deploy server configuration
             Applied feedback from Linton on add, edit, remove deploy server config
  7412: Added ability to re-deploy to test servers
             Added ability to view deployment reports for test servers
             Added ability to preview test servers

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-02-21 15:24:41 +00:00
Gavin Cornwell
6bc01211dd - Combined run and report dialogs for links management into one to solve some navigation issues
- Fixes for links management UI in IE

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6067 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-22 13:39:15 +00:00
Gavin Cornwell
7a35bf3715 - Links management UI
- Made AJAX polling frequency configurable
  - Made connection and read timeout values configurable
  - Added panel around summary area
- Removed use of shadowed panels for staging area and user sandboxes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6061 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-21 22:19:13 +00:00
Gavin Cornwell
fcacf048c0 Refactored links management UI following link validation service API changes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6024 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-19 21:30:52 +00:00
Gavin Cornwell
3ad9668624 - Partial first cut of initial version of links management UI
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5917 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-11 20:54:23 +00:00
Gavin Cornwell
6419aef81e First cut of pending submission UI
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-21 15:15:48 +00:00
Derek Hulley
69694b7ac0 Merged V2.0 to HEAD
5456: (From WCM_DEPLOY)

There were many pure conflicts on license headers, one conflict due to CR-LF and
some other smaller issues to resolve:
-----------------------------------------
Resolved (line endings not cr-lf):
   root\projects\repository\config\alfresco\public-services-context.xml

Reverted:
   root\projects\web-client\source\web\images\icons\ajax_anim.gif

Reverted or Resolved (License text conflicts):
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\JndiTest.java
   svn resolved root\projects\jndi-client\source\java\org\alfresco\jndi\AVMFileDirContext.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\AVMBulkLoader.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilter.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilterInfoBean.java
   svn revert -R root\projects\catalina-virtual\source\java\org\alfresco\mbeans
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\context\AVMStandardContext.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappClassLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMResourceBinding.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostConfig.java
      - why the change in method naming convention?
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHost.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\DefaultAVMResourceBinding.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValveTest.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValve.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostMatch.java

Modified:
   root\projects\web-client\source\java\org\alfresco\web\ui\wcm\component\UIDeployWebsite.java (Kevin to check line 330)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-12 01:41:14 +00:00
Kevin Roast
4c8b0a596d MyFaces 1.1.5 offers improved performance (around 10-15% overall client performance improvement!) over 1.1.1.
Dependant libraries also required upgrading:
commons-logging -> commons-logging-1.0.4
commons-beanutils-1.6.1 -> commons-beanutils-1.7.0
commons-collections-3.0 -> commons-collections-3.1
commons-digester-1.5 -> commons-digester-1.6

updated appropriate classpaths

note: all JSPs required global find-and-replace as form tag attribute 'acceptCharset' changed to 'acceptcharset'

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5334 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 15:37:38 +00:00
Paul Holmes-Higgin
7fd19e7e88 Updated copyright
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-19 17:17:36 +00:00
Derek Hulley
aa5f666c21 Merged V2.0 to HEAD
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
2007-02-16 06:44:46 +00:00
Derek Hulley
103e3f9cef Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5104 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5105 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5107 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5108 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5114 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-13 12:47:46 +00:00
Paul Holmes-Higgin
acb00e83dd Changed licence headers
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5081 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-08 18:59:58 +00:00
Kevin Roast
cd9d63ac77 http://issues.alfresco.com/browse/WCM-308
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5077 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-08 14:04:53 +00:00
Kevin Roast
f21f236122 Clipboard message changes applied to WCM browse/details screens
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5067 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-07 14:32:58 +00:00
Kevin Roast
9e40f41824 . Fix for http://issues.alfresco.com/browse/WCM-267 and http://issues.alfresco.com/browse/WCM-238
- Improvement to alignment/wrapping issues with dynamic HTML DIV menus in IE
. Refactor of ActionLinkRenderer code, fixes subtle alignment issues in IE and improves performance

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5023 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-02 17:33:31 +00:00
Kevin Roast
c5bac4e265 JSP and TLD changes for 2.0 look
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4862 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-17 14:19:27 +00:00
Kevin Roast
cc14e27cd6 . Output path pattern help added to Create Website wizard (Configure Form Templates and Web Form Details pages)
- 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
2007-01-10 11:25:32 +00:00
Kevin Roast
8b10b42a07 . Version History list for a file (available in the File Details screen)
- View previous file version content
 - Sorted by most recent version first
 - Revert to a previous version action
. Some more changes to Create Web Project wizard from Usability Review

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4756 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-08 19:13:45 +00:00
Kevin Roast
51ce3c21d7 . Import Website Content dialog removed from Web Project screen and added to Create menu in Browse Sandbox screen
- Renamed "Import Website Content" to "Bulk Import"
 - Action can be used to import an archive of content into any folder, such as a root webapp folder or a sub-folder of content
 - Action can now be used to import into a user sandbox rather than just the staging area

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-04 11:17:45 +00:00
Kevin Roast
35f25777de . Hooks to notify virtualisation server when the following cases occur to a web project:
- 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
2006-12-14 16:18:32 +00:00
Kevin Roast
d9e7a9e5ad . Multiple webapp folders now supported for a Web Project
- 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
2006-12-13 14:57:08 +00:00
Kevin Roast
3fb9505fe0 . Single web-app per Web Project changes implemented in Sandbox browsing view
- 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
2006-11-27 12:07:36 +00:00
Kevin Roast
2985d1d77d . Web Project Details page - override for standard space properties page
- fixes WCM-15 issue with space icon property
. Added Actions menu drop-down to main website sandbox view
 - View Details and Delete actions available here

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4418 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-22 11:12:58 +00:00
Kevin Roast
8fbaca99b9 . Staging area 'snapshot' action implemented in the UI
. 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
2006-11-21 17:13:04 +00:00
Kevin Roast
97cb403335 . Fix to issue with Create Web Content form initialised with the correct form template in the drop-down
. UI action and dialog framework for Snapshot Sandbox action

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4395 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-20 15:00:35 +00:00
Kevin Roast
96654d4dd4 . Added permission evaluators to View File/Folder Details actions
. Import Website Content now only accessable by Content Manger role users

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4050 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-06 14:44:52 +00:00
Kevin Roast
1ee6e16326 . Refactored client AVM Node class to extend existing Node class - allows the use of existing PermissionEvaluators etc. for a node action
. 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
2006-10-06 12:53:22 +00:00
Kevin Roast
1b9ca2ac8b . WCM UI
- Fix to ui issue with generated components IDs when viewing multiple websites (JSF hell!)
 - Added Preview Website action to the website browse page

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3921 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-25 15:14:04 +00:00
Kevin Roast
c9f6f17756 . WCM UI
- Preview Staging area action added
 - Preview User Sandbox action added
   - Generates the virtualisation server URLs to an AVM sandboxes for the - possible to preview the entire website with transparent overlays for each user.
 - Fix to generation of mangled DNS name for a user store to remove the "main" part (implicit)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3918 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-25 12:57:19 +00:00
Kevin Roast
9fe7ccf523 . WCM UI
- 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
2006-09-20 14:33:42 +00:00
Kevin Roast
27f88a31c2 . WCM UI
- Summary information for a staging area based on the AVMStoreDescriptor
 - More work on the Modified Files list
 - Framework and components for actions against AVM content and folders

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3855 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-19 21:42:08 +00:00
Kevin Roast
baa90889af . WCM UI enhancements
- Progress bar indicator on ZIP website import screen
  - Clickable links for sandbox icons (same as clicking browse action icon)
  - Size field added to file list for website browsing

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-18 15:25:34 +00:00
Kevin Roast
be0bc389cc . Checkpoint of WCM UI
- Multi file/folder import via ZIP file into an AVM website store, through the Import Website Content action on the main page for a Website.
  - The folder structure and file content from the ZIP file is unpacked into an AVM store
  - Folder and file structure visible to user sandboxes through the layer directories in their respective stores
 - Browse action added to staging sandbox and user sandbox panels
 - Icon images from Linton added

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3807 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-15 17:10:02 +00:00
Kevin Roast
64f50671da . Checkpoint of WCM UI
- More implementation of the User sandboxes UI
   - added actions placeholders for Preview, Create and Browse for sandbox
   - Modified files list component framework and placeholder
 - Import Website Content dialog component framework pieces

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3791 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-14 14:18:26 +00:00
Kevin Roast
66803daad8 . Checkpoint of WCM UI
- First pass of the Staging/User Sandboxes view for an AVM website folder
   - Basic layout and component structure only, nothing works yet
   - Panel for each user sandbox, collapsing area for change files (nothing in it yet)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-13 16:44:01 +00:00
Kevin Roast
cac41478d2 . Checkpoint of WCM UI
- Create Website Wizard now creates the appropriate structure of stores and layers for a website
   - A website has a sandbox comprising of a staging area and a preview area layered ontop of that
   - Each user has a sandbox comprising of a main area (layered ontop of the staging area) and a preview area layered ontop of that
 - Added store level meta-data to tag the website stores with appropriate DNS names and markers for sandbox-id and sandbox types
. AVM "reallybad.jsp" demo page renamed to avm.jsp with a few UI tweaks for easier command input etc.
 - removed the terrible.html as no longer required - just launch avm.jsp directly

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3772 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-12 17:23:38 +00:00