1584 Commits

Author SHA1 Message Date
Andrew Hind
6c5f524c11 Merged V2.9 to HEAD
9194:Merged V2.2 to V2.9
      8557: Fix for WCM-1120
      8580: Fix remainder of WCM-1120

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9200 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-21 11:14:22 +00:00
Jan Vonka
f0883f987f Activity Service - add REST API for User Feed Controls & general cleanup/fixes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9187 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-20 16:41:10 +00:00
Derek Hulley
cecd138ed6 Merged V2.2 to HEAD
8514: Updated clusterd cach example - ACL changes, attributes, AVM and minor fix ups
   8522: Fix for AR-1694
   8587: Merged V2.1 to V2.2
      8575: Fix for AR-2166 "Display of tasks in MyAlfresco dashboard broken when using oracle"
   8617: AVMTestRemote - fix test/data
   8632: Merged V2.1 to V2.2
      8623: Fixed AR-2122: Code re-entry paths through transaction resource interceptor cause data loss
      8624: Fixed test associated with session resource management fixes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-19 16:09:48 +00:00
Mike Hatfield
a20061ccf1 Merged V2.2 to HEAD
8630: Merged V2.1 to V2.2
     8513: Fixed AR-2157: Integrity checking fails when target roles are present on child associations
     8517: Fixed AR-2171: NPE restoring large hierarchy
     8519: New workflow description field limited to 100 characters (AWC-1938)
     8520: Removed copy of mysql connector to tomcat distribution
     8529: Fix for pop-up task panel, when task has due date
     8537: Fix for AWC-1951
     8538: AR-2141: Problem copying large hierarchical folder structures
     8594: Closing of servlet output stream in TemplateContentServlet
     8616: Fix for WCM-1134 (editing rich text area, causes relative links to become absolute in IE)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9168 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-19 16:00:06 +00:00
Derek Hulley
60e308f7e9 Merged V2.1-A to HEAD
8574: Fix for ADB-55
   8577: ADB-35: when a file with no extension is copied its MIME type is lost


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9164 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-19 14:27:23 +00:00
Jan Vonka
8979304535 Site Activities - including first-cut feed templates (joined, left, role-changed) + system test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9160 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-19 12:47:34 +00:00
Jan Vonka
da7b596446 Activity Service - fix JSON feed
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9156 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-19 10:31:29 +00:00
Glen Johnson
780907fdd7 First drop of person service (just low level classes. JavaScript API and REST API still in progress)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9148 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-17 12:00:40 +00:00
Jan Vonka
075354c842 Activity Service -fix schema bootstrap
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9146 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-16 22:34:20 +00:00
Gavin Cornwell
ae05d7d4dc First cut of metadata service (SLNG-234)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9136 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-16 12:45:17 +00:00
Jan Vonka
f4cb223537 Activity Service
- upgrade fix
- unit tests / build fix

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9135 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-16 12:41:19 +00:00
Jan Vonka
9961d351fa Activity Service - fix unit test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-15 17:23:10 +00:00
Jan Vonka
067013afad First-cut Activity Service (SLNG-20)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9128 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-15 16:34:11 +00:00
Andrew Hind
9e67621ace Fix DM ACL pacth to ignore AVM stores - and also fix affected ACL count
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9108 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-14 14:51:19 +00:00
Andrew Hind
2456d05ad9 Fix to only propagate ACLs down primary relationships
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9101 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-14 12:55:21 +00:00
Jan Vonka
9d544f57b9 Util to convert JSON to (FreeMarker-compatible) Data Model
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9095 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-14 10:49:15 +00:00
Andrew Hind
1b807e3e77 DM permissions
http://issues.alfresco.com/browse/SLNG-202
http://issues.alfresco.com/browse/SLNG-203

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9090 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-13 11:54:55 +00:00
Roy Wetherall
344b703a61 Site Service: GET, PUT and DELETE methods implemented and unit tested for Membership resource
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-10 00:27:11 +00:00
Andrew Hind
63674f3e8d Public constructor required for a while
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-09 14:31:38 +00:00
Andrew Hind
0146f54e0f Build fix - missing dependancy for previous build fix from DM ACL merge performance teaks
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9058 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-09 14:27:41 +00:00
Andrew Hind
c45a758341 Test fix for 3 new site related permissions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9052 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-09 09:59:57 +00:00
Roy Wetherall
6a4253117b Site Service: GET and POST methods implemented on Site Membership REST API
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-08 17:00:35 +00:00
Derek Hulley
76cea3002b Merged V2.9 to HEAD
8960: Stop tests running if image transformer not available
   8991: Fix AR-2099
   8993: Fix AR-2099 - fix test fallout


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9031 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-08 10:46:36 +00:00
Roy Wetherall
5fe540e1cb Site service membership API (Java and JavaScript) and associated unit tests
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9012 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-06 17:35:32 +00:00
Jan Vonka
5a0f23bfc8 Merged 2.9 to HEAD
8871: Fix unit test failure (BinaryPassThroughContentTransformerTest)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9007 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-06 11:20:56 +00:00
Roy Wetherall
5194966123 Site Service CRUD API's (Java, JavaScript and REST), unit test methods added to JS API to help unit test JS API's
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8986 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-05-01 16:48:30 +00:00
Roy Wetherall
c5733ca5ae Web Script unit test base class added, helpers for JSON support in web scripts added (JSON reader, JSON error template), update to test webscript server to support easy submit of content, first cut of site service API (JS and HTTP) - create site and listSites available
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8950 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-04-29 10:45:00 +00:00
David Caruana
dbf9141c1c Build fix.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8939 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-04-28 17:09:57 +00:00
Roy Wetherall
86ea452f8b Fixed strange compile error
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8784 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-04-15 15:58:54 +00:00
Roy Wetherall
e943d32b38 Updated image transformers to have formalised parameters, support for resize image transformations, get and update thumbnail implementation
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8779 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-04-15 14:14:43 +00:00
Gavin Cornwell
5dfd4e413e Merged 2.2 to HEAD
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-04-14 09:33:41 +00:00
David Caruana
9aaeac4558 Finally resolved "AR-401 Can only have one policy handler". Multiple handlers may now be registered.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-04-07 15:31:47 +00:00
Gary Spencer
0e407d054b Wrong version of the FileStateLockManager was being imported. AR-2231.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8697 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-04-07 15:10:49 +00:00
Roy Wetherall
a5b1a90a29 Merged V2.1-A to HEAD
7693: Pass contentReader and contentWriter noderef options to content transformer (when invoked from transform action).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8667 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-04-03 10:28:12 +00:00
Roy Wetherall
e5bfb7e8fa Transformation service changes to support thumbnail service, shell of thumbnail service API
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-04-02 11:28:39 +00:00
Gary Spencer
e7d2e6f2a7 Move the setting of the web app URL so that it does not require the local name token to be present. AR-1242.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8604 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-27 13:47:23 +00:00
Jan Vonka
4763d7e598 Workaround fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8593 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-26 14:51:08 +00:00
Jan Vonka
2789aaccf0 Fix AuthenticationTest(s)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-22 08:46:05 +00:00
Jan Vonka
0ef179c886 Fix unit test - incomplete merge
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-20 10:29:12 +00:00
Jan Vonka
8368199363 MT - fix delete tenant/store to avoid FK constraint violation (for new install)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8569 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-19 15:39:36 +00:00
Kevin Roast
3f7bfeaf4e Merged BRANCHES/DEV/WEB-PROTO-3.0 to HEAD
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8565 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-19 12:13:38 +00:00
Jan Vonka
2d306ef79f MT - fix tenant admin console
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-19 10:02:57 +00:00
Jan Vonka
afc0c675bd Fix AR-2179
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8556 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-18 11:16:45 +00:00
Gavin Cornwell
caa03b12b9 Merge Offline Edit dev branch to HEAD
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8527 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-13 13:43:38 +00:00
Jan Vonka
2fece79cd2 MT - fix required, post merge of r8066
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8518 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-12 10:13:53 +00:00
Jan Vonka
af56b1ebac MT - fix, missed in previous merge
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8516 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-11 18:08:14 +00:00
Jan Vonka
7f09e22794 MT - fixes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-11 16:28:43 +00:00
Kevin Roast
6a541a840e Merged V2.2 to HEAD
8429: Merged V2.1 to V2.2 
      8387: Fix for WCM-1090 see ACT 1551 
      8421: Minor typo fix to OpenOffice document formats descriptions 
      8422: Fixed AR-2145: ContentStore cleaner was not watching out for VM shutdowns 
      8423: Removal of default root objects responsible

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-11 14:01:39 +00:00
Derek Hulley
9c43c09bdc Final post-merge cleanups
- HEAD is current with just about everything on the branches
 - Updated latest scripts to reflect correct version numbers - not strictly necessary


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8509 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-11 13:54:00 +00:00
Derek Hulley
399fe7ac67 Merged V2.2 to HEAD
8405: Added causal exception to the runtime generated
   8408: AR-2136, AR-2137, AR-2138
   8410: WCM-1110, WCM-1111
   8417: Stopped chiba:match() function from being inserted into bindings for xforms model elements of type xs:integer.
   8419: Fixes for correct use of .empty in name spaces of QNames
   8420: Finally fixes WCM-1108 and WCM-1109
   8489: Merged V2.1 to V2.2
      8482: Fix For AR-2163
   8507: Merged V2.1 to V2.2
      8504: Fix for AR-2165 - respect repo read only setting during authentication


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2008-03-11 13:19:00 +00:00