Derek Hulley b3a235b6eb Merge 1.4 to HEAD ...

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4504 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4505 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4506 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4507 .
   svn resolved root\projects\core\source\java\log4j.properties
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4548 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4549 .
   svn resolved root\projects\repository\source\java\org\alfresco\repo\jscript\Node.java
   svn resolved  root\projects\repository\source\java\org\alfresco\repo\jscript\CategoryTemplateNode.java
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4603 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4604 .


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

2006-12-19 16:28:32 +00:00

..

datatype

ContentData

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

AbstractStoreException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

AspectMissingException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

AssociationExistsException.java

Big honkin' merge from head. Sheesh!

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

AssociationRef.java

Morning merge.

2006-05-14 16:21:55 +00:00

ChildAssociationRef.java

Content and folder node archival

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

ContentAccessor.java

Refinements to RetryingTransactionHelper to make it equivalent to

2006-12-13 17:03:44 +00:00

ContentData.java

ContentData

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

ContentDataTest.java

ContentData

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

ContentIOException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

ContentReader.java

AR-383: Optimized overwrite behaviour for ContentWriter. Content will only be duplicated for the writes if explicitly requesting a random-access file without the truncate option

2006-01-31 05:40:51 +00:00

ContentService.java

Merge 1.4 to HEAD

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

ContentStreamListener.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

ContentWriter.java

AR-383: Optimized overwrite behaviour for ContentWriter. Content will only be duplicated for the writes if explicitly requesting a random-access file without the truncate option

2006-01-31 05:40:51 +00:00

CopyService.java

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

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

CopyServiceException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

CyclicChildRelationshipException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

DuplicateChildNodeNameException.java

Big honkin' merge from head. Sheesh!

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

EntityRef.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

InvalidChildAssociationRefException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

InvalidNodeRefException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

InvalidStoreRefException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

MimetypeService.java

Merge from HEAD to WCM-DEV2.

2006-09-02 18:19:00 +00:00

MLText.java

Locale matching

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

MLTextTest.java

Locale matching

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

NodeRef.java

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

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

NodeRefTest.java

Big hunk of merge.

2006-06-28 17:31:18 +00:00

NodeService.java

Merged 1.4 to HEAD

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

NoTransformerException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

Path.java

- JCR L2 Document View Import

2005-12-09 18:02:03 +00:00

PathTest.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

ScriptException.java

Checkpoint for the Rhino Script engine integration

2006-04-27 09:39:25 +00:00

ScriptImplementation.java

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

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

ScriptLocation.java

Merged 1.4 to HEAD

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

ScriptService.java

Merged 1.4 to HEAD

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

StoreExistsException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

StoreRef.java

Merged AVMService into the rest of Alfresco. It all comes up in

2006-07-26 13:47:40 +00:00

TemplateException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00

TemplateImageResolver.java

. Checkpoint for the Rhino JavaScript engine integration:

2006-04-28 10:56:48 +00:00

TemplateNode.java

Merge 1.4 to HEAD

2006-12-19 16:28:32 +00:00

TemplateProcessor.java

Scheduled Actions

2006-04-20 13:57:06 +00:00

TemplateService.java

Merge from HEAD to WCM-DEV2.

2006-09-02 18:19:00 +00:00

XPathException.java

Moving to root below branch label

2005-12-08 07:13:07 +00:00