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

..

hibernate

Merged V2.9 to HEAD

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

schema

Build fix

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

AccessControlListDAO.java

Merged V2.2 to HEAD

2008-03-07 01:50:03 +00:00

AppliedPatch.java

…

ChildAssoc.java

Merged V2.2 to HEAD (QNames)

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

ContentUrl.java

Merged V2.2 to HEAD

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

ContentUrlDAO.java

Merged V2.2 to HEAD

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

ContentUrlDAOTest.java

Merged V2.9 to HEAD

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

DbAccessControlEntry.java

Merged V2.2 to HEAD

2008-03-06 14:43:55 +00:00

DbAccessControlEntryContext.java

Merged V2.2 to HEAD

2008-03-06 14:43:55 +00:00

DbAccessControlList.java

Merged V2.2 to HEAD

2008-03-06 14:43:55 +00:00

DbAccessControlListChangeSet.java

Merged V2.2 to HEAD

2008-03-06 14:43:55 +00:00

DbAccessControlListMember.java

Merged V2.2 to HEAD

2008-03-06 14:43:55 +00:00

DbAuthority.java

Merged V2.2 to HEAD

2008-03-07 01:50:03 +00:00

DbAuthorityAlias.java

Merged V2.2 to HEAD

2008-03-06 14:43:55 +00:00

DbPermission.java

Merged V2.2 to HEAD

2008-03-10 13:11:50 +00:00

DbPermissionKey.java

…

NamespaceEntity.java

Merged V2.2 to HEAD (QNames)

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

Node.java

Merged V2.2 to HEAD (QNames)

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

NodeAssoc.java

Merged V2.2 to HEAD (QNames)

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

NodeKey.java

…

NodeStatus.java

Added 'version' column to ADM entities

2007-06-01 12:40:17 +00:00

PropertyValue.java

Merged V2.9 to HEAD

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

PropertyValueTest.java

Merged V2.9 to HEAD

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

QNameDAO.java

Merged V2.2 to HEAD (QNames)

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

QNameDAOTest.java

Merged V2.2 to HEAD

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

QNameEntity.java

Merged V2.2 to HEAD (QNames)

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

Server.java

Added 'version' column to ADM entities

2007-06-01 12:40:17 +00:00

Store.java

Added 'version' column to ADM entities

2007-06-01 12:40:17 +00:00

StoreKey.java

…

Transaction.java

Merged V2.1 to HEAD

2007-11-12 23:52:46 +00:00

VersionCount.java

…