Commit Graph

152 Commits

Author SHA1 Message Date
Kevin Roast
d5604fda3d . UI bug fixes to the Create XML Form wizard:
- 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
2006-10-06 15:58:59 +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
Ariel Backenroth
d26fe8cbb5 first stab at the multi channel thing
- 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
2006-10-06 02:26:38 +00:00
Ariel Backenroth
76fa148539 - removing templating config file
- 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
2006-10-04 05:04:35 +00:00
Kevin Roast
0dc8a68d44 . Edit Folder Properties dialog
. Edit file/folder properties now shows name+title+description as expected
. Addition of TITLED and UIFACETS aspects to files and folders during import/create

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3987 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-02 10:14:45 +00:00
Kevin Roast
8f6dbe4920 Edit Properties dialog for an AVM File
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3976 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-29 16:11:34 +00:00
Kevin Roast
9c1f0c4c96 - File Details and Folder Details page
- Added missing JSP file from Update File checkin (oops!)
 - Minor UI bug fixes
 - Incorrect permissions set for ContentPublisher role

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3972 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-29 11:21:27 +00:00
Kevin Roast
0f3f56e7d8 - Add Content (upload) action implemented for website browsing screen
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3960 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-28 12:12:00 +00:00
Ariel Backenroth
0f2bf9a3e0 - preliminary support for callouts using xsd:include. rewriting links in the schema now to point at the virtualization server. not the best solution. but i couldn't get LSResourceResolver to work (would have been the elegant solution) since i don't have access to the DOMConfiguration object within chiba - works great in the schemaformbuilder.
- sample implementation of a callout in the alfresco sample website; using a jsp to produce an included xsd that lists all available company_footer.xmls
- moving stuff around.  XFormsbean is now in the xforms package rather than ajax package - more relevant to that codebase.
- consolidating SchemaFormBuilder into one class since the inheritance hierarchy made very little sense. 
- refactored some of the sample website to reduce java code in the jsps and begining to think about a generic utility library for callouts and jsps that want to access templating generated data.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3957 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-28 04:06:01 +00:00
Kevin Roast
280cff0999 - Create Folder action dialog added to website browsing screen
- Fix to bug in client AVMNode where it was not correctly dealing with additional avm node properties set using the nodeservice

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3951 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-27 17:12:56 +00:00
Kevin Roast
1c87282333 . WCM UI
- Added Preview action for individual folders and files to the website browse page
 - Added Preview action for files/folders in the Modified Files list for a user sandbox
   - these changes allow the user to preview any sub-section (folder/weapp) or individual file in the website

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-25 16:52:53 +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
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
97ed37f6e3 . WCM UI
- Create Web Content action (HTML, plain text and XML forms !) now creates content in the current AVM store+folder
 - Edit inline content for HTML, plain text and XML forms
. Applied web.xml error patch as suggested by Gav

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3873 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-21 11:50:24 +00:00
Kevin Roast
ae0a118985 . WCM UI
- 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
2006-09-20 17:59:58 +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
0ee6dbcfc8 . 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@3863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-20 14:32:29 +00:00
Ariel Backenroth
b61fefddbd fixing numerous alignment issues.
fixing bug where removing a repeat instance causes the entire form to creep down the page.
fixes for regressions caused by downgrade to dojo-0.3.1.
implementing the client side of moveup/movedown - haven't dealt with the server side yet.  maybe noone will notice?



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-20 00:16:58 +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
09fc8a5041 . WCM UI
- Flat list of Modified Files for a user sandbox, in the expandable Modified Files area of the sandbox view
 - Filename is clickable to view the content of the modified version of the file
 - Added 'creator' column to the files list when browsing a website
. Fixed DownloadContentServlet to handle AVM noderefs with space character %20 in the encoded NodeRef url element

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3843 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-19 12:47:48 +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
61175d2192 . Checkpoint of WCM UI
- Browsing of AVM files and folders within a sandbox
  - Navigation into sub-folders and viewing of file content

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3827 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-18 13:56:37 +00:00
Ariel Backenroth
e1a92d2983 get edit working again - looks like reading back model data got broken in a merge. still doesn't work %100 for repeats - need an xpath interpreter in order to do that.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-18 09:28:35 +00:00
Ariel Backenroth
913aa6a830 first pass on repeats.
- refactoring of schemaformbuilder to remove unnecessary methods/cleanup and modifications to get it to emit triggers that i need for insert at the top and insert after
- implementation of ajax server side method for setting the repeat index and support for capturing and sending back event responses for all server requests.
- implementation of client side repeat support: dom manipulation of repeat elements, identifying and relating widgets with model data, creating prototype clones, and support for some XFormsEvent (chiba-index-changed, chiba-item-inserted, chiba-prototype-cloned, chiba-id-generated)
- changing background-colour to background-color in the dashlet.  funny.
- handling a null pointer exception in the errorbean when an error is thrown from the ajax stuff.
- minor debugging enhancements in TemplatingService



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3814 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-18 04:04:43 +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
Britt Park
f20136237d Yet another merge from head to WCM-DEV2.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-12 18:55:07 +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
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
Britt Park
cc6af1a45c Merge from HEAD to WCM-DEV2.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-02 18:19:00 +00:00
Britt Park
b0d02fa6be Big honkin' merge from head. Sheesh!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-27 01:01:30 +00:00
Ariel Backenroth
31acacc947 using tinymce as the wysywg editor.
making next and finish buttons behave the same.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3592 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-23 20:45:09 +00:00
Ariel Backenroth
6d52906338 regenerate html output after editing xml asset.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-21 23:56:02 +00:00
Ariel Backenroth
80bf0acd64 fixed bug with checkboxes
partially removed need for sample instance xml - i'm doing a bunch of hacks at the moment to get around it - basically using xmlbeans to generate the sample xml, and then cleaning it up.  ended up not needing to do insane things in javascript with this approach.  emailed joern at chiba to see if he has suggestions for how others deal with this issue.
serializing the template configuration using object serialization for now.  it'll work good for the demo and we'll do something more robust/human readable post demo.  this required a bunch of refactoring and springifying the TemplateService, but we're now reading back xsds and xsls from the repository which is sorta a nice thing i think.
remove the preview form wizard step from create xml content type flow.
tried getting rid of a temporary file in generating the xform but failed.  need to find a way to get an url to a noderef that the xform can use to reference the xsd.  emailed london people about that.  but still did some refactoring along those lines.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3558 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-21 22:34:59 +00:00
Ariel Backenroth
d385022212 need to pass cookies to the submission handler, otherwise content is written to the wrong xformsbean.
removing the submit button.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3520 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-15 15:28:29 +00:00
Ariel Backenroth
6aea4ef3af get xforms instance data saved to the workspace.
get radios and comboboxes calling into setFormValue
get editor working marginally better
get edit to work
 



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3503 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-14 21:12:10 +00:00
Ariel Backenroth
0cffbc7aa1 a bunch of refactoring of back end templating wizards. removing the chiba-web stuff as it is no longer used. more updates to dojo generator. adding in an XFormsBean to handle ajax requests from the form.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-14 18:14:21 +00:00
Ariel Backenroth
129728f447 initial dojo generator. moving to dojo nightly build and checking in the widget libraries as well.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-12 15:37:09 +00:00
Ariel Backenroth
0a29ff4f5e part two of checkin for checkpoint of demo for virgin money last week.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3476 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-09 23:11:49 +00:00
Ariel Backenroth
9e0e9626d1 checkpoint of templating as used in the virgin money demo.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3475 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-09 23:09:35 +00:00
Ariel Backenroth
33f4d911ad initial checkin of wcm forms management using xforms implemented by chiba. this currently uses chiba-web but will soon be replaced by our own uigenerator implemented by dojo!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3444 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-01 15:15:53 +00:00
Britt Park
f6355ea108 Merge from HEAD into WCM-DEV2. Also fixes build breakage in
jndi-client and catalina-virtual that I introduced earlier. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-07-24 18:27:41 +00:00
Britt Park
89a108a9d7 Big hunk of merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-06-28 17:31:18 +00:00
Britt Park
d2f8666983 Merged up to HEAD.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-06-16 19:18:30 +00:00
Britt Park
77df6eb45d Morning merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-23 16:39:21 +00:00
Britt Park
740626f4bc Another merge. I was bored.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-19 00:38:14 +00:00
Britt Park
e18a26f4f3 Afternoon merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2915 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-17 22:42:03 +00:00