Derek Hulley 58ee1796a2 Merged 1.4 to HEAD ...

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4421 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4462 .
   svn resolved root\projects\repository\source\java\org\alfresco\repo\model\filefolder\FileFolderPerformanceTester.java
   svn revert root\projects\repository\config\alfresco\version.properties
   svn resolved  root\projects\3rd-party\.classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2006-12-19 16:15:44 +00:00

..

action

Merged 1.4 to HEAD

2006-12-19 16:01:52 +00:00

admin

Merged 1.4 to HEAD

2006-12-19 16:15:44 +00:00

audit

Merged 1.4 to HEAD

2006-12-18 13:18:44 +00:00

avm

Deleted nodes can now have aspects, properties, acls added, queried. Kind of

2006-12-18 20:25:31 +00:00

cache

Merged 1.4 to HEAD

2006-12-19 16:15:44 +00:00

clt

Some cleaning up of the AVMService and derived interfaces.

2006-12-16 18:17:18 +00:00

coci

Merged 1.4 to HEAD

2006-12-18 13:45:11 +00:00

configuration

. Big and juicy application/WCM model refactoring

2006-11-27 15:03:12 +00:00

content

Merge 1.4 to HEAD

2006-12-19 14:36:46 +00:00

copy

. Big and juicy application/WCM model refactoring

2006-11-27 15:03:12 +00:00

descriptor

Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

2006-11-08 05:17:40 +00:00

dictionary

Merged 1.4 to HEAD

2006-12-19 12:35:52 +00:00

domain

Merged 1.4 to HEAD

2006-12-19 14:58:16 +00:00

exporter

Merge 1.4 to HEAD

2006-12-19 14:36:46 +00:00

forum

. Big and juicy application/WCM model refactoring

2006-11-27 15:03:12 +00:00

importer

. Big and juicy application/WCM model refactoring

2006-11-27 15:03:12 +00:00

jscript

Merged 1.4 to HEAD

2006-12-19 16:01:52 +00:00

lock

Big honkin' merge from head. Sheesh!

2006-08-27 01:01:30 +00:00

model

Merged 1.4 to HEAD

2006-12-19 16:15:44 +00:00

node

Merged 1.4 to HEAD

2006-12-19 16:15:44 +00:00

ownable/impl

Heinous merge from HEAD. Seems to basically work. Be on guard however.

2006-10-18 02:24:36 +00:00

policy

Merge 1.4 to HEAD (excl records management)

2006-12-18 15:28:54 +00:00

remote

AVMSyncService now retries it's operations.

2006-12-17 18:35:00 +00:00

rule

Merged 1.4 to HEAD

2006-12-19 12:35:52 +00:00

search

Merged 1.4 to HEAD

2006-12-18 13:45:11 +00:00

security

Merged 1.4 to HEAD

2006-12-19 16:15:44 +00:00

service

Heinous merge from HEAD. Seems to basically work. Be on guard however.

2006-10-18 02:24:36 +00:00

template

Merged 1.4 to HEAD

2006-12-19 16:01:52 +00:00

transaction

Merged 1.4 to HEAD

2006-12-18 14:33:46 +00:00

version

Merged 1.4 to HEAD

2006-12-18 13:45:11 +00:00

workflow

Merge 1.4 to HEAD

2006-12-19 14:24:45 +00:00