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

were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


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

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

..

AppliedPatch.hbm.xml

Big honkin' merge from head. Sheesh!

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

AppliedPatchImpl.java

Merged up to HEAD.

2006-06-16 19:18:30 +00:00

AVMAccessControlListDAO.java

Changed AVMNodeConverter.ToAVMVersionPath() to return a

2006-09-30 17:51:15 +00:00

ChildAssocImpl.java

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

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

DbAccessControlEntryImpl.java

Big honkin' merge from head. Sheesh!

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

DbAccessControlListImpl.java

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

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

DbAuthorityImpl.java

Merged up to HEAD.

2006-06-16 19:18:30 +00:00

DbPermissionImpl.java

Merged up to HEAD.

2006-06-16 19:18:30 +00:00

HibernateHelper.java

Morning merge.

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

HibernateNodeTest.java

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

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

LifecycleAdapter.java

Morning merge.

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

Node.hbm.xml

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

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

NodeAccessControlListDAO.java

More touch ups to AVM permissions stuff. ACLs are properly copied on write.

2006-09-06 20:53:38 +00:00

NodeAssocImpl.java

Big honkin' merge from head. Sheesh!

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

NodeImpl.java

Big honkin' merge from head. Sheesh!

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

NodeStatusImpl.java

Merge from HEAD to WCM-DEV2.

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

Permission.hbm.xml

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

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

PermissionsDaoComponentImpl.java

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

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

QNameUserType.java

Moving to root below branch label

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

ServerImpl.java

Merge from HEAD to WCM-DEV2.

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

Store.hbm.xml

Big honkin' merge from head. Sheesh!

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

StoreImpl.java

Merged up to HEAD.

2006-06-16 19:18:30 +00:00

Transaction.hbm.xml

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

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

TransactionImpl.java

Merge from HEAD to WCM-DEV2.

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

VersionCount.hbm.xml

Big honkin' merge from head. Sheesh!

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

VersionCounterDaoComponentImpl.java

Morning merge.

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

VersionCountImpl.java

Merged up to HEAD.

2006-06-16 19:18:30 +00:00