Kevin Roast 6a541a840e Merged V2.2 to HEAD ...

8429: Merged V2.1 to V2.2 
      8387: Fix for WCM-1090 see ACT 1551 
      8421: Minor typo fix to OpenOffice document formats descriptions 
      8422: Fixed AR-2145: ContentStore cleaner was not watching out for VM shutdowns 
      8423: Removal of default root objects responsible

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

2008-03-11 14:01:39 +00:00

..

bootstrap

Calendar view refactored to use simple webscript to rendered templated calendar view (for easy of ACP generation). Expanded calendar webscript into classpath source tree and removed from repo (for ease of editing)

2007-12-06 15:09:09 +00:00

dbscripts

Final post-merge cleanups

2008-03-11 13:54:00 +00:00

desktop

Merged 1.4 to HEAD

2006-12-19 14:28:55 +00:00

domain

Renamed TransactionComponent to TransactionServiceImpl

2007-06-11 10:10:38 +00:00

emailserver

Email Server and EmailService in a working state.

2007-11-02 13:55:07 +00:00

extension

Merged V2.2 to HEAD

2008-03-10 17:02:24 +00:00

messages

Merged V2.2 to HEAD

2008-03-11 13:19:00 +00:00

mimetype

Merged V2.2 to HEAD

2008-03-11 14:01:39 +00:00

ml

ML fixes

2007-05-30 15:03:16 +00:00

model

Merged V2.2 to HEAD

2008-03-06 21:28:43 +00:00

module

Fix so that Project Space policy code is moved to emailserver:aliasable onAddAspect - fixes 2 bugs and allows creation of project from any Project template

2008-01-08 19:16:24 +00:00

patch

Merged V2.2 to HEAD

2008-03-11 13:19:00 +00:00

templates

Fix up app-context and namespace issues with blog integration

2007-12-09 14:27:10 +00:00

workflow

Merged V2.2 to HEAD

2008-02-22 15:04:42 +00:00

action-services-context.xml

Merged V2.2 to HEAD

2008-03-10 16:37:15 +00:00

alfresco-jmxrmi.access

Point checkin.

2006-11-24 19:08:01 +00:00

alfresco-jmxrmi.password

Point checkin.

2006-11-24 19:08:01 +00:00

alfresco-shared.properties

Email Server and EmailService in a working state.

2007-11-02 13:55:07 +00:00

application-context.xml

office add-in is optional

2008-01-21 10:33:58 +00:00

attributes-service-context.xml

Merged V2.2 to HEAD

2008-03-10 15:22:43 +00:00

audit-services-context.xml

Merged V2.2 to HEAD

2008-03-10 16:42:56 +00:00

auditConfig.xml

Bug fix to audit CheckoutCheckinService

2007-06-20 15:09:16 +00:00

auditSchema.xsd

Merge from HEAD to WCM-DEV2.

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

authentication-services-context.xml

Merged V2.2 to HEAD

2008-03-10 13:35:04 +00:00

authority-services-context.xml

Backing out stuff that should have gone on its own branch.

2007-10-01 15:47:06 +00:00

avm-console-context.xml

Fix AVM and context issues

2007-05-22 10:45:49 +00:00

avm-console.properties

AVM Nodes are (theoretically) mostly aspect ready. AVMNodeService is

2006-08-24 18:36:59 +00:00

avm-services-context.xml

Merged V2.2 to HEAD

2008-03-10 15:22:43 +00:00

avm-test-context.xml

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

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

blog-context.xml

Blog Integration module moved into core

2008-02-20 09:36:44 +00:00

bootstrap-context.xml

Merged V2.2 to HEAD

2008-03-11 12:33:25 +00:00

cache-context.xml

Merged V2.2 to HEAD

2008-03-06 21:53:29 +00:00

clt-context.xml

Point checkin for link validation & changed AVMSyncServiceClient to AVMSyncServiceRemote.

2007-06-06 22:06:38 +00:00

content-services-context.xml

Merged V2.2 to HEAD

2008-03-11 06:22:28 +00:00

core-services-context.xml

Merged V2.2 to HEAD

2008-03-10 15:32:55 +00:00

ehcache-default.xml

Merged V2.2 to HEAD

2008-03-06 21:53:29 +00:00

ehcache-transactional.xml

Merged V2.0 to HEAD

2007-04-11 19:05:40 +00:00

file-servers.xml

Fixed incorrect packages in desktop action class configuration in file-servers.xml.

2008-01-11 10:10:51 +00:00

hibernate-context.xml

Merged V2.2 to HEAD

2008-03-11 12:33:25 +00:00

import-export-context.xml

Dynamic Models - fix AR-1953

2008-01-18 12:25:24 +00:00

index-recovery-context.xml

Merged V2.2 to HEAD

2008-03-10 15:22:43 +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

linkvalidation-service-context.xml

Merged V2.2 to HEAD

2008-03-10 17:23:01 +00:00

model-specific-services-context.xml

Merged V2.2 to HEAD

2008-03-07 10:32:22 +00:00

module-context.xml

MT - initial AMP support (AR-2063, ACT-1280)

2008-02-12 17:28:15 +00:00

network-protocol-context.xml

Replaced the file server code with the Alfresco JLAN project.

2008-01-06 16:44:00 +00:00

node-services-context.xml

Merged V2.2 to HEAD (QNames)

2008-03-06 18:12:25 +00:00

ownable-services-context.xml

Merged V2.1 to HEAD

2007-09-10 22:57:18 +00:00

policy-context.xml

- build fix (AuthenticatonTest), fall-out from import bootstrap of Dynamic Models

2008-01-23 11:50:46 +00:00

projects-context.xml

Fix so that Project Space policy code is moved to emailserver:aliasable onAddAspect - fixes 2 bugs and allows creation of project from any Project template

2008-01-08 19:16:24 +00:00

public-services-context.xml

Merged V2.2 to HEAD

2008-03-10 15:22:43 +00:00

public-services-security-context.xml

Merged V2.2 to HEAD

2008-03-11 10:14:52 +00:00

remote-avm-test-context.xml

Point checkin for link validation & changed AVMSyncServiceClient to AVMSyncServiceRemote.

2007-06-06 22:06:38 +00:00

remote-email-service-test-context.xml

EmailServer code.

2007-09-11 12:41:15 +00:00

remote-services-context.xml

Email Server and EmailService in a working state.

2007-11-02 13:55:07 +00:00

repo-admin-context.xml

Merged V2.2 to HEAD

2008-03-10 15:32:55 +00:00

repository.properties

Merged V2.2 to HEAD

2008-03-11 12:33:25 +00:00

rule-services-context.xml

Merged V2.1 to HEAD

2007-09-11 00:52:59 +00:00

scheduled-jobs-context.xml

Merged V2.2 to HEAD

2008-03-10 15:22:43 +00:00

script-services-context.xml

First cut of online presence status for spaces

2007-11-02 16:29:25 +00:00

st-context.xml

MT extension

2007-09-14 11:20:02 +00:00

template-services-context.xml

REST API command support for launching the XForms edit content dialog. AVM Templating API addition to retrieve the list of modified items for a sandbox user.

2007-06-05 20:21:57 +00:00

usage-services-context.xml

MT - fix node service so that policies are triggered with base refs

2008-02-18 16:14:05 +00:00

version.properties

Merged V2.2 to HEAD

2008-03-11 06:22:28 +00:00

workflow-context.xml

Consolidate/fix bootstrap import (MT & ST) of repo-sourced workflow defs

2008-01-24 16:10:35 +00:00