diff --git a/config/alfresco/ibatis/ibatis-context.xml b/config/alfresco/ibatis/ibatis-context.xml
index c7b0d411e9..6b796af4ea 100644
--- a/config/alfresco/ibatis/ibatis-context.xml
+++ b/config/alfresco/ibatis/ibatis-context.xml
@@ -37,7 +37,7 @@
         </property>
     </bean>
 
-   	<bean id="activitiesSqlMapClient" class="org.alfresco.repo.domain.ibatis.AlfrescoSqlMapClientFactoryBean" singleton="true">
+   	<bean id="activitiesSqlMapClient" class="org.alfresco.ibatis.HierarchicalSqlMapClientFactoryBean" singleton="true">
         <property name="dataSource" ref="iBatisDataSource"/>
         <property name="resourceLoader" ref="dialectResourceLoader" />
         <property name="configLocation">
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityFeed-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityFeed-common-SqlMap.xml
index d7c738b8fd..295fd13adc 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityFeed-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityFeed-common-SqlMap.xml
@@ -9,7 +9,7 @@
    <typeAlias alias="ActivityFeed" type="org.alfresco.repo.activities.feed.ActivityFeedDAO"/>
 
    <resultMap id="ActivityFeedResult" class="ActivityFeed">
-      <result property="id" column="id"/>
+      <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
       <result property="feedUserId" column="feed_user_id"/>
       <result property="postUserId" column="post_user_id"/>
       <result property="postDate" column="post_date"/>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityFeedControl-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityFeedControl-common-SqlMap.xml
index f094669972..32118f5609 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityFeedControl-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityFeedControl-common-SqlMap.xml
@@ -9,7 +9,7 @@
    <typeAlias alias="FeedControl" type="org.alfresco.repo.activities.feed.control.FeedControlDAO"/>
 
    <resultMap id="FeedControlResult" class="FeedControl">
-      <result property="id" column="id"/>
+      <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
       <result property="feedUserId" column="feed_user_id"/>
       <result property="siteNetwork" column="site_network"/>
       <result property="appTool" column="app_tool"/>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityPost-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityPost-common-SqlMap.xml
index e6cae6130b..8ffa4800e4 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityPost-common-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/ActivityPost-common-SqlMap.xml
@@ -9,7 +9,7 @@
    <typeAlias alias="ActivityPost" type="org.alfresco.repo.activities.post.ActivityPostDAO"/>
 
    <resultMap id="ActivityPostResult" class="ActivityPost">
-      <result property="id" column="sequence_id"/>
+      <result property="id" column="sequence_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
       <result property="activityData" column="activity_data"/>
       <result property="activityType" column="activity_type"/>
       <result property="userId" column="post_user_id"/>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeed-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeed-insert-SqlMap.xml
index 60543b0eb0..086642dacf 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeed-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeed-insert-SqlMap.xml
@@ -12,7 +12,7 @@
       values (#activityType#, #activitySummary#, #activitySummaryFormat#, #feedUserId#, #postUserId#, #postDate#, #postId#, #siteNetwork#, #appTool#, #feedDate#)
 
       <selectKey resultClass="long" keyProperty="id" type="post">
-         KEY_COLUMN:id
+         KEY_COLUMN:GENERATED_KEY
       </selectKey>
       
    </insert>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeedControl-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeedControl-insert-SqlMap.xml
index cf7271bc64..935476aeae 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeedControl-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityFeedControl-insert-SqlMap.xml
@@ -12,7 +12,7 @@
       values (#feedUserId#, #siteNetwork#, #appTool#, #lastModified#)
       
       <selectKey resultClass="long" keyProperty="id" type="post">
-         KEY_COLUMN:id
+         KEY_COLUMN:GENERATED_KEY
       </selectKey>
       
    </insert>
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityPost-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityPost-insert-SqlMap.xml
index 5e4177d0ff..8aa0442ecb 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityPost-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/ActivityPost-insert-SqlMap.xml
@@ -12,7 +12,7 @@
       values (#status#, #activityData#, #userId#, #postDate#, #activityType#, #siteNetwork#, #appTool#, #jobTaskNode#, #lastModified#)
       
       <selectKey resultClass="long" keyProperty="id" type="post">
-         KEY_COLUMN:sequence_id
+         KEY_COLUMN:GENERATED_KEY
       </selectKey>
       
    </insert>
diff --git a/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java b/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java
index 72f57da50c..9d5957847d 100644
--- a/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java
+++ b/source/java/org/alfresco/repo/activities/feed/ActivityFeedDAO.java
@@ -35,7 +35,7 @@ import org.json.JSONObject;
  */
 public class ActivityFeedDAO
 { 
-    private long id; // internal DB-generated id
+    private Long id; // internal DB-generated id
     private String activityType;
     private String activitySummary;
     private String activitySummaryFormat;
@@ -48,12 +48,12 @@ public class ActivityFeedDAO
     private long postId; // for debug - not an explicit FK constraint, could be used to implement re-generate
     
 
-    public long getId()
+    public Long getId()
     {
         return id;
     }
     
-    public void setId(long id)
+    public void setId(Long id)
     {
         this.id = id;
     }
diff --git a/source/java/org/alfresco/repo/activities/feed/control/FeedControlDAO.java b/source/java/org/alfresco/repo/activities/feed/control/FeedControlDAO.java
index 683aad6e3b..3424e58ec2 100644
--- a/source/java/org/alfresco/repo/activities/feed/control/FeedControlDAO.java
+++ b/source/java/org/alfresco/repo/activities/feed/control/FeedControlDAO.java
@@ -33,7 +33,7 @@ import org.alfresco.service.cmr.activities.FeedControl;
  */
 public class FeedControlDAO
 { 
-    private long id; // internal DB-generated id
+    private Long id; // internal DB-generated id
     private String feedUserId;
     private String siteNetwork;
     private String appTool;
@@ -66,12 +66,12 @@ public class FeedControlDAO
         return new FeedControl(this.siteNetwork, this.appTool);
     }
     
-    public long getId()
+    public Long getId()
     {
         return id;
     }
     
-    public void setId(long id)
+    public void setId(Long id)
     {
         this.id = id;
     }
diff --git a/source/java/org/alfresco/repo/activities/post/ActivityPostDAO.java b/source/java/org/alfresco/repo/activities/post/ActivityPostDAO.java
index 14c805eedf..3d6450a9a8 100644
--- a/source/java/org/alfresco/repo/activities/post/ActivityPostDAO.java
+++ b/source/java/org/alfresco/repo/activities/post/ActivityPostDAO.java
@@ -33,7 +33,7 @@ public class ActivityPostDAO
 { 
     public enum STATUS { POSTED, PENDING, PROCESSED, ERROR };
     
-    private long id; // internal DB-generated sequence id
+    private Long id; // internal DB-generated sequence id
     private String activityData;
     private String activityType;
     private String userId;
@@ -48,11 +48,11 @@ public class ActivityPostDAO
     private long minId = -1;
     private long maxId = -1;
     
-    public long getId()
+    public Long getId()
     {
         return id;
     }
-    public void setId(long id)
+    public void setId(Long id)
     {
         this.id = id;
     }
diff --git a/source/java/org/alfresco/repo/domain/ibatis/AlfrescoSqlMapClientFactoryBean.java b/source/java/org/alfresco/repo/domain/ibatis/AlfrescoSqlMapClientFactoryBean.java
deleted file mode 100644
index 34c36d7d05..0000000000
--- a/source/java/org/alfresco/repo/domain/ibatis/AlfrescoSqlMapClientFactoryBean.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.alfresco.repo.domain.ibatis;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import org.alfresco.ibatis.HierarchicalSqlMapClientFactoryBean;
-import org.hibernate.cfg.Environment;
-import org.springframework.core.io.Resource;
-
-import com.ibatis.sqlmap.client.SqlMapClient;
-
-/**
- * Extension to the SQLMap factory to produce <tt>SqlMapClient</tt> instances that
- * cater for Alfresco extensions.
- * <p>
- * Currently, this is just a hack to find the Hibernate dialect and provide that as
- * a property to the factory code.  This will go away if we move over to iBatis; to be
- * replaced with something similar to the schema script loading that uses a hierarchy
- * of databases.
- * 
- * @author Derek Hulley
- * @since 3.1
- */
-public class AlfrescoSqlMapClientFactoryBean extends HierarchicalSqlMapClientFactoryBean
-{
-
-    @Override
-    protected SqlMapClient buildSqlMapClient(Resource configLocation, Properties properties) throws IOException
-    {
-        // Get the Hibernate dialect from the system properties
-        String hibernateDialect = System.getProperty(Environment.DIALECT);
-        if (hibernateDialect == null)
-        {
-            return super.buildSqlMapClient(configLocation, properties);
-        }
-        else
-        {
-            if (properties == null)
-            {
-                properties = new Properties();
-            }
-            properties.put("hibernate.dialect", hibernateDialect);
-            return super.buildSqlMapClient(configLocation, properties);
-        }
-    }
-    
-}