inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed usage of iBatis namespaces

Browse Source 
- Turned namespacing on
 - Collapsed SqlMapConfig.xml files with the exception of that for activities, which uses a different datasource bean
 - Tried to use it and discovered a "feature": If any ID has a '.' in it, then it is assumed to be namespaced already ...
 - Fixed up all IDs for iBatis objects; replaced '.' with '_' except in our namespaces
 - Don't panic!  It's a find/replace job of ID strings.  Errors will be hard and fast, if there are any.  All DAO and activities tests run.
 - The AVM refactor will get some conflicts in the ibatis-context.xml
    - Either follow the same pattern and fix up the IDs, or
    - Keep a separate bean until some later time.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@16106 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-09-05 10:59:01 +00:00
parent 9fc993a852
commit 4dc6006f1c
31 changed files with 341 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml
View File

@@ -6,7 +6,7 @@
<sqlMap namespace="alfresco.activities">
<insert id="insert.activity.feedcontrol" parameterClass="FeedControl">
<insert id="insert_activity_feedcontrol" parameterClass="FeedControl">
insert into alf_activity_feed_control (feed_user_id, site_network, app_tool, last_modified)
values (#feedUserId#, #siteNetwork#, #appTool#, #lastModified#)
@@ -17,7 +17,7 @@
</insert>
<insert id="insert.activity.feed" parameterClass="ActivityFeed">
<insert id="insert_activity_feed" parameterClass="ActivityFeed">
insert into alf_activity_feed (activity_type, activity_summary, activity_format, feed_user_id, post_user_id, post_date, post_id, site_network, app_tool, feed_date)
values (#activityType#, #activitySummary#, #activitySummaryFormat#, #feedUserId#, #postUserId#, #postDate#, #postId#, #siteNetwork#, #appTool#, #feedDate#)
@@ -28,7 +28,7 @@
</insert>
<insert id="insert.activity.post" parameterClass="ActivityPost">
<insert id="insert_activity_post" parameterClass="ActivityPost">
insert into alf_activity_post (status, activity_data, post_user_id, post_date, activity_type, site_network, app_tool, job_task_node, last_modified)
values (#status#, #activityData#, #userId#, #postDate#, #activityType#, #siteNetwork#, #appTool#, #jobTaskNode#, #lastModified#)

12
config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml
View File

@@ -6,22 +6,22 @@
<sqlMap namespace="alfresco.audit">
<insert id="insert.AuditModel" parameterClass="AuditModel" >
<include refid="insert.AuditModel.AutoIncrement"/>
<insert id="insert_AuditModel" parameterClass="AuditModel" >
<include refid="insert_AuditModel_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>
</insert>
<insert id="insert.AuditApplication" parameterClass="AuditApplication" >
<include refid="insert.AuditApplication.AutoIncrement"/>
<insert id="insert_AuditApplication" parameterClass="AuditApplication" >
<include refid="insert_AuditApplication_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>
</insert>
<insert id="insert.AuditEntry" parameterClass="AuditEntry" >
<include refid="insert.AuditEntry.AutoIncrement"/>
<insert id="insert_AuditEntry" parameterClass="AuditEntry" >
<include refid="insert_AuditEntry_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>

16
config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml
View File

@@ -6,29 +6,29 @@
<sqlMap namespace="alfresco.content">
<insert id="insert.Mimetype" parameterClass="Mimetype" >
<include refid="insert.Mimetype.AutoIncrement"/>
<insert id="insert_Mimetype" parameterClass="Mimetype" >
<include refid="alfresco.content.insert_Mimetype_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>
</insert>
<insert id="insert.Encoding" parameterClass="Encoding" >
<include refid="insert.Encoding.AutoIncrement"/>
<insert id="insert_Encoding" parameterClass="Encoding" >
<include refid="alfresco.content.insert_Encoding_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>
</insert>
<insert id="insert.ContentUrl" parameterClass="ContentUrl" >
<include refid="insert.ContentUrl.AutoIncrement"/>
<insert id="insert_ContentUrl" parameterClass="ContentUrl" >
<include refid="alfresco.content.insert_ContentUrl_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>
</insert>
<insert id="insert.ContentData" parameterClass="ContentData" >
<include refid="insert.ContentData.AutoIncrement"/>
<insert id="insert_ContentData" parameterClass="ContentData" >
<include refid="alfresco.content.insert_ContentData_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>

8
config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml
View File

@@ -6,15 +6,15 @@
<sqlMap namespace="alfresco.lock">
<insert id="insert.LockResource" parameterClass="LockResource" >
<include refid="insert.LockResource.AutoIncrement"/>
<insert id="insert_LockResource" parameterClass="LockResource" >
<include refid="insert_LockResource_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>
</insert>
<insert id="insert.Lock" parameterClass="Lock" >
<include refid="insert.Lock.AutoIncrement"/>
<insert id="insert_Lock" parameterClass="Lock" >
<include refid="insert_Lock_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>

20
config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml
View File

@@ -6,36 +6,36 @@
<sqlMap namespace="alfresco.propval">
<insert id="insert.PropertyClass" parameterClass="PropertyClass" >
<include refid="insert.PropertyClass.AutoIncrement"/>
<insert id="insert_PropertyClass" parameterClass="PropertyClass" >
<include refid="insert_PropertyClass_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>
</insert>
<insert id="insert.PropertyStringValue" parameterClass="PropertyStringValue" >
<include refid="insert.PropertyStringValue.AutoIncrement"/>
<insert id="insert_PropertyStringValue" parameterClass="PropertyStringValue" >
<include refid="insert_PropertyStringValue_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>
</insert>
<insert id="insert.PropertyDoubleValue" parameterClass="PropertyDoubleValue" >
<include refid="insert.PropertyDoubleValue.AutoIncrement"/>
<insert id="insert_PropertyDoubleValue" parameterClass="PropertyDoubleValue" >
<include refid="insert_PropertyDoubleValue_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>
</insert>
<insert id="insert.PropertySerializableValue" parameterMap="parameter.PropertySerializableValue" >
<include refid="insert.PropertySerializableValue.AutoIncrement"/>
<insert id="insert_PropertySerializableValue" parameterMap="parameter_PropertySerializableValue" >
<include refid="insert_PropertySerializableValue_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>
</insert>
<insert id="insert.PropertyValue" parameterClass="PropertyValue" >
<include refid="insert.PropertyValue.AutoIncrement"/>
<insert id="insert_PropertyValue" parameterClass="PropertyValue" >
<include refid="insert_PropertyValue_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY
</selectKey>