Commit Graph

35 Commits

Author SHA1 Message Date
Ariel Backenroth
710ac5b727 externalizing widget config for xforms to xml
- adding a utility method to ConfigElement to get a list of child config elements by name
- using JSONObject to generate js rendition of config
- adding a build script to build json.jar since json.org only distributes source
- adding a preview link for form instance data to create web content summary screen
- doing the full jsp2.0 thing with summary screen for create website, i have a hunch it will fix a websphere issue

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5943 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-06-13 21:11:24 +00:00
Derek Hulley
24a483f73d Merged V2.0 to HEAD
5457: Merge error on copy web project action
   5459: AR-1278
   5461:
   5462: A few deployment fixes
   5469: Dictionary messages
   5470: L2 cache checks
   5478: WCM-374


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-12 02:02:42 +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
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
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
847588cd5c Fixes for component ID related issues in Create Web Project wizard in Jboss Portal
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4883 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-19 11:36:18 +00:00
Kevin Roast
d1324409be . Fix to issue saving modified workflow configuration overwriting old settings
- http://issues.alfresco.com/browse/WCM-219
. Fix to issue saving removed association(s) from worklow config
 - http://issues.alfresco.com/browse/WCM-141

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4837 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-15 18:38:24 +00:00
Kevin Roast
86ef70fedd . Bug fix on Forms page of Create Web Project wizard - "Workflow not configured" warning wasn't displaying
. WCM ContentReviewer bug fix - role can no longer seem Forms (as they cannot create - they can only edit existing items)
. Submit dialog bug fix - can now press OK after entering workflow config when the dialog previous displayed an error

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4830 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-15 14:08:11 +00:00
Ariel Backenroth
208716aadc making summary screens mostly consistent. this is a stop gap until after beta when we will make them prettier.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4818 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-13 01:17:12 +00:00
Kevin Roast
ebae3000cf . WCM UI enhancements
- sizing of selected item lists
 - No modified items/no web forms messages added to sandbox views
 - Sizing of output path text boxes
 - Description textboxes in web project wizard now textareas
 - Selected Web Forms list in Create Web Project wizard now looks like lists in Create Form Wizard
 - Improved list layout in Configure Templates dialog
 - Mimetype of template shown next to name in list in Configure Templates dialog

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4793 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-11 15:00:54 +00:00
Kevin Roast
1119293674 . WCM UI enhancements
- sizing and rendering of select list components
 - Modifier column added to sandbox browse, description column removed
 - Label changes
 - Other minor changes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4785 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-10 18:23:20 +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
5121459902 First round of changes to Create Web Project wizard from Usability Review
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4746 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-05 18:14:23 +00:00
Ariel Backenroth
a25d85ee83 - moving generic xml parsing utilities out of FormsService and into their own class
- 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
2006-12-31 08:45:42 +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
d959ed0ce7 . The user can now launch the Create Form wizard directly from the Form config page in the Create Web Project wizard
. List of workflows in Submit Dialog now shows warning message when no workflows match the assets for submission
. More fixes for CreateWebContentWizard when creating non-form based content
. Edit Web Project action now available from the main actions menu for a website
. Warning indicator added to Forms page of Create Web Project wizard, when a workflow is selected but not yet configured
. Warning indicator added to Ad-hoc workflows page of Create Web Project wizard, when a workflow is selected but not yet configured

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4590 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-13 11:36:10 +00:00
Kevin Roast
0442918790 . Submit Dialog now supports submit with no workflow match - i.e. allows direct submit to staging sandbox if no workflows are appropriate
. 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
2006-12-12 18:57:57 +00:00
Kevin Roast
bedaafd781 . Files in the submit dialog list are now matched against the regular expressions provided for web project workflow definitions
. Configuring the workflow file match regular expression has been moved into the Configure Workflow screen

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-11 16:07:10 +00:00
Kevin Roast
657c7a2b3f . Missing title/description in Forms selected in Web Project wizard now correctly taken from Form def
. Workflow package staging/sandbox changes copied from SubmitDialog to CreateWebContentWizard
. Fix to Form and Web Project summary screens to show workflow 'title' instead of 'name' (as 'name' is not a useful label)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4548 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-07 11:13:10 +00:00
David Caruana
0a69421b22 WCM submit (for approval) workflow.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-07 00:05:28 +00:00
Kevin Roast
eba3b28fbe . Root webapp name "ROOT" now fixed for a web project
. Changes for NameMatcher usage in avm sync service compare() method
. Abstraction of AVM web-client workflow utils methods into AVMWorkflowUtil class
. Refactor of SubmitDialog to use workflow util
. Refactor of CreateWebContentWizard to use workflow utils
 - now launches a workflow on submit

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4531 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-06 16:06:54 +00:00
Kevin Roast
9b47676741 . Edit Web Project wizard
- Settings for Forms, Rendering Engines (templates), workflows and workflow config can be modified for a website
 - DNS name and Default Webapp cannot be changed at present
 - Fix to saving of workflow names against web project model
 - Users for a website are not managed in the Edit Web Project Wizard - instead use the Delete Sandbox and Invite Web Project users actions
. Preview Snapshot against previous version UI action removed (not being implemented in the vserver for GA)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-01 13:53:38 +00:00
Kevin Roast
b6049d4b9e . Full summary screen added to Create Web Project wizard
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-29 12:44:15 +00:00
Kevin Roast
5d18c75e08 . Refactoring of Invite Users to support inviting users into an existing Web Project space
- Added new Invite Website Users action
 - Content Managers can now invite additional users into the Web Project and sandboxes created for them
 - Refactoring of old-skool Invite Content/Space Users wizard beans to new style wizard framework beans
 - TODO: refactor JSPs to complement new beans
. User Sandbox creation code refactoring into a SandboxFactory helper so various wizards can utilise it
. Workflow selection lists now show workflow 'title' human-readable label instead of 'name' identifier field

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4433 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-23 16:08:51 +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
b800048730 . Create Web Project wizard now reads default selections
- for file patterns, templates and rendering file patterns from model as persisted by the Create Form Wizard
. Some UI tidy ups

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4356 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-14 19:51:41 +00:00
Kevin Roast
c5c18185cf . Define Web Content Forms dialog:
- Configure Form workflow (integration with WorkflowService and TransientNode framework for task defaults properties dialog)
 - Configure Web Projects workflow(s)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4305 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-07 15:52:22 +00:00
Kevin Roast
135691df4e . More progress on Define Web Content Forms dialog
- ad-hoc workflow selection screen (as per new wireframes)
 - fixed selection bug on Form Details screen (and in UISelectList component)
. Invite Users step of Create Web Project wizard now has email notification as optional
. Fixed issue to restrict the selection of the same authority only allowed once in the Invite Users step

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4296 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-06 15:45:41 +00:00
Kevin Roast
c6b9543984 . Checkpoint of the "Define Web Content Forms" dialog
- Up-to-date with latest wireframes (e.g. removal of scripts, addition of filename path property)
 - List of selected Forms show detail on selected workflow, filepath and templates
 - Form Details button navigates to working Form Details dialog
 - Select Templates button navigates to working Manage Presentation Templates dialog

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4284 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-03 18:28:15 +00:00
Kevin Roast
3730a608ee . Checkout of the "Define Web Content Forms" dialog
- 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
2006-11-02 13:51:51 +00:00
Kevin Roast
70f0311af8 . Split the notion of a website project 'name' and the 'dns name'
- Website now support name, title, description like other nodes and an additional field for DNS name.
 - The DNS name has basic client-side validation (JavaScript regex) and server-side name mangling to ensure validity

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4266 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-31 15:23:33 +00:00
Kevin Roast
202f9d5957 . Message for "Website" changes to "Web Project" for appropriate wizards and actions
. New JSF component called SelectList
 - This generic selection component displays a graphical list of items, each with an optional icon, label, description and tooltip.
 - The list has three selection modes; single select (radio), multi-select (checkbox) and 'active' selection mode.
 - The 'active' selection mode renders any child command components (such as ActionLink or CommandButton components) which can then data-bind to each row item in the list. i.e. to allow buttons or links with context for each item.
 - This various selection modes covers the usage for 4 different screens in the WCM wireframes
. Forms page (new step 2) added to Create Web Project wizard
 - this is currently mostly a test page for the SelectList component

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4236 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-26 17:42:08 +00:00
Kevin Roast
6bd9a2e4e0 . WCM UI
- You can now invite and notify multiple users when creating a new website
 - Each user has a sandbox area to play in
 - Each sandbox is layered over the staging area sandbox

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3876 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-21 18:05:17 +00:00
Kevin Roast
55c894aff0 . Checkpoint of WCM ui work (nothing to see here, move along please, move along)
- "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@3761 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-11 16:54:53 +00:00