Derek Hulley 326e3cc9c7 Merged DEV/SWIFT to HEAD ...

25641: ALF-5260 - MyBatis: part IX - fix HierarchicalSqlSessionFactoryBeanTest + cleanup
          - fix test + update test resources (and remove temp files)
          - update alfresco-SqlMapConfig (and remove temp file)
   25696: MBatis: workaround fix for #179
          - intermittent ActivityService error on startup (... "Mapped Statements collection already contains value for" ...)
   26119: Fixes for ALF-7551: Upgarde from 2.1.7 -> SWIFT fails with MyBatis migration issues
          - missing resultType and incorrect parameter definitions (using iBatis #woof# and not myBatis #{woof} )


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

2011-05-24 06:19:00 +00:00

..

ibatis

Merged DEV/SWIFT to HEAD

2011-05-24 06:19:00 +00:00

ActivitiesDAO.java

Merged DEV/SWIFT to HEAD

2011-05-24 03:36:53 +00:00

ActivityFeedDAO.java

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

ActivityFeedEntity.java

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

ActivityFeedQueryEntity.java

Merged V3.4-TEAM to HEAD

2011-04-11 19:26:26 +00:00

ActivityPostDAO.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

ActivityPostEntity.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

FeedControlDAO.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00

FeedControlEntity.java

Updated header to LGPL

2010-03-01 22:48:39 +00:00