Derek Hulley cfb373ae36 Merge 1.4 to HEAD ...

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4340 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4350 .
   svn resolved root\projects\3rd-party\.classpath
   svn resolved root\projects\repository\source\java\org\alfresco\repo\workflow\WorkflowInterpreter.java
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4379 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4380 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4420 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4421 .
   svn resolved root\projects\3rd-party\.classpath


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

2006-12-19 14:24:45 +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

Merge 1.4 to HEAD

2006-12-19 14:24:45 +00:00

LifecycleAdapter.java

Morning merge.

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

LocaleUserType.java

ContentData

2006-12-15 14:27:17 +00:00

Node.hbm.xml

Merged 1.4 to HEAD

2006-12-18 13:18:44 +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

…

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

Merged 1.4 to HEAD

2006-12-18 11:21:44 +00:00

VersionCountImpl.java

Merged up to HEAD.

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