Andrew Hind 9116330a10 Build fix ...

- remove merge issues that causes a double bootstrap
- move bootstrap bean into the correct context

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

2008-05-27 13:42:17 +00:00

..

email/server

Merged V2.2 to HEAD

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

filesys

Merged V2.9 to HEAD

2008-05-22 12:40:46 +00:00

jcr

Merge of all UI clustering changes originally applied to 2.2

2008-02-15 14:59:11 +00:00

linkvalidation

Merged V2.2 to HEAD

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

model

Updated image transformers to have formalised parameters, support for resize image transformations, get and update thumbnail implementation

2008-04-15 14:14:43 +00:00

repo

Build fix

2008-05-27 13:42:17 +00:00

sandbox

Merged V2.2 to HEAD

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

service

Merged V2.9 to HEAD

2008-05-23 21:41:53 +00:00

tools

Merged V2.9 to HEAD

2008-05-23 21:41:53 +00:00

util

Activity Service

2008-05-16 12:41:19 +00:00