Britt Park a5d07e1069 Morning merge. ...

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2959 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2006-05-23 16:39:21 +00:00

..

bootstrap

Daily merge.

2006-05-12 20:22:46 +00:00

desktop

Merged enterprise features

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

domain

Afternoon merge.

2006-05-17 22:42:03 +00:00

extension

Morning merge.

2006-05-18 14:26:58 +00:00

messages

Morning merge.

2006-05-23 16:39:21 +00:00

mimetype

Daily merge.

2006-05-12 20:22:46 +00:00

model

Morning merge.

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

patch

Another merge. I was bored.

2006-05-19 00:38:14 +00:00

templates

. Fix for AWC-635 (TemplateContentServlet not working with TICKET url argument)

2006-04-21 16:58:47 +00:00

action-services-context.xml

Morning merge.

2006-05-11 17:01:57 +00:00

application-context.xml

- Incorporate JCR project into Repository project

2006-05-05 16:33:22 +00:00

authentication-services-context.xml

Chaining authentication

2006-04-06 09:40:56 +00:00

authority-services-context.xml

Merged enterprise features

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

bootstrap-context.xml

Morning merge.

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

cache-context.xml

Morning merge.

2006-05-11 17:01:57 +00:00

content-services-context.xml

Made URLs explicit to be classpath: and not file:

2006-02-23 16:35:25 +00:00

core-services-context.xml

- Added getCopies method to CopyService

2006-05-04 11:15:38 +00:00

ehcache-default.xml

Morning merge.

2006-05-18 14:26:58 +00:00

ehcache-transactional.xml

EHCache upgrade.

2006-03-07 15:34:17 +00:00

file-servers.xml

Updated sample file-servers.xml. Filesystem definitions are now contained in an outer <filesystems> tag

2006-05-05 08:50:08 +00:00

hibernate-context.xml

Morning merge.

2006-05-11 17:01:57 +00:00

import-export-context.xml

Morning merge.

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

index-recovery-context.xml

Merged enterprise features

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

jcr-api-context.xml

- Incorporate JCR project into Repository project

2006-05-05 16:33:22 +00:00

jcr-context.xml

- Incorporate JCR project into Repository project

2006-05-05 16:33:22 +00:00

model-specific-services-context.xml

Daily merge.

2006-05-12 20:22:46 +00:00

network-protocol-context.xml

Added additional config search location of alfresco/extension/file-servers-custom.xml.

2006-05-04 16:06:21 +00:00

node-services-context.xml

Added 'nodeArchiveService' bean

2006-05-08 13:47:19 +00:00

ownable-services-context.xml

Fix AR-350: Transactional caches for node ownership and permissions statuses

2006-02-13 12:28:03 +00:00

policy-context.xml

Transaction-level Policies. Modify AuditableAspect and ContentHits example to make use of transaction policies so they only trigger once.

2006-04-12 16:15:20 +00:00

public-services-context.xml

Morning merge.

2006-05-23 16:39:21 +00:00

public-services-security-context.xml

Morning merge.

2006-05-23 16:39:21 +00:00

repository.properties

Content and folder node archival

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

rule-services-context.xml

- Added update rule type

2006-05-03 11:26:29 +00:00

scheduled-jobs-context.xml

Afternoon merge.

2006-05-17 22:42:03 +00:00

script-services-context.xml

Checkpoint for the Rhino Script engine integration

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

template-services-context.xml

Moving to root below branch label

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

version.properties

Merged enterprise features

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