Derek Hulley ff07ea1e7d Merged 1.4 to HEAD ...

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4192 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4197 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4205 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4206 .
   svn resolved root\projects\repository\source\java\org\alfresco\filesys\server\config\ServerConfiguration.java
   svn revert root\projects\repository\config\alfresco\version.properties
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4219 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4224 .


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

2006-12-18 11:58:55 +00:00

..

archive

Merged 1.4 to HEAD

2006-12-18 11:21:44 +00:00

db

ContentData

2006-12-15 14:27:17 +00:00

index

Merged 1.4 to HEAD

2006-12-18 11:21:44 +00:00

integrity

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

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

AbstractNodeServiceImpl.java

ContentData

2006-12-15 14:27:17 +00:00

BaseNodeServiceTest_model.xml

Dictionary support for d:locale data type

2006-12-14 14:40:10 +00:00

BaseNodeServiceTest.java

Merged 1.4 to HEAD

2006-12-18 11:58:55 +00:00

ConcurrentNodeServiceSearchTest.java

http://issues.alfresco.com/browse/AR-740

2006-12-04 11:04:34 +00:00

ConcurrentNodeServiceTest.java

http://issues.alfresco.com/browse/AR-740

2006-12-04 11:04:34 +00:00

MLPropertyInterceptor.java

Locale matching

2006-12-07 14:10:17 +00:00

NodeServicePolicies.java

Big honkin' merge from head. Sheesh!

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

PerformanceNodeServiceTest.java

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

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

ReferenceableAspect.java

Removed unused code

2006-03-09 13:59:30 +00:00

StoreArchiveMap.java

Content and folder node archival

2006-05-04 16:04:55 +00:00

TemporaryAspect.java

Big honkin' merge from head. Sheesh!

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