Britt Park
b2f9df29d1
Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
...
were both beyond me, and are just the raw conflict merge data. If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-08 05:17:40 +00:00
Britt Park
111296d4dc
Heinous merge from HEAD. Seems to basically work. Be on guard however.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-18 02:24:36 +00:00
Britt Park
820da6ecab
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
8031cc6574
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
Britt Park
f7d9d83036
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
7d940d08e1
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
7f79a2a498
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
11037b2451
Morning merge.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2937 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-22 17:20:58 +00:00
Britt Park
a22ddfb666
Morning merge.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-11 17:01:57 +00:00
Roy Wetherall
b697a01031
- Added execute all rules action
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-05 10:43:36 +00:00
Roy Wetherall
5cd4578289
- Added hasParameterDefinitions method to action/condition definitions to help Gav out
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-04 14:53:28 +00:00
Roy Wetherall
5ba9ae0028
- Added getCopies method to CopyService
...
- Copy and transform actions will now (by default) overwrite an exiting copy. A parameter can be set on both actions to revert to the previous, always copy, behaviour.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2755 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-04 11:15:38 +00:00
Kevin Roast
cf4e177ead
. Rhino JavaScript integration checkpoint:
...
- Added APIs to allow updating and addition of node properties
- Added APIs for content manipulation
- Added APIs to allow creation of files and folders
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2749 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-03 21:34:42 +00:00
Kevin Roast
c9e5bd6c22
. Rhino JavaScript integration checkpoint:
...
- Added a new action to the repository for executing JavaScript files
- Added script action UI to rule framework, means we can execute a JavaScript file as part of a rule
- Lucene search and Saved Search functionality added to default data-model for scripts
- Added Scripts folder to Data Dictionary (created during bootstrap)
- Created patch to add the Scripts folder to existing schemas
- Added ScriptService to ServiceRegistry bean
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-03 12:01:21 +00:00
Andrew Hind
05525aff09
Scheduled Actions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2673 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-20 13:57:06 +00:00
David Caruana
701657f2f1
Full Repository Export / Import Support - first checkpoint
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-30 18:38:03 +00:00
Derek Hulley
f8fe7c80cf
Build fix. Name attribute can never be null
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2550 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-16 09:22:38 +00:00
Roy Wetherall
cb432f65a9
- Added remove features action to repository and web client UI
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2539 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-10 14:30:57 +00:00
Kevin Roast
59d83325d4
. Invite Users screens for Manage Content Users and Manage Space Users now support email templates
...
. Added additional template model objects to the model supported by the MailActionExecutor
. Refactored various beans in the web-client that build lists of templates, to use a new Template support bean
. Added new email template files (one for Invite Users, the other for Email Actions)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2537 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-09 17:14:21 +00:00
Kevin Roast
e49879f557
. Multiple email recipient support in Create/Edit Rule and Run Action screens.
...
. Group emailing support added to MailActionExecutor (i.e. selecting Group(s) is supported in the screens as above)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2527 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-09 13:47:48 +00:00
Kevin Roast
f50b920503
. Email template support added to Run Action, Create New Rule email action pages
...
. MailActionExecuter now uses the TemplateService to process the template selected in the UI
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2522 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-07 18:50:27 +00:00
Derek Hulley
b3c0377af7
Fixed fallout from Hibernate upgrade.
...
- VersionCounter DAO was using unsupported getHibernateTemplate.save() method
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2442 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-18 11:40:14 +00:00
Derek Hulley
d57dda657d
Removed unused code
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2401 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-16 00:16:23 +00:00
Derek Hulley
09239707aa
Minor
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-15 22:20:48 +00:00
Roy Wetherall
beb3bfca4d
- Fixes to unit tests
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-15 22:00:13 +00:00
Derek Hulley
d29cf7e074
The ActionServiceImpl was attempting to call a service method after an exception.
...
- This didn't fail before because the actions didn't use the authenticated services but does now.
- When an action fails, the service attempts to make it asynchronous, but requires some info in order to proceed. That info is now fetched upfront.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-15 14:03:39 +00:00
Derek Hulley
d562864c82
Minor generics fix
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2373 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-14 15:07:04 +00:00
David Caruana
056a3dc9d8
Fix for asynchronous action test. Authentication context was not set for complete asynchronous action execution transaction, therefore failed in commit processing.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2355 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-13 12:40:31 +00:00
David Caruana
12b94f82af
Temporary build fix for asynchronous action test.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2353 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-13 11:31:57 +00:00
Roy Wetherall
c4a4e7ecba
- Asynchronous rules are now executed as the user that triggers the rule.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-11 20:50:05 +00:00
Roy Wetherall
dc140df4ed
- Extended some web service content tests
...
- Fixed issue with version author being displayed incorrectly
- Fixed hasCategoryValue evalautor null pointer error found during testing
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2262 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-31 15:36:33 +00:00
Roy Wetherall
48118785b2
- Addition of copyToNew flag to onCopyComplete policy for Gav
...
- Implementation and unit tests for admin web service
- Implementation and unit tests for access control web service
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2222 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-26 16:55:10 +00:00
Roy Wetherall
8b0fa4a821
- Fixed bug raised on forum that category values can be applied more than once.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2156 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-20 11:06:44 +00:00
Roy Wetherall
366873440c
- Fixed unreported bug where boolean deafult values where not set correctly
...
- Fixed AR-314, category rule was not appending additional categories
- Fixed spelling mistake and moved lock messages into properties file while I was there (AWC-350)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2039 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-13 17:21:33 +00:00
Kevin Roast
ebbf96ab74
Build fix
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2037 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-13 17:12:21 +00:00
Kevin Roast
cafe3fb51f
. Fixes/improvements for handling of author/creator in the repository and the web-client:
...
- added new aspect called "cm:author" with a single text property "cm:author"
- fixed the content meta-data extractors to set the new cm:author property rather than the system cm:creator property (which was causing a couple of bugs spotted recently)
- fixed the web-client to set the new cm:author property rather than the cm:creator property from user entered data into the UI
- fixed web-client config of document properties screen to display cm:author
- fixed client to not allow editing of the cm:creator value
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2034 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-13 15:25:56 +00:00
David Caruana
f89817cf12
1) Do not import copied from references
...
2) ACP zip file now contains content files with appropriate extension for easy viewing of content
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-09 13:44:37 +00:00
Derek Hulley
e1e6508fec
Moving to root below branch label
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-08 07:13:07 +00:00