36 Commits

Author SHA1 Message Date
Andrew Hind
dcc831b2a3 http://issues.alfresco.com/browse/AR-740
http://issues.alfresco.com/browse/AR-384

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4504 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-04 11:04:34 +00:00
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
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
fae76d7896 Merge from head.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3314 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-07-13 07:06:30 +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
4b881e72ad Daily merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-12 20:22:46 +00:00
Andrew Hind
417a123625 encoding reound trip test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2728 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-28 13:41:49 +00:00
Andrew Hind
fff0a5d49c debug linux build failure
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2722 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-27 10:44:44 +00:00
Andrew Hind
7518e88d01 remove 0123 and 0890 which are ? .....
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-26 15:41:33 +00:00
Andrew Hind
41178c88d1 Output string in test for linux debug
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-26 13:29:07 +00:00
Andrew Hind
62286fed22 Another attemp at encoding
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2707 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-26 09:16:00 +00:00
Andrew Hind
90cd929b83 Linux build warnings and encoding fixes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-25 12:40:02 +00:00
Andrew Hind
d467d1a208 IOC for scheduling
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2696 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-24 16:22:49 +00:00
Andrew Hind
09e6edf88e Remove scheduled action xml
Fix AR-123 lucene PATH serach for "/" and "/." now work

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-20 15:08:09 +00:00
Andrew Hind
6812223a4e Fix index bug where deletes at the end if the current TX are not seen
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-07 09:31:42 +00:00
Andrew Hind
4dcd14a59a Test Fix
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2614 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-04-04 11:19:50 +00:00
Andrew Hind
57e7a4f77e Added support for result set meta data
Added size limits for result sets
Updated/improved comments

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-23 15:14:22 +00:00
Derek Hulley
506e408ca7 Merge V1.2.0 BRANCH to HEAD
svn merge -r 2519:2565 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2566 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-22 12:23:43 +00:00
Derek Hulley
0a30d7f036 Removed unused code
Hid unused code warnings for local variables that might be useful for debugging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2529 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-09 13:59:30 +00:00
Andrew Hind
2d1258dd7c only check and clear write locks (not commit locks)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2424 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-17 11:12:36 +00:00
Andrew Hind
391a0e2d12 First go at bug 413
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2366 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-14 10:51:26 +00:00
Derek Hulley
cecaaf4fd3 Fixed NullPointerException when encountering minimal ContentData node property
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2304 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-06 16:48:27 +00:00
Andrew Hind
f9ccb9ad25 Lucene config and TX fixes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2293 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-03 13:25:42 +00:00
Derek Hulley
2ff11e6114 XPath function usage exceptions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-26 01:39:38 +00:00
Derek Hulley
65be3657f2 Converted test source code to UTF-8
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2208 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-25 23:38:44 +00:00
Andrew Hind
4408850b7a Guest and LDAP progress
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-17 14:17:39 +00:00
Andrew Hind
cd72520330 Extended Path parsing ...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2111 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-13 16:28:17 +00:00
Kevin Roast
6c65b84a91 . Advanced Search improvements
. Fix to Lucene Indexer (from Andy) to correct the bug where if content was not indexed (e.g. JPEG) then it's mimetype/size values did not get added to the index.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2107 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-13 13:21:29 +00:00
Andrew Hind
5311248be8 Remove System.out.println
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-10 15:48:55 +00:00
Derek Hulley
9528d9d941 More concise error messages when root node entries are incorrect in index
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2071 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-04 12:44:54 +00:00
Andrew Hind
c1942e3c56 Novell IChains
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2047 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-19 16:25:33 +00:00
David Caruana
a622bf02cd - JCR L2 Document View Import
- Move ISO9705 to util

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2020 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-09 18:02:03 +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