Commit Graph

170 Commits

Author SHA1 Message Date
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
Gavin Cornwell
0ceb9065ea Initial version of a "copy to web project" action
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-15 10:49:26 +00:00
David Caruana
27b8639a52 Merge Web Scripts from BRANCHES/DEV/DAVE
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-08 19:02:48 +00:00
David Caruana
bea1a12b32 Merge Web Scripts from BRANCHES/DEV/DAVE
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-08 14:47:01 +00:00
Derek Hulley
d4b35182b2 Merged V2.0 to HEAD
5311: AWC-1147
   5314: AWC-1153


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 15:48:31 +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
Derek Hulley
832f5f310c Merge V2.0 to HEAD
5234: LicenseService shutdown
   5256: AR-1273 workaround
   5289: AWC-1142
   5294: WCM-360
   5296: Potential NPE in patches dao


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 15:14:46 +00:00
Derek Hulley
0671335628 Merged V2.0 to HEAD
5144:  Original HEAD revision 5141 that was reverted
      WCM-317
      WCM-302
      WCM-333
      WCM-270
      WCM-312
      WCM-305
      WCM-298


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 11:46:17 +00:00
Kevin Roast
a4aa830af2 Merged from BRANCHES/DEV/KEVINR:
. NodeInfo panel and Ajax client library
 - Rewrite of Node Info panel
 - Alfresco common DOM methods refactored into namespaced object (YUI/Dojo style) Alfresco.Dom
 - Addition of useful DOM and 'smart' alignment method to common.js
 - OpenSearch now uses additional namespace for it's global method handlers: Alfresco.OpenSearchEngine
 - Temporary icons added for pop-up node info panel
. Additional FreeMarker model API method "cropContent(contentprop, length)" to return the first N bytes of a content stream - auto converted to plain/text from all supported transformation mimetypes
. DownloadContentServlet now handles ContentIOException more gracefully
. AbstractContentReader fixed to handle empty file data when requesting N characters from a content stream

. Yahoo scripts move to PageTag rendering as appropriate
. Refactoring of existing ajax components that output Yahoo scripts

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-01 17:24:08 +00:00
Derek Hulley
6aec329c9b Reverted HEAD revision 5141
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
2007-02-15 11:10:59 +00:00
Ariel Backenroth
b534839220 - fix for constraints for repeats. looks like a side effect of chiba upgrade. rather than constrain based on count(.) need to use count(../<nodeset>) since it seems like they are evaluating the constraints on individual items rather than the bind nodeset.
- fix for handling of fractionDigits for range controls
- automatically add namespace declarations for freemarker output path pattern expressions
- better error handling/reporting for output path patterns
- pass around formInstanceDataName for use in the label of the viewroot
- regenerate renditions on update
- updated unit tests
- use xf:minOccurs and xf:maxOccurs for repeat bindings rather than alfresco:minimum and alfresco:maximum (hadn't seen that it was part of the spec - not supported by chiba - but doesn't interfere)
- fix for attributes with fixed values

bugs fixed:
http://issues.alfresco.com/browse/WCM-317
http://issues.alfresco.com/browse/WCM-302
http://issues.alfresco.com/browse/WCM-333
http://issues.alfresco.com/browse/WCM-270
http://issues.alfresco.com/browse/WCM-312
http://issues.alfresco.com/browse/WCM-305
http://issues.alfresco.com/browse/WCM-298

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5141 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-14 19:14:36 +00:00
Derek Hulley
9067948404 Merged V2.0 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5118 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5119 .
   - OpenSearch Proxy
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5121 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5122 .
   - Extract sample OpenSearch engine registrations into extension config file.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5125 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-13 21:21:48 +00:00
Gavin Cornwell
bb1973354e Clipboard Changes: When an item is added to the clipboard a status message is now displayed (which can be turned off in config). The Paste All action now also automatically clears the clipboard (again this behaviour can be turned off in config). This is to allow users to navigate around the app copying and pasting without having to ever see the clipboard.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5065 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-07 12:30:38 +00:00
Kevin Roast
b98c2309a4 . Fix for http://issues.alfresco.com/browse/WCM-299
- Inline editing mode no longer used for HTML/Text in WCM spaces
   Not appropriate for WCM files which are editing using external editors - i.e. the browser based HTML editors make a  nasty mess of anything remotely complicated

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5057 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-06 17:16:22 +00:00
Kevin Roast
de56afd5c8 . Fix for http://issues.alfresco.com/browse/AWC-1127
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5054 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-06 15:53:24 +00:00
Jon Cox
1654335d80 Point checkin.
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
2007-02-03 04:33:03 +00:00
Paul Holmes-Higgin
39f1eebcf0 Added Tomcat distro; fixed AR-1177
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-31 14:55:58 +00:00
Kevin Roast
228bf2e5b2 . Fix for http://issues.alfresco.com/browse/AWC-986
- New public service method added to AuthenticationService component stack: guestUserAuthenticationAllowed()

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4981 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-31 14:25:45 +00:00
Kevin Roast
88512cf711 . Added cm:name based path support to the UITemplate component
- this component is generally used to render FreeMarker templates directly to the page - particularly useful for Dashlet pages
 - now supports an additional attribute 'templatePath' which should be set to a cm:name based path to a template for rendering
 - For example the simplest portable dashlet JSP page to render a template would look like this:

<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
<r:template templatePath="/Company Home/Data Dictionary/Presentation Templates/my_docs.ftl" />

 - Fixes http://issues.alfresco.com/browse/AWC-1091
. Additional helper override for resolving cm:name based webdav style paths to a NodeRef
. ClipboardItem interface javadoc and removal of obsolete methods from implementing classes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4963 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-30 12:06:19 +00:00
Gavin Cornwell
fc074b48f8 AWC-1095: UI issues with OpenSearch sidebar component
Added missing string from properties file as reported on forums

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4962 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-30 12:00:15 +00:00
Kevin Roast
c68cf150b4 . Tree Navigator performance improvement
- explicit txns around multiple nodeservice calls and internal (permission check free) nodeservice to retrieve node names
 - 25% improvement to retrieving node lists
. Permission code hotspot tuning and nodeservice methods ACL configuration tuning

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4960 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-29 18:42:30 +00:00
Kevin Roast
2384aba9bc . AVM cut/copy item clipboard support
- 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
2007-01-26 16:25:03 +00:00
Derek Hulley
9c17a38488 Merged DEV\EXTENSIONS to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4865 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4866 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4872 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4884 .
   Dave and Gavin's search work


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4899 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-23 12:09:27 +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
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
Ariel Backenroth
7e6ad08ad8 - finishing off ui changes to file upload widget based on linton's updated mockups.
- fixing various upload related bugs (resize issue, not handling file exists exception, not attaching uploaded files to workflow, loosing some of the uploaded files, and probably some more).

- reusing upload_helper.js code from xforms.js.  added facility for having the javascript return page return an error and file type image to support xform - doesn't effect other usages (create form).

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4800 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-12 01:03:35 +00:00
David Caruana
90a54f63fc - Fix WCM-205
- Add help for 'show my pooled' to Workflow Interpreter
- Remove unnecessary code added earlier for pooled task support

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4786 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-10 18:55:56 +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
Ariel Backenroth
15733b9771 putting jon's change from last night back in and fixing mostly everything (i know of) that it broke
- 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
2006-12-23 01:44:19 +00:00
Kevin Roast
86f31616ba . Confirmation screens for Undo All and Undo Selected items for a sandbox
- 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
2006-12-22 16:40:45 +00:00
Ariel Backenroth
2190c4f29d - adding aspect to webapp nodes to differentiate them from ordinary folders in the avm_webapps directory
- refactoring of generate and regenerate calls to take a FormInstanceData object
- adding in support for overriding step title and description properties in wizards so as to be able to format them with parameters
- making the step descriptions in create form wizard reiterate the form name so as to give the user better context
- displaying avm task resources in the manage task screen.  still need to get actions working and clean this up a bit.
- making output path patterns sandbox relative
- refactored utility method for combining avm paths sensitive to webapp vs sandbox relative paths.
- adding a default description for generated renditions

todo:
- cleanup some usage of AVMNode from ManageTaskBean
- get actions to appear in manage task screen
- add a multi value property to the web project for all its webapps
- properly use overridden values for forms from the web project settings

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-21 20:34:00 +00:00
Kevin Roast
e245c08794 . Workflow task parameters can now be configured directly from the Submit Dialog screen
- Workflows that have not been configured at all can now be configured
 - Workflows that are already configured can be modified by the user for the submission
 - An error appears informing the user before submission that they need to configure a workflow if it has not been configured at all 
. Refactoring of workflow task properties create/edit to use common interface across WCM screens
. Fix to issue where previously selected people in the workflow task properties screen would disappear from the list

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4679 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-21 13:14:48 +00:00
Kevin Roast
97ff757e8b More merge horrors fixed
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-20 14:24:54 +00:00
David Caruana
173e38d6ef - Spring driven (configure in new web api methods)
- Support for authentication
- HTTP Basic authentication implementation

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4645 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-18 19:32:33 +00:00
Derek Hulley
f24f43a98b Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4295 .
   Icon changes were identical
   Manually carried changes for
      HEAD/root/projects/web-client/source/java/org/alfresco/web/bean/CheckinCheckoutBean.java
      HEAD/root/projects/web-client/source/web/WEB-INF/faces-config-navigation.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4635 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-18 14:24:16 +00:00
Derek Hulley
3627699e04 Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4229 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4230 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4232 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4233 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4234 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4235 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4239 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4240 .
   svn resolved root\projects\web-client\source\java\org\alfresco\web\app\AlfrescoNavigationHandler.java
   svn resolved root\projects\web-client\source\web\WEB-INF\faces-config-beans.xml
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4241 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4242 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4243 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4244 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4244 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4245 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4245 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4246 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4247 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4248 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4248 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4249 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4250 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4251 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4251 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-18 13:18:44 +00:00
Ariel Backenroth
3175254cb4 first pass at edit form wizard
- modified evaluators to only show Create Form when in the Content Forms directory
- edit form evaluator which only shows the edit form action when inside of a form directory


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-17 01:30:11 +00:00
Ariel Backenroth
d318fea7a9 upgrading to chiba-1.3.0. there are several significant bug fixes that customers will notice - and several that make my life easier so i figure might as well go for it. things seem reasonably stable at this point so i'm comfortable with taking the hit sooner rather than later.
- adding chiba-1.3.0.jar in lib rather than chiba dir (removing chiba dir since we really only use one jar from them at this point)
- need to generate xform with unprefixed id attributes
- using a bunch of constants now defined within chiba.
- generating my own xpaths in js using binding nodesets since chiba remove the once useful chiba:xpath attribute.
- better error handling for breakage when processing schema and xform

fixing bug in create form details screen where form-name and form-title weren't being prefilled after uploading the schema.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4625 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-16 20:02:38 +00:00
David Caruana
1fb34e8cd1 Addition of "submitted" aspect to items submitted for web site review.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-15 16:42:38 +00:00
Ariel Backenroth
1aa1bcb026 first pass at loading strings from resource bundles when converting the schema into an xform.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4615 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-15 02:59:47 +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
2ebb1a5e08 . Website virtualisation server URL and Port are no longer managed by the web-client-config.xml - instead the values are retrieved dynamically from the VirtServerRegistryMBean.
- 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
2006-12-14 11:19:34 +00:00
David Caruana
844eb9f668 Initial checkpoint of OpenSearch support
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-14 11:19:38 +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
Ariel Backenroth
08f2795110 - showing uploaded files in the summary screen for create web content
- more careful management of the formprocessing session.  need to actually have a session management object so as to clear the upload file list.
- fix for form selection dropdown in create web content
- properly updating uploaded files from edit xml

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-13 03:53:40 +00:00
Gavin Cornwell
98c5a2071c - Incorporated new sidebar which contains the shelf and navigator (tree) components
- Changed version number to 2.0.0 (dev)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4538 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-06 23:26:27 +00:00
Derek Hulley
4cab830fd9 Merged 1.4 to HEAD (More workflow)
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4166 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4167 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4183 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4184 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4206 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4207 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4215 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4216 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4301 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4302 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4534 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-06 18:34:19 +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
Derek Hulley
e8d0027c9b Merged 1.4 to HEAD (Content upload servlet)
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4362 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4363 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4530 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-06 16:05:55 +00:00