Derek Hulley 760cb0fe77 Merge 1.4 to HEAD ...

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4351 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4352 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4353 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4362 .


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

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

..

license

Merged 1.4 to HEAD

2006-12-19 12:18:46 +00:00

chaining-authentication-context.xml.sample

Merged enterprise features

2006-05-03 18:34:13 +00:00

custom-connection-pool-context.xml.sample

Merged 1.4 to HEAD

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

custom-hibernate-dialect.properties.sample

Merged 1.4 to HEAD

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

custom-model-context.xml.sample

Build script changes

2006-02-10 14:33:27 +00:00

custom-repository-context.xml.sample

Merged 1.4 to HEAD

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

custom-repository.properties.sample

Merged 1.4 to HEAD

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

customModel.xml.sample

Build script changes

2006-02-10 14:33:27 +00:00

example-model-context.xml.sample

Build script changes

2006-02-10 14:33:27 +00:00

exampleModel.xml.sample

Build script changes

2006-02-10 14:33:27 +00:00

file-servers-custom.xml

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

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

file-servers-custom.xml.sample

Big honkin' merge from head. Sheesh!

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

index-recovery-context.xml.sample

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

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

index-tracking-context.xml.sample

Merge 1.4 to HEAD

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

jaas-authentication-context.xml.sample

Merged enterprise features

2006-05-03 18:34:13 +00:00

ldap-authentication-context.xml.sample

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

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

lifecycle_processdefinition.xml

Merged 1.4 to HEAD

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

lifecycle-messages.properties

Merged 1.4 to HEAD

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

lifecycle-workflow-context.xml.sample

Merged 1.4 to HEAD

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

lifecycleModel.xml

Merged 1.4 to HEAD

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

mimetype-map-extension.xml.sample

Morning merge.

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

mimetypes-extension.xml.sample

Morning merge.

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

network-protocol-context.xml.sample

custom file-server config sample

2006-02-16 09:51:56 +00:00

new-indexer-context.xml.sample

ML text index and search

2006-12-13 11:52:41 +00:00

ntlm-authentication-context.xml.sample

Merged enterprise features

2006-05-03 18:34:13 +00:00

replicating-content-services-context.xml.sample

Refinements to RetryingTransactionHelper to make it equivalent to

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

restore-context.xml.sample

Morning merge.

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

scheduled-action-services-context.xml.sample

rename to sample

2006-04-20 14:05:55 +00:00

workflow-context.xml.sample

Merged 1.4 to HEAD

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