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

2
config/alfresco/ibatis/activities-SqlMapConfig.xml
View File

@@ -6,6 +6,8 @@
<sqlMapConfig> <sqlMapConfig>
<settings useStatementNamespaces="true" />
<sqlMap resource="alfresco/ibatis/#resource.dialect#/activities-common-SqlMap.xml"/> <sqlMap resource="alfresco/ibatis/#resource.dialect#/activities-common-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/activities-insert-SqlMap.xml"/> <sqlMap resource="alfresco/ibatis/#resource.dialect#/activities-insert-SqlMap.xml"/>

22
config/alfresco/ibatis/alfresco-SqlMapConfig.xml Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMapConfig
PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
<sqlMapConfig>
<settings useStatementNamespaces="true" />
<typeHandler javaType="java.io.Serializable" jdbcType="BLOB" callback="org.alfresco.ibatis.SerializableTypeHandlerCallback"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/locks-common-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/locks-insert-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/content-common-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/content-insert-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/propval-common-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/propval-insert-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/audit-common-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/audit-insert-SqlMap.xml"/>
</sqlMapConfig>

12
config/alfresco/ibatis/audit-SqlMapConfig.xml
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMapConfig
PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
<sqlMapConfig>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/audit-common-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/audit-insert-SqlMap.xml"/>
</sqlMapConfig>

12
config/alfresco/ibatis/content-SqlMapConfig.xml
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMapConfig
PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
<sqlMapConfig>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/content-common-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/content-insert-SqlMap.xml"/>
</sqlMapConfig>

47
config/alfresco/ibatis/ibatis-context.xml
View File

@@ -50,52 +50,25 @@
</property> </property>
</bean> </bean>
<!-- iBatis config for Locks domain --> <!-- iBatis config for Alfresco (using common datasource) -->
<bean id="locksSqlMapClient" class="org.alfresco.ibatis.HierarchicalSqlMapClientFactoryBean"> <bean id="alfrescoSqlMapClient" class="org.alfresco.ibatis.HierarchicalSqlMapClientFactoryBean">
<property name="dataSource" ref="dataSource"/> <property name="dataSource" ref="dataSource"/>
<property name="resourceLoader" ref="dialectResourceLoader" /> <property name="resourceLoader" ref="dialectResourceLoader" />
<property name="configLocation"> <property name="configLocation">
<value>classpath:alfresco/ibatis/locks-SqlMapConfig.xml</value> <value>classpath:alfresco/ibatis/alfresco-SqlMapConfig.xml</value>
</property> </property>
</bean> </bean>
<bean id="locksSqlMapClientTemplate" class="org.springframework.orm.ibatis.SqlMapClientTemplate"> <bean id="locksSqlMapClientTemplate" class="org.springframework.orm.ibatis.SqlMapClientTemplate">
<property name="sqlMapClient" ref="locksSqlMapClient"/> <property name="sqlMapClient" ref="alfrescoSqlMapClient"/>
</bean> </bean>
<bean id="contentSqlMapClientTemplate" class="org.springframework.orm.ibatis.SqlMapClientTemplate">
<!-- iBatis config for Content domain --> <property name="sqlMapClient" ref="alfrescoSqlMapClient"/>
<bean id="contentSqlMapClient" class="org.alfresco.ibatis.HierarchicalSqlMapClientFactoryBean">
<property name="dataSource" ref="dataSource"/>
<property name="resourceLoader" ref="dialectResourceLoader" />
<property name="configLocation">
<value>classpath:alfresco/ibatis/content-SqlMapConfig.xml</value>
</property>
</bean> </bean>
<bean id="contentSqlMapClientTemplate" class="org.springframework.orm.ibatis.SqlMapClientTemplate"> <bean id="propertyValueSqlMapClientTemplate" class="org.springframework.orm.ibatis.SqlMapClientTemplate">
<property name="sqlMapClient" ref="contentSqlMapClient"/> <property name="sqlMapClient" ref="alfrescoSqlMapClient"/>
</bean>
<!-- iBatis config for PropertyValue domain -->
<bean id="propertyValueSqlMapClient" class="org.alfresco.ibatis.HierarchicalSqlMapClientFactoryBean">
<property name="dataSource" ref="dataSource"/>
<property name="resourceLoader" ref="dialectResourceLoader" />
<property name="configLocation">
<value>classpath:alfresco/ibatis/propval-SqlMapConfig.xml</value>
</property>
</bean>
<bean id="propertyValueSqlMapClientTemplate" class="org.springframework.orm.ibatis.SqlMapClientTemplate">
<property name="sqlMapClient" ref="propertyValueSqlMapClient"/>
</bean>
<!-- iBatis config for Audit domain -->
<bean id="auditSqlMapClient" class="org.alfresco.ibatis.HierarchicalSqlMapClientFactoryBean">
<property name="dataSource" ref="dataSource"/>
<property name="resourceLoader" ref="dialectResourceLoader" />
<property name="configLocation">
<value>classpath:alfresco/ibatis/audit-SqlMapConfig.xml</value>
</property>
</bean> </bean>
<bean id="auditSqlMapClientTemplate" class="org.springframework.orm.ibatis.SqlMapClientTemplate"> <bean id="auditSqlMapClientTemplate" class="org.springframework.orm.ibatis.SqlMapClientTemplate">
<property name="sqlMapClient" ref="auditSqlMapClient"/> <property name="sqlMapClient" ref="alfrescoSqlMapClient"/>
</bean> </bean>
</beans> </beans>

12
config/alfresco/ibatis/locks-SqlMapConfig.xml
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMapConfig
PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
<sqlMapConfig>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/locks-common-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/locks-insert-SqlMap.xml"/>
</sqlMapConfig>

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

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

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

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

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

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

44
config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml
View File

@@ -45,7 +45,7 @@
</resultMap> </resultMap>
<!-- select feeds for cleaning --> <!-- select feeds for cleaning -->
<select id="select.activity.feed.greater.than.max" parameterClass="int" resultClass="ActivityFeed"> <select id="select_activity_feed_greater_than_max" parameterClass="int" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select site_network as siteNetwork, feed_user_id as feedUserId, activity_format as activitySummaryFormat select site_network as siteNetwork, feed_user_id as feedUserId, activity_format as activitySummaryFormat
from alf_activity_feed from alf_activity_feed
@@ -55,7 +55,7 @@
</select> </select>
<!-- user feed - all sites - everyone --> <!-- user feed - all sites - everyone -->
<select id="select.activity.feed.for.feeduser" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select_activity_feed_for_feeduser" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed from alf_activity_feed
@@ -66,7 +66,7 @@
</select> </select>
<!-- user feed - all sites - others (not me) --> <!-- user feed - all sites - others (not me) -->
<select id="select.activity.feed.for.feeduser.others" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select_activity_feed_for_feeduser_others" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed from alf_activity_feed
@@ -78,7 +78,7 @@
</select> </select>
<!-- user feed - all sites - me only (not others) --> <!-- user feed - all sites - me only (not others) -->
<select id="select.activity.feed.for.feeduser.me" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select_activity_feed_for_feeduser_me" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed from alf_activity_feed
@@ -90,7 +90,7 @@
</select> </select>
<!-- user feed - given site - everyone --> <!-- user feed - given site - everyone -->
<select id="select.activity.feed.for.feeduser.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select_activity_feed_for_feeduser_and_site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed from alf_activity_feed
@@ -102,7 +102,7 @@
</select> </select>
<!-- user feed - given site - others (not me) --> <!-- user feed - given site - others (not me) -->
<select id="select.activity.feed.for.feeduser.others.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select_activity_feed_for_feeduser_others_and_site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed from alf_activity_feed
@@ -115,7 +115,7 @@
</select> </select>
<!-- user feed - given site - me only (not others) --> <!-- user feed - given site - me only (not others) -->
<select id="select.activity.feed.for.feeduser.me.and.site" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select_activity_feed_for_feeduser_me_and_site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, feed_user_id as feedUserId, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed from alf_activity_feed
@@ -128,7 +128,7 @@
</select> </select>
<!-- site feed - given site --> <!-- site feed - given site -->
<select id="select.activity.feed.for.site" parameterClass="ActivityFeed" resultClass="ActivityFeed"> <select id="select_activity_feed_for_site" parameterClass="ActivityFeed" resultClass="ActivityFeed">
<![CDATA[ <![CDATA[
select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate select id as id, activity_type as activityType, activity_format as activitySummaryFormat, activity_summary as activitySummary, post_user_id as postUserId, site_network as siteNetwork, post_date as postDate
from alf_activity_feed from alf_activity_feed
@@ -139,13 +139,13 @@
]]> ]]>
</select> </select>
<delete id="delete.activity.feed.entries.older.than.date" parameterClass="Date"> <delete id="delete_activity_feed_entries_older_than_date" parameterClass="Date">
<![CDATA[ <![CDATA[
delete from alf_activity_feed where post_date < #keepdate# delete from alf_activity_feed where post_date < #keepdate#
]]> ]]>
</delete> </delete>
<delete id="delete.activity.feed.for.site.entries.older.than.date" parameterClass="ActivityFeed"> <delete id="delete_activity_feed_for_site_entries_older_than_date" parameterClass="ActivityFeed">
<![CDATA[ <![CDATA[
delete from alf_activity_feed delete from alf_activity_feed
where post_date < #postDate# where post_date < #postDate#
@@ -154,7 +154,7 @@
]]> ]]>
</delete> </delete>
<delete id="delete.activity.feed.for.feeduser.entries.older.than.date" parameterClass="ActivityFeed"> <delete id="delete_activity_feed_for_feeduser_entries_older_than_date" parameterClass="ActivityFeed">
<![CDATA[ <![CDATA[
delete from alf_activity_feed delete from alf_activity_feed
where post_date < #postDate# where post_date < #postDate#
@@ -163,7 +163,7 @@
]]> ]]>
</delete> </delete>
<select id="select.activity.feedcontrols.for.user" parameterClass="FeedControl" resultClass="FeedControl"> <select id="select_activity_feedcontrols_for_user" parameterClass="FeedControl" resultClass="FeedControl">
<![CDATA[ <![CDATA[
select id as id, feed_user_id as feedUserId, site_network as siteNetwork, app_tool as appTool select id as id, feed_user_id as feedUserId, site_network as siteNetwork, app_tool as appTool
from alf_activity_feed_control from alf_activity_feed_control
@@ -171,7 +171,7 @@
]]> ]]>
</select> </select>
<select id="select.activity.feedcontrol" parameterClass="FeedControl" resultClass="long"> <select id="select_activity_feedcontrol" parameterClass="FeedControl" resultClass="long">
<![CDATA[ <![CDATA[
select id as id select id as id
from alf_activity_feed_control from alf_activity_feed_control
@@ -181,7 +181,7 @@
]]> ]]>
</select> </select>
<delete id="delete.activity.feedcontrol" parameterClass="FeedControl"> <delete id="delete_activity_feedcontrol" parameterClass="FeedControl">
<![CDATA[ <![CDATA[
delete from alf_activity_feed_control delete from alf_activity_feed_control
where feed_user_id = #feedUserId# where feed_user_id = #feedUserId#
@@ -190,7 +190,7 @@
]]> ]]>
</delete> </delete>
<select id="select.activity.posts" parameterClass="ActivityPost" resultClass="ActivityPost"> <select id="select_activity_posts" parameterClass="ActivityPost" resultClass="ActivityPost">
<![CDATA[ <![CDATA[
select select
sequence_id as id, sequence_id as id,
@@ -212,7 +212,7 @@
]]> ]]>
</select> </select>
<select id="select.activity.posts.by.status.only" parameterClass="ActivityPost" resultClass="ActivityPost"> <select id="select_activity_posts_by_status_only" parameterClass="ActivityPost" resultClass="ActivityPost">
<![CDATA[ <![CDATA[
select select
sequence_id as id, sequence_id as id,
@@ -231,25 +231,25 @@
]]> ]]>
</select> </select>
<select id="select.activity.post.max.seq" resultClass="long"> <select id="select_activity_post_max_seq" resultClass="long">
select max(sequence_id) as maxId select max(sequence_id) as maxId
from alf_activity_post from alf_activity_post
where status = 'POSTED' where status = 'POSTED'
</select> </select>
<select id="select.activity.post.min.seq" resultClass="long"> <select id="select_activity_post_min_seq" resultClass="long">
select min(sequence_id) as minId select min(sequence_id) as minId
from alf_activity_post from alf_activity_post
where status = 'POSTED' where status = 'POSTED'
</select> </select>
<select id="select.activity.post.max.jobtasknode" resultClass="int"> <select id="select_activity_post_max_jobtasknode" resultClass="int">
select max(job_task_node) as maxJobTaskNode select max(job_task_node) as maxJobTaskNode
from alf_activity_post from alf_activity_post
where status = 'POSTED' where status = 'POSTED'
</select> </select>
<delete id="delete.activity.posts.older.than.date" parameterClass="ActivityPost"> <delete id="delete_activity_posts_older_than_date" parameterClass="ActivityPost">
<![CDATA[ <![CDATA[
delete from alf_activity_post delete from alf_activity_post
where post_date < #postDate# where post_date < #postDate#
@@ -257,13 +257,13 @@
]]> ]]>
</delete> </delete>
<update id="update.activity.post.data" parameterClass="ActivityPost"> <update id="update_activity_post_data" parameterClass="ActivityPost">
update alf_activity_post set status = #status#, activity_data=#activityData#, site_network=#siteNetwork#, last_modified=#lastModified# update alf_activity_post set status = #status#, activity_data=#activityData#, site_network=#siteNetwork#, last_modified=#lastModified#
where sequence_id = #id# where sequence_id = #id#
and status != #status# and status != #status#
</update> </update>
<update id="update.activity.post.status" parameterClass="ActivityPost"> <update id="update_activity_post_status" parameterClass="ActivityPost">
update alf_activity_post set status = #status#, last_modified=#lastModified# update alf_activity_post set status = #status#, last_modified=#lastModified#
where sequence_id = #id# where sequence_id = #id#
and status != #status# and status != #status#

82
config/alfresco/ibatis/org.hibernate.dialect.Dialect/audit-common-SqlMap.xml
View File

@@ -20,39 +20,45 @@
<!-- Result Maps --> <!-- Result Maps -->
<!-- --> <!-- -->
<resultMap id="result.AuditModel" class="AuditModel"> <resultMap id="result_AuditModel" class="AuditModel">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="contentDataId" column="content_data_id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="contentDataId" column="content_data_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="contentCrc" column="content_crc" jdbcType="BIGINT" javaType="long"/> <result property="contentCrc" column="content_crc" jdbcType="BIGINT" javaType="long"/>
</resultMap> </resultMap>
<resultMap id="result.AuditApplication" class="AuditApplication"> <resultMap id="result_AuditApplication" class="AuditApplication">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="auditModelId" column="audit_model_id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="auditModelId" column="audit_model_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="applicationNameId" column="app_name_id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="applicationNameId" column="app_name_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
</resultMap> </resultMap>
<resultMap id="result.AuditEntry" class="AuditEntry"> <resultMap id="result_AuditEntry" class="AuditEntry">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="auditApplicationId" column="audit_app_id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="auditApplicationId" column="audit_app_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="auditUserId" column="audit_user_id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="auditUserId" column="audit_user_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="auditTime" column="audit_time" jdbcType="BIGINT" javaType="long"/> <result property="auditTime" column="audit_time" jdbcType="BIGINT" javaType="long"/>
<result property="auditValuesId" column="audit_values_id" jdbcType="BIGINT" javaType="long"/> <result property="auditValuesId" column="audit_values_id" jdbcType="BIGINT" javaType="long"/>
</resultMap> </resultMap>
<resultMap id="result.AuditQuery" class="AuditQueryResult"> <resultMap id="result_AuditQueryNoValues" class="AuditQueryResult">
<result property="auditEntryId" column="audit_entry_id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="auditEntryId" column="audit_entry_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="auditAppName" column="audit_app_name" jdbcType="VARCHAR" javaType="string"/> <result property="auditAppName" column="audit_app_name" jdbcType="VARCHAR" javaType="string"/>
<result property="auditUser" column="audit_user" jdbcType="VARCHAR" javaType="string"/> <result property="auditUser" column="audit_user" jdbcType="VARCHAR" javaType="string"/>
<result property="auditTime" column="audit_time" jdbcType="BIGINT" javaType="long"/> <result property="auditTime" column="audit_time" jdbcType="BIGINT" javaType="long"/>
<result property="auditValuesId" column="audit_values_id" jdbcType="BIGINT" javaType="long"/> <result property="auditValuesId" column="audit_values_id" jdbcType="BIGINT" javaType="long"/>
</resultMap> </resultMap>
<resultMap id="result_AuditQueryAllValues"
extends="alfresco.audit.result_AuditQueryNoValues"
class="AuditQueryResult"
groupBy="auditEntryId">
<result property="auditValues" resultMap="alfresco.propval.result_PropertyIdSearchRow"/>
</resultMap>
<!-- --> <!-- -->
<!-- Parameter Maps --> <!-- Parameter Maps -->
<!-- --> <!-- -->
<parameterMap id="parameter.IdMap" class="map"> <parameterMap id="parameter_IdMap" class="map">
<parameter property="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <parameter property="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
</parameterMap> </parameterMap>
<parameterMap id="parameter.AuditQuery" class="AuditQueryParameters"> <parameterMap id="parameter_AuditQuery" class="AuditQueryParameters">
<parameter property="auditAppNameShort" jdbcType="VARCHAR" javaType="string"/> <parameter property="auditAppNameShort" jdbcType="VARCHAR" javaType="string"/>
<parameter property="auditAppNameCrc" jdbcType="BIGINT" javaType="long"/> <parameter property="auditAppNameCrc" jdbcType="BIGINT" javaType="long"/>
<parameter property="auditUserShort" jdbcType="VARCHAR" javaType="string"/> <parameter property="auditUserShort" jdbcType="VARCHAR" javaType="string"/>
@@ -65,17 +71,17 @@
<!-- SQL Snippets --> <!-- SQL Snippets -->
<!-- --> <!-- -->
<sql id="insert.AuditModel.AutoIncrement"> <sql id="insert_AuditModel_AutoIncrement">
insert into alf_audit_model (content_data_id, content_crc) insert into alf_audit_model (content_data_id, content_crc)
values (#contentDataId#, #contentCrc#) values (#contentDataId#, #contentCrc#)
</sql> </sql>
<sql id="insert.AuditApplication.AutoIncrement"> <sql id="insert_AuditApplication_AutoIncrement">
insert into alf_audit_app (audit_model_id, app_name_id) insert into alf_audit_app (audit_model_id, app_name_id)
values (#auditModelId#, #applicationNameId#) values (#auditModelId#, #applicationNameId#)
</sql> </sql>
<sql id="insert.AuditEntry.AutoIncrement"> <sql id="insert_AuditEntry_AutoIncrement">
insert into alf_audit_entry (audit_app_id, audit_user_id, audit_time, audit_values_id) insert into alf_audit_entry (audit_app_id, audit_user_id, audit_time, audit_values_id)
values (#auditApplicationId#, #auditUserId#, #auditTime#, #auditValuesId#) values (#auditApplicationId#, #auditUserId#, #auditTime#, #auditValuesId#)
</sql> </sql>
@@ -85,7 +91,7 @@
<!-- --> <!-- -->
<!-- Get the audit model by the CRC value --> <!-- Get the audit model by the CRC value -->
<select id="select.AuditModelByCrc" parameterClass="AuditModel" resultMap="result.AuditModel"> <select id="select_AuditModelByCrc" parameterClass="AuditModel" resultMap="result_AuditModel">
select select
* *
from from
@@ -95,7 +101,7 @@
</select> </select>
<!-- Get the audit application by model ID --> <!-- Get the audit application by model ID -->
<select id="select.AuditApplicationByModelId" parameterMap="parameter.IdMap" resultMap="result.AuditApplication"> <select id="select_AuditApplicationByModelId" parameterMap="parameter_IdMap" resultMap="result_AuditApplication">
select select
* *
from from
@@ -104,10 +110,9 @@
audit_model_id = ? audit_model_id = ?
</select> </select>
<!-- Get audit entries by application name --> <!-- Get audit entries -->
<!-- TODO: Use compound parameters for string searching, possibly namespaced from propval --> <!-- TODO: Use compound parameters for string searching, possibly namespaced from propval -->
<!-- TODO: Use compound result map for audit values --> <select id="select_AuditEntriesSimple" parameterClass="AuditQueryParameters" resultMap="result_AuditQueryNoValues">
<select id="select.AuditEntriesSimple" parameterClass="AuditQueryParameters" resultMap="result.AuditQuery">
select select
entry.id as audit_entry_id, entry.id as audit_entry_id,
user_sv.string_value as audit_user, user_sv.string_value as audit_user,
@@ -137,6 +142,55 @@
<![CDATA[entry.audit_time < #auditToTime#]]> <![CDATA[entry.audit_time < #auditToTime#]]>
</isNotNull> </isNotNull>
</dynamic> </dynamic>
order by
entry.id
</select>
<!-- Get audit entries -->
<!-- TODO: Use compound parameters for string searching, possibly namespaced from propval -->
<!-- TODO: Use compound result map for audit values -->
<select id="select_AuditEntriesWithValues" parameterClass="AuditQueryParameters" resultMap="result_AuditQueryAllValues">
select
entry.id as audit_entry_id,
user_sv.string_value as audit_user,
app_sv.string_value as audit_app_name,
entry.audit_time as audit_time,
entry.audit_values_id as audit_values_id,
cl.root_prop_id, cl.current_prop_id, cl.value_prop_id, cl.key_prop_id,
v.actual_type_id, v.persisted_type,
v.long_value, dv.double_value, sv.string_value, serv.serializable_value
from
alf_audit_app app
join alf_prop_value app_pv on (app_pv.id = app.app_name_id)
join alf_prop_string_value app_sv on (app_sv.id = app_pv.long_value and app_pv.persisted_type = 3)
join alf_audit_entry entry on (entry.audit_app_id = app.id)
join alf_prop_value user_pv on (user_pv.id = entry.audit_user_id)
join alf_prop_string_value user_sv on (user_sv.id = user_pv.long_value and user_pv.persisted_type = 3)
join alf_prop_link cl on (cl.root_prop_id = entry.audit_values_id)
join alf_prop_value v on (cl.value_prop_id = v.id)
left join alf_prop_double_value dv on (dv.id = v.long_value and v.persisted_type = 2)
left join alf_prop_string_value sv on (sv.id = v.long_value and (v.persisted_type = 3 || v.persisted_type = 5))
left join alf_prop_serializable_value serv on (serv.id = v.long_value and v.persisted_type = 4)
<dynamic prepend="where">
<isNotNull prepend="and" property="auditAppNameShort">
app_sv.string_end_lower = #auditAppNameShort# and
app_sv.string_crc = #auditAppNameCrc#
</isNotNull>
<isNotNull prepend="and" property="auditUserShort">
user_sv.string_end_lower = #auditUserShort# and
user_sv.string_crc = #auditUserCrc#
</isNotNull>
<isNotNull prepend="and" property="auditFromTime">
<![CDATA[entry.audit_time >= #auditFromTime#]]>
</isNotNull>
<isNotNull prepend="and" property="auditToTime">
<![CDATA[entry.audit_time < #auditToTime#]]>
</isNotNull>
</dynamic>
order by
entry.id
</select> </select>
</sqlMap> </sqlMap>

52
config/alfresco/ibatis/org.hibernate.dialect.Dialect/content-common-SqlMap.xml
View File

@@ -20,19 +20,19 @@
<!-- Result Maps --> <!-- Result Maps -->
<!-- --> <!-- -->
<resultMap id="result.Mimetype" class="Mimetype"> <resultMap id="result_Mimetype" class="Mimetype">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="mimetype" column="mimetype_str" jdbcType="VARCHAR" javaType="java.lang.String"/> <result property="mimetype" column="mimetype_str" jdbcType="VARCHAR" javaType="java.lang.String"/>
</resultMap> </resultMap>
<resultMap id="result.Encoding" class="Encoding"> <resultMap id="result_Encoding" class="Encoding">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="encoding" column="encoding_str" jdbcType="VARCHAR" javaType="java.lang.String"/> <result property="encoding" column="encoding_str" jdbcType="VARCHAR" javaType="java.lang.String"/>
</resultMap> </resultMap>
<resultMap id="result.ContentUrl" class="ContentUrl"> <resultMap id="result_ContentUrl" class="ContentUrl">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="contentUrl" column="content_url" jdbcType="VARCHAR" javaType="java.lang.String"/> <result property="contentUrl" column="content_url" jdbcType="VARCHAR" javaType="java.lang.String"/>
@@ -41,7 +41,7 @@
<result property="size" column="content_size" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="size" column="content_size" jdbcType="BIGINT" javaType="java.lang.Long"/>
</resultMap> </resultMap>
<resultMap id="result.ContentData" class="ContentData"> <resultMap id="result_ContentData" class="ContentData">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="contentUrlId" column="content_url_id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="contentUrlId" column="content_url_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
@@ -56,11 +56,11 @@
<!-- Parameter Maps --> <!-- Parameter Maps -->
<!-- --> <!-- -->
<parameterMap id="parameter.IdMap" class="map"> <parameterMap id="parameter_IdMap" class="map">
<parameter property="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <parameter property="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
</parameterMap> </parameterMap>
<parameterMap id="parameter.NodeAndQNameMap" class="map"> <parameterMap id="parameter_NodeAndQNameMap" class="map">
<parameter property="nodeId" jdbcType="BIGINT" javaType="java.lang.Long"/> <parameter property="nodeId" jdbcType="BIGINT" javaType="java.lang.Long"/>
<parameter property="qnameId" jdbcType="BIGINT" javaType="java.lang.Long"/> <parameter property="qnameId" jdbcType="BIGINT" javaType="java.lang.Long"/>
</parameterMap> </parameterMap>
@@ -69,22 +69,22 @@
<!-- SQL Snippets --> <!-- SQL Snippets -->
<!-- --> <!-- -->
<sql id="insert.Mimetype.AutoIncrement"> <sql id="insert_Mimetype_AutoIncrement">
insert into alf_mimetype (version, mimetype_str) insert into alf_mimetype (version, mimetype_str)
values (#version#, lower(#mimetype#)) values (#version#, lower(#mimetype#))
</sql> </sql>
<sql id="insert.Encoding.AutoIncrement"> <sql id="insert_Encoding_AutoIncrement">
insert into alf_encoding (version, encoding_str) insert into alf_encoding (version, encoding_str)
values (#version#, lower(#encoding#)) values (#version#, lower(#encoding#))
</sql> </sql>
<sql id="insert.ContentUrl.AutoIncrement"> <sql id="insert_ContentUrl_AutoIncrement">
insert into alf_content_url (version, content_url, content_url_short, content_url_crc, content_size) insert into alf_content_url (version, content_url, content_url_short, content_url_crc, content_size)
values (#version#, #contentUrl#, #contentUrlShort#, #contentUrlCrc#, #size#) values (#version#, #contentUrl#, #contentUrlShort#, #contentUrlCrc#, #size#)
</sql> </sql>
<sql id="insert.ContentData.AutoIncrement"> <sql id="insert_ContentData_AutoIncrement">
insert into alf_content_data (version, content_url_id, content_mimetype_id, content_encoding_id, content_locale_id) insert into alf_content_data (version, content_url_id, content_mimetype_id, content_encoding_id, content_locale_id)
values (#version#, #contentUrlId#, #mimetypeId#, #encodingId#, #localeId#) values (#version#, #contentUrlId#, #mimetypeId#, #encodingId#, #localeId#)
</sql> </sql>
@@ -94,7 +94,7 @@
<!-- --> <!-- -->
<!-- Get the mimetype entity by mimetype --> <!-- Get the mimetype entity by mimetype -->
<select id="select.MimetypeByKey" parameterClass="Mimetype" resultMap="result.Mimetype"> <select id="select_MimetypeByKey" parameterClass="Mimetype" resultMap="result_Mimetype">
select select
* *
from from
@@ -104,7 +104,7 @@
</select> </select>
<!-- Get a mimetype based on the ID --> <!-- Get a mimetype based on the ID -->
<select id="select.MimetypeById" parameterClass="Mimetype" resultMap="result.Mimetype"> <select id="select_MimetypeById" parameterClass="Mimetype" resultMap="result_Mimetype">
select select
* *
from from
@@ -114,7 +114,7 @@
</select> </select>
<!-- Get the encoding entity by encoding --> <!-- Get the encoding entity by encoding -->
<select id="select.EncodingByKey" parameterClass="Encoding" resultMap="result.Encoding"> <select id="select_EncodingByKey" parameterClass="Encoding" resultMap="result_Encoding">
select select
* *
from from
@@ -124,7 +124,7 @@
</select> </select>
<!-- Get a encoding based on the ID --> <!-- Get a encoding based on the ID -->
<select id="select.EncodingById" parameterClass="Encoding" resultMap="result.Encoding"> <select id="select_EncodingById" parameterClass="Encoding" resultMap="result_Encoding">
select select
* *
from from
@@ -134,7 +134,7 @@
</select> </select>
<!-- Get the content URL entity by ID --> <!-- Get the content URL entity by ID -->
<select id="select.ContentUrlById" parameterClass="ContentUrl" resultMap="result.ContentUrl"> <select id="select_ContentUrlById" parameterClass="ContentUrl" resultMap="result_ContentUrl">
select select
* *
from from
@@ -144,7 +144,7 @@
</select> </select>
<!-- Get the content URL entity by unique key --> <!-- Get the content URL entity by unique key -->
<select id="select.ContentUrlByKey" parameterClass="ContentUrl" resultMap="result.ContentUrl"> <select id="select_ContentUrlByKey" parameterClass="ContentUrl" resultMap="result_ContentUrl">
select select
* *
from from
@@ -155,7 +155,7 @@
</select> </select>
<!-- Get unreferenced content URL entity by unique key --> <!-- Get unreferenced content URL entity by unique key -->
<select id="select.ContentUrlByKeyUnreferenced" parameterClass="ContentUrl" resultMap="result.ContentUrl"> <select id="select_ContentUrlByKeyUnreferenced" parameterClass="ContentUrl" resultMap="result_ContentUrl">
select select
cu.* cu.*
from from
@@ -168,7 +168,7 @@
</select> </select>
<!-- Delete ContentUrl entity --> <!-- Delete ContentUrl entity -->
<delete id="delete.ContentUrl" parameterMap="parameter.IdMap"> <delete id="delete_ContentUrl" parameterMap="parameter_IdMap">
delete delete
from from
alf_content_url alf_content_url
@@ -177,7 +177,7 @@
</delete> </delete>
<!-- Get the ContentData entity by ID --> <!-- Get the ContentData entity by ID -->
<select id="select.ContentDataById" parameterMap="parameter.IdMap" resultMap="result.ContentData"> <select id="select_ContentDataById" parameterMap="parameter_IdMap" resultMap="result_ContentData">
select select
cd.id as id, cd.id as id,
cd.version as version, cd.version as version,
@@ -195,7 +195,7 @@
</select> </select>
<!-- Get the ContentData entity by Node and property QName --> <!-- Get the ContentData entity by Node and property QName -->
<select id="select.ContentDataByNodeAndQName" parameterMap="parameter.NodeAndQNameMap" resultClass="long"> <select id="select_ContentDataByNodeAndQName" parameterMap="parameter_NodeAndQNameMap" resultClass="long">
select select
np.long_value as id np.long_value as id
from from
@@ -208,7 +208,7 @@
</select> </select>
<!-- Delete ContentData entity --> <!-- Delete ContentData entity -->
<delete id="delete.ContentData" parameterMap="parameter.IdMap"> <delete id="delete_ContentData" parameterMap="parameter_IdMap">
delete delete
from from
alf_content_data alf_content_data
@@ -217,7 +217,7 @@
</delete> </delete>
<!-- Select all content URLs --> <!-- Select all content URLs -->
<select id="select.ContentUrls" resultClass="string"> <select id="select_ContentUrls" resultClass="string">
select select
content_url content_url
from from
@@ -225,12 +225,12 @@
</select> </select>
<!-- Insert a Content Clean URL --> <!-- Insert a Content Clean URL -->
<insert id="insert.ContentCleanUrl" parameterClass="ContentClean" > <insert id="insert_ContentCleanUrl" parameterClass="ContentClean" >
insert into alf_content_clean (content_url) values (lower(#contentUrl#)) insert into alf_content_clean (content_url) values (lower(#contentUrl#))
</insert> </insert>
<!-- Select all content clean URLs --> <!-- Select all content clean URLs -->
<select id="select.ContentCleanUrls" resultClass="string"> <select id="select_ContentCleanUrls" resultClass="string">
select select
content_url content_url
from from
@@ -238,7 +238,7 @@
</select> </select>
<!-- Remove a Content Clean URL --> <!-- Remove a Content Clean URL -->
<delete id="delete.ContentCleanUrl" parameterClass="ContentClean" > <delete id="delete_ContentCleanUrl" parameterClass="ContentClean" >
delete delete
from from
alf_content_clean alf_content_clean
@@ -247,7 +247,7 @@
</delete> </delete>
<!-- Remove all Content Clean URLs --> <!-- Remove all Content Clean URLs -->
<delete id="delete.ContentCleanUrls" > <delete id="delete_ContentCleanUrls" >
delete delete
from from
alf_content_clean alf_content_clean

22
config/alfresco/ibatis/org.hibernate.dialect.Dialect/locks-common-SqlMap.xml
View File

@@ -17,14 +17,14 @@
<!-- Result Maps --> <!-- Result Maps -->
<!-- --> <!-- -->
<resultMap id="result.LockResource" class="LockResource"> <resultMap id="result_LockResource" class="LockResource">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="qnameNamespaceId" column="qname_ns_id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="qnameNamespaceId" column="qname_ns_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="qnameLocalName" column="qname_localname" jdbcType="VARCHAR" javaType="java.lang.String"/> <result property="qnameLocalName" column="qname_localname" jdbcType="VARCHAR" javaType="java.lang.String"/>
</resultMap> </resultMap>
<resultMap id="result.Lock" class="Lock"> <resultMap id="result_Lock" class="Lock">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="version" column="version" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="sharedResourceId" column="shared_resource_id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="sharedResourceId" column="shared_resource_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
@@ -38,7 +38,7 @@
<!-- Parameter Maps --> <!-- Parameter Maps -->
<!-- --> <!-- -->
<parameterMap id="parameter.ExclusiveLockUpdateMap" class="map"> <parameterMap id="parameter_ExclusiveLockUpdateMap" class="map">
<parameter property="newLockToken" jdbcType="VARCHAR" javaType="java.lang.String"/> <parameter property="newLockToken" jdbcType="VARCHAR" javaType="java.lang.String"/>
<parameter property="newStartTime" jdbcType="BIGINT" javaType="java.lang.Long"/> <parameter property="newStartTime" jdbcType="BIGINT" javaType="java.lang.Long"/>
<parameter property="newExpiryTime" jdbcType="BIGINT" javaType="java.lang.Long"/> <parameter property="newExpiryTime" jdbcType="BIGINT" javaType="java.lang.Long"/>
@@ -50,12 +50,12 @@
<!-- SQL Snippets --> <!-- SQL Snippets -->
<!-- --> <!-- -->
<sql id="insert.LockResource.AutoIncrement"> <sql id="insert_LockResource_AutoIncrement">
insert into alf_lock_resource (version, qname_ns_id, qname_localname) insert into alf_lock_resource (version, qname_ns_id, qname_localname)
values (#version#, #qnameNamespaceId#, lower(#qnameLocalName#)) values (#version#, #qnameNamespaceId#, lower(#qnameLocalName#))
</sql> </sql>
<sql id="insert.Lock.AutoIncrement"> <sql id="insert_Lock_AutoIncrement">
insert into alf_lock (version, shared_resource_id, excl_resource_id, lock_token, start_time, expiry_time) insert into alf_lock (version, shared_resource_id, excl_resource_id, lock_token, start_time, expiry_time)
values (#version#, #sharedResourceId#, #exclusiveResourceId#, lower(#lockToken#), #startTime#, #expiryTime#) values (#version#, #sharedResourceId#, #exclusiveResourceId#, lower(#lockToken#), #startTime#, #expiryTime#)
</sql> </sql>
@@ -65,7 +65,7 @@
<!-- --> <!-- -->
<!-- Get the lock resource entity by qualified name --> <!-- Get the lock resource entity by qualified name -->
<select id="select.LockResourceByQName" parameterClass="LockResource" resultMap="result.LockResource"> <select id="select_LockResourceByQName" parameterClass="LockResource" resultMap="result_LockResource">
select select
* *
from from
@@ -76,7 +76,7 @@
</select> </select>
<!-- Get a lock based on the ID --> <!-- Get a lock based on the ID -->
<select id="select.LockByID" parameterClass="Lock" resultMap="result.Lock"> <select id="select_LockByID" parameterClass="Lock" resultMap="result_Lock">
select select
* *
from from
@@ -86,7 +86,7 @@
</select> </select>
<!-- Get a lock based on the unique key (shared and exclusive lock IDs) --> <!-- Get a lock based on the unique key (shared and exclusive lock IDs) -->
<select id="select.LockByKey" parameterClass="Lock" resultMap="result.Lock"> <select id="select_LockByKey" parameterClass="Lock" resultMap="result_Lock">
select select
* *
from from
@@ -97,7 +97,7 @@
</select> </select>
<!-- Get all locks for a given list of resource IDs --> <!-- Get all locks for a given list of resource IDs -->
<select id="select.LockBySharedIds" resultMap="result.Lock"> <select id="select_LockBySharedIds" resultMap="result_Lock">
select select
* *
from from
@@ -112,7 +112,7 @@
</select> </select>
<!-- Optimistic update of the lock --> <!-- Optimistic update of the lock -->
<update id="update.Lock" parameterClass="Lock"> <update id="update_Lock" parameterClass="Lock">
update update
alf_lock alf_lock
set set
@@ -126,7 +126,7 @@
</update> </update>
<!-- Update locks for a given exclusive lock --> <!-- Update locks for a given exclusive lock -->
<update id="update.ExclusiveLock" parameterMap="parameter.ExclusiveLockUpdateMap"> <update id="update_ExclusiveLock" parameterMap="parameter_ExclusiveLockUpdateMap">
update update
alf_lock alf_lock
set set

59
config/alfresco/ibatis/org.hibernate.dialect.Dialect/propval-common-SqlMap.xml
View File

@@ -24,13 +24,13 @@
<!-- Result Maps --> <!-- Result Maps -->
<!-- --> <!-- -->
<resultMap id="result.PropertyClass" class="PropertyClass"> <resultMap id="result_PropertyClass" class="PropertyClass">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="javaClassName" column="java_class_name" jdbcType="VARCHAR" javaType="java.lang.String"/> <result property="javaClassName" column="java_class_name" jdbcType="VARCHAR" javaType="java.lang.String"/>
<result property="javaClassNameShort" column="java_class_name_short" jdbcType="VARCHAR" javaType="java.lang.String"/> <result property="javaClassNameShort" column="java_class_name_short" jdbcType="VARCHAR" javaType="java.lang.String"/>
<result property="javaClassNameCrc" column="java_class_name_crc" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="javaClassNameCrc" column="java_class_name_crc" jdbcType="BIGINT" javaType="java.lang.Long"/>
</resultMap> </resultMap>
<resultMap id="result.PropertyDateValue" class="PropertyDateValue"> <resultMap id="result_PropertyDateValue" class="PropertyDateValue">
<!-- date_value is the PK as well --> <!-- date_value is the PK as well -->
<result property="dateValue" column="date_value" jdbcType="BIGINT" javaType="long"/> <result property="dateValue" column="date_value" jdbcType="BIGINT" javaType="long"/>
<result property="fullYear" column="full_year" jdbcType="SMALLINT" javaType="short"/> <result property="fullYear" column="full_year" jdbcType="SMALLINT" javaType="short"/>
@@ -43,21 +43,21 @@
<result property="dayOfMonth" column="day_of_month" jdbcType="TINYINT" javaType="short"/> <result property="dayOfMonth" column="day_of_month" jdbcType="TINYINT" javaType="short"/>
<result property="dayOfWeek" column="day_of_week" jdbcType="TINYINT" javaType="short"/> <result property="dayOfWeek" column="day_of_week" jdbcType="TINYINT" javaType="short"/>
</resultMap> </resultMap>
<resultMap id="result.PropertyStringValue" class="PropertyStringValue"> <resultMap id="result_PropertyStringValue" class="PropertyStringValue">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="stringValue" column="string_value" jdbcType="VARCHAR" javaType="java.lang.String"/> <result property="stringValue" column="string_value" jdbcType="VARCHAR" javaType="java.lang.String"/>
<result property="stringEndLower" column="string_end_lower" jdbcType="VARCHAR" javaType="java.lang.String"/> <result property="stringEndLower" column="string_end_lower" jdbcType="VARCHAR" javaType="java.lang.String"/>
<result property="stringCrc" column="string_crc" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="stringCrc" column="string_crc" jdbcType="BIGINT" javaType="java.lang.Long"/>
</resultMap> </resultMap>
<resultMap id="result.PropertyDoubleValue" class="PropertyDoubleValue"> <resultMap id="result_PropertyDoubleValue" class="PropertyDoubleValue">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="doubleValue" column="double_value" jdbcType="DOUBLE" javaType="java.lang.Double"/> <result property="doubleValue" column="double_value" jdbcType="DOUBLE" javaType="java.lang.Double"/>
</resultMap> </resultMap>
<resultMap id="result.PropertySerializableValue" class="PropertySerializableValue"> <resultMap id="result_PropertySerializableValue" class="PropertySerializableValue">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="serializableValue" column="serializable_value" jdbcType="BLOB" javaType="java.io.Serializable"/> <result property="serializableValue" column="serializable_value" jdbcType="BLOB" javaType="java.io.Serializable"/>
</resultMap> </resultMap>
<resultMap id="result.PropertyValue" class="PropertyValue"> <resultMap id="result_PropertyValue" class="PropertyValue">
<result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="id" column="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="actualTypeId" column="actual_type_id" jdbcType="BIGINT" javaType="java.lang.Long"/> <result property="actualTypeId" column="actual_type_id" jdbcType="BIGINT" javaType="java.lang.Long"/>
<result property="persistedType" column="persisted_type" jdbcType="TINYINT" javaType="java.lang.Short"/> <result property="persistedType" column="persisted_type" jdbcType="TINYINT" javaType="java.lang.Short"/>
@@ -66,13 +66,13 @@
<result property="stringValue" column="string_value" jdbcType="VARCHAR" javaType="java.lang.String"/> <result property="stringValue" column="string_value" jdbcType="VARCHAR" javaType="java.lang.String"/>
<result property="serializableValue" column="serializable_value" jdbcType="BLOB" javaType="java.io.Serializable"/> <result property="serializableValue" column="serializable_value" jdbcType="BLOB" javaType="java.io.Serializable"/>
</resultMap> </resultMap>
<resultMap id="result.PropertyLink" class="PropertyLink"> <resultMap id="result_PropertyLink" class="PropertyLink">
<result property="rootPropId" column="root_prop_id" jdbcType="BIGINT" javaType="long"/> <result property="rootPropId" column="root_prop_id" jdbcType="BIGINT" javaType="long"/>
<result property="currentPropId" column="current_prop_id" jdbcType="BIGINT" javaType="long"/> <result property="currentPropId" column="current_prop_id" jdbcType="BIGINT" javaType="long"/>
<result property="valuePropId" column="value_prop_id" jdbcType="BIGINT" javaType="long"/> <result property="valuePropId" column="value_prop_id" jdbcType="BIGINT" javaType="long"/>
<result property="keyPropId" column="key_prop_id" jdbcType="BIGINT" javaType="long"/> <result property="keyPropId" column="key_prop_id" jdbcType="BIGINT" javaType="long"/>
</resultMap> </resultMap>
<resultMap id="result.PropertyIdSearchRow" class="PropertyIdSearchRow"> <resultMap id="result_PropertyIdSearchRow" class="PropertyIdSearchRow">
<result property="rootPropId" column="root_prop_id" jdbcType="BIGINT" javaType="long"/> <result property="rootPropId" column="root_prop_id" jdbcType="BIGINT" javaType="long"/>
<result property="currentPropId" column="current_prop_id" jdbcType="BIGINT" javaType="long"/> <result property="currentPropId" column="current_prop_id" jdbcType="BIGINT" javaType="long"/>
<result property="valuePropId" column="value_prop_id" jdbcType="BIGINT" javaType="long"/> <result property="valuePropId" column="value_prop_id" jdbcType="BIGINT" javaType="long"/>
@@ -89,7 +89,7 @@
<!-- Parameter Maps --> <!-- Parameter Maps -->
<!-- --> <!-- -->
<parameterMap id="parameter.PropertySerializableValue" class="PropertySerializableValue"> <parameterMap id="parameter_PropertySerializableValue" class="PropertySerializableValue">
<parameter property="serializableValue" jdbcType="BLOB" javaType="java.io.Serializable"/> <parameter property="serializableValue" jdbcType="BLOB" javaType="java.io.Serializable"/>
</parameterMap> </parameterMap>
@@ -97,27 +97,27 @@
<!-- SQL Snippets --> <!-- SQL Snippets -->
<!-- --> <!-- -->
<sql id="insert.PropertyClass.AutoIncrement"> <sql id="insert_PropertyClass_AutoIncrement">
insert into alf_prop_class (java_class_name, java_class_name_short, java_class_name_crc) insert into alf_prop_class (java_class_name, java_class_name_short, java_class_name_crc)
values (#javaClassName#, #javaClassNameShort#, #javaClassNameCrc#) values (#javaClassName#, #javaClassNameShort#, #javaClassNameCrc#)
</sql> </sql>
<sql id="insert.PropertyStringValue.AutoIncrement"> <sql id="insert_PropertyStringValue_AutoIncrement">
insert into alf_prop_string_value (string_value, string_end_lower, string_crc) insert into alf_prop_string_value (string_value, string_end_lower, string_crc)
values (#stringValue#, #stringEndLower#, #stringCrc#) values (#stringValue#, #stringEndLower#, #stringCrc#)
</sql> </sql>
<sql id="insert.PropertyDoubleValue.AutoIncrement"> <sql id="insert_PropertyDoubleValue_AutoIncrement">
insert into alf_prop_double_value (double_value) insert into alf_prop_double_value (double_value)
values (#doubleValue#) values (#doubleValue#)
</sql> </sql>
<sql id="insert.PropertySerializableValue.AutoIncrement"> <sql id="insert_PropertySerializableValue_AutoIncrement">
insert into alf_prop_serializable_value (serializable_value) insert into alf_prop_serializable_value (serializable_value)
values (?) values (?)
</sql> </sql>
<sql id="insert.PropertyValue.AutoIncrement"> <sql id="insert_PropertyValue_AutoIncrement">
insert into alf_prop_value (actual_type_id, persisted_type, long_value) insert into alf_prop_value (actual_type_id, persisted_type, long_value)
values (#actualTypeId#, #persistedType#, #longValue#) values (#actualTypeId#, #persistedType#, #longValue#)
</sql> </sql>
@@ -127,7 +127,7 @@
<!-- --> <!-- -->
<!-- Get a property class by ID --> <!-- Get a property class by ID -->
<select id="select.PropertyClassByID" parameterClass="PropertyClass" resultMap="result.PropertyClass"> <select id="select_PropertyClassByID" parameterClass="PropertyClass" resultMap="result_PropertyClass">
select select
* *
from from
@@ -137,7 +137,7 @@
</select> </select>
<!-- Get the property class by class name --> <!-- Get the property class by class name -->
<select id="select.PropertyClassByName" parameterClass="PropertyClass" resultMap="result.PropertyClass"> <select id="select_PropertyClassByName" parameterClass="PropertyClass" resultMap="result_PropertyClass">
select select
* *
from from
@@ -147,7 +147,7 @@
java_class_name_short = #javaClassNameShort# java_class_name_short = #javaClassNameShort#
</select> </select>
<insert id="insert.PropertyDateValue" parameterClass="PropertyDateValue" > <insert id="insert_PropertyDateValue" parameterClass="PropertyDateValue" >
insert into alf_prop_date_value insert into alf_prop_date_value
( (
date_value, date_value,
@@ -167,7 +167,7 @@
</insert> </insert>
<!-- Get a property date value by ID --> <!-- Get a property date value by ID -->
<select id="select.PropertyDateValueByID" parameterClass="java.lang.Long" resultMap="result.PropertyDateValue"> <select id="select_PropertyDateValueByID" parameterClass="java.lang.Long" resultMap="result_PropertyDateValue">
select select
* *
from from
@@ -177,7 +177,7 @@
</select> </select>
<!-- Get the property date value by value --> <!-- Get the property date value by value -->
<select id="select.PropertyDateValueByValue" parameterClass="java.lang.Long" resultMap="result.PropertyDateValue"> <select id="select_PropertyDateValueByValue" parameterClass="java.lang.Long" resultMap="result_PropertyDateValue">
select select
* *
from from
@@ -187,7 +187,7 @@
</select> </select>
<!-- Get a property string value by ID --> <!-- Get a property string value by ID -->
<select id="select.PropertyStringValueByID" parameterClass="PropertyStringValue" resultClass="string"> <select id="select_PropertyStringValueByID" parameterClass="PropertyStringValue" resultClass="string">
select select
string_value string_value
from from
@@ -198,7 +198,7 @@
<!-- Get the property string value by value <!-- Get the property string value by value
--> -->
<select id="select.PropertyStringValueByValue" parameterClass="PropertyStringValue" resultClass="java.lang.Long"> <select id="select_PropertyStringValueByValue" parameterClass="PropertyStringValue" resultClass="java.lang.Long">
select select
id id
from from
@@ -209,7 +209,7 @@
</select> </select>
<!-- Get a property double value by ID --> <!-- Get a property double value by ID -->
<select id="select.PropertyDoubleValueByID" parameterClass="PropertyDoubleValue" resultMap="result.PropertyDoubleValue"> <select id="select_PropertyDoubleValueByID" parameterClass="PropertyDoubleValue" resultMap="result_PropertyDoubleValue">
select select
* *
from from
@@ -219,7 +219,7 @@
</select> </select>
<!-- Get the property double value by value --> <!-- Get the property double value by value -->
<select id="select.PropertyDoubleValueByValue" parameterClass="PropertyDoubleValue" resultMap="result.PropertyDoubleValue"> <select id="select_PropertyDoubleValueByValue" parameterClass="PropertyDoubleValue" resultMap="result_PropertyDoubleValue">
select select
* *
from from
@@ -229,7 +229,7 @@
</select> </select>
<!-- Get a property serializable value by ID --> <!-- Get a property serializable value by ID -->
<select id="select.PropertySerializableValueByID" parameterClass="PropertySerializableValue" resultMap="result.PropertySerializableValue"> <select id="select_PropertySerializableValueByID" parameterClass="PropertySerializableValue" resultMap="result_PropertySerializableValue">
select select
* *
from from
@@ -239,7 +239,7 @@
</select> </select>
<!-- Get the property value by value in alf_prop_value --> <!-- Get the property value by value in alf_prop_value -->
<select id="select.PropertyValueByLocalValue" parameterClass="PropertyValue" resultMap="result.PropertyValue"> <select id="select_PropertyValueByLocalValue" parameterClass="PropertyValue" resultMap="result_PropertyValue">
select select
pv.id as id, pv.id as id,
pv.actual_type_id as actual_type_id, pv.actual_type_id as actual_type_id,
@@ -256,7 +256,7 @@
</select> </select>
<!-- Get the property value by value in alf_prop_double_value --> <!-- Get the property value by value in alf_prop_double_value -->
<select id="select.PropertyValueByDoubleValue" parameterClass="PropertyValue" resultMap="result.PropertyValue"> <select id="select_PropertyValueByDoubleValue" parameterClass="PropertyValue" resultMap="result_PropertyValue">
select select
pv.id as id, pv.id as id,
pv.actual_type_id as actual_type_id, pv.actual_type_id as actual_type_id,
@@ -274,7 +274,7 @@
</select> </select>
<!-- Get the property value by value in alf_prop_string_value --> <!-- Get the property value by value in alf_prop_string_value -->
<select id="select.PropertyValueByStringValue" parameterClass="PropertyStringQuery" resultMap="result.PropertyValue"> <select id="select_PropertyValueByStringValue" parameterClass="PropertyStringQuery" resultMap="result_PropertyValue">
select select
pv.id as id, pv.id as id,
pv.actual_type_id as actual_type_id, pv.actual_type_id as actual_type_id,
@@ -293,7 +293,7 @@
</select> </select>
<!-- Get the property value by ID --> <!-- Get the property value by ID -->
<select id="select.PropertyValueById" parameterClass="PropertyValue" resultMap="result.PropertyIdSearchRow"> <select id="select_PropertyValueById" parameterClass="PropertyValue" resultMap="result_PropertyIdSearchRow">
select select
cl.root_prop_id, cl.current_prop_id, cl.value_prop_id, cl.key_prop_id, cl.root_prop_id, cl.current_prop_id, cl.value_prop_id, cl.key_prop_id,
v.actual_type_id, v.persisted_type, v.actual_type_id, v.persisted_type,
@@ -305,10 +305,9 @@
left join alf_prop_string_value sv on (sv.id = v.long_value and (v.persisted_type = 3 || v.persisted_type = 5)) left join alf_prop_string_value sv on (sv.id = v.long_value and (v.persisted_type = 3 || v.persisted_type = 5))
left join alf_prop_serializable_value serv on (serv.id = v.long_value and v.persisted_type = 4) left join alf_prop_serializable_value serv on (serv.id = v.long_value and v.persisted_type = 4)
where cl.root_prop_id = #id# where cl.root_prop_id = #id#
order by current_prop_id, value_prop_id, key_prop_id
</select> </select>
<insert id="insert.PropertyLink" parameterClass="PropertyLink" > <insert id="insert_PropertyLink" parameterClass="PropertyLink" >
insert into alf_prop_link insert into alf_prop_link
( (
root_prop_id, current_prop_id, value_prop_id, key_prop_id root_prop_id, current_prop_id, value_prop_id, key_prop_id

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

@@ -6,7 +6,7 @@
<sqlMap namespace="alfresco.activities"> <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) insert into alf_activity_feed_control (feed_user_id, site_network, app_tool, last_modified)
values (#feedUserId#, #siteNetwork#, #appTool#, #lastModified#) values (#feedUserId#, #siteNetwork#, #appTool#, #lastModified#)
@@ -17,7 +17,7 @@
</insert> </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) 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#) values (#activityType#, #activitySummary#, #activitySummaryFormat#, #feedUserId#, #postUserId#, #postDate#, #postId#, #siteNetwork#, #appTool#, #feedDate#)
@@ -28,7 +28,7 @@
</insert> </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) 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#) 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"> <sqlMap namespace="alfresco.audit">
<insert id="insert.AuditModel" parameterClass="AuditModel" > <insert id="insert_AuditModel" parameterClass="AuditModel" >
<include refid="insert.AuditModel.AutoIncrement"/> <include refid="insert_AuditModel_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post"> <selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY KEY_COLUMN:GENERATED_KEY
</selectKey> </selectKey>
</insert> </insert>
<insert id="insert.AuditApplication" parameterClass="AuditApplication" > <insert id="insert_AuditApplication" parameterClass="AuditApplication" >
<include refid="insert.AuditApplication.AutoIncrement"/> <include refid="insert_AuditApplication_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post"> <selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY KEY_COLUMN:GENERATED_KEY
</selectKey> </selectKey>
</insert> </insert>
<insert id="insert.AuditEntry" parameterClass="AuditEntry" > <insert id="insert_AuditEntry" parameterClass="AuditEntry" >
<include refid="insert.AuditEntry.AutoIncrement"/> <include refid="insert_AuditEntry_AutoIncrement"/>
<selectKey resultClass="long" keyProperty="id" type="post"> <selectKey resultClass="long" keyProperty="id" type="post">
KEY_COLUMN:GENERATED_KEY KEY_COLUMN:GENERATED_KEY
</selectKey> </selectKey>

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

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

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

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

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

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

14
config/alfresco/ibatis/propval-SqlMapConfig.xml
View File

@@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE sqlMapConfig
PUBLIC "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN"
"http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
<sqlMapConfig>
<typeHandler javaType="java.io.Serializable" jdbcType="BLOB" callback="org.alfresco.ibatis.SerializableTypeHandlerCallback"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/propval-common-SqlMap.xml"/>
<sqlMap resource="alfresco/ibatis/#resource.dialect#/propval-insert-SqlMap.xml"/>
</sqlMapConfig>

24
source/java/org/alfresco/repo/domain/activities/ibatis/ActivityFeedDAOImpl.java
View File

@@ -37,13 +37,13 @@ public class ActivityFeedDAOImpl extends IBatisSqlMapper implements ActivityFeed
{ {
public long insertFeedEntry(ActivityFeedEntity activityFeed) throws SQLException public long insertFeedEntry(ActivityFeedEntity activityFeed) throws SQLException
{ {
Long id = (Long)getSqlMapClient().insert("insert.activity.feed", activityFeed); Long id = (Long)getSqlMapClient().insert("alfresco.activities.insert_activity_feed", activityFeed);
return (id != null ? id : -1); return (id != null ? id : -1);
} }
public int deleteFeedEntries(Date keepDate) throws SQLException public int deleteFeedEntries(Date keepDate) throws SQLException
{ {
return getSqlMapClient().delete("delete.activity.feed.entries.older.than.date", keepDate); return getSqlMapClient().delete("alfresco.activities.delete_activity_feed_entries_older_than_date", keepDate);
} }
public int deleteSiteFeedEntries(String siteId, String format, Date keepDate) throws SQLException public int deleteSiteFeedEntries(String siteId, String format, Date keepDate) throws SQLException
@@ -53,7 +53,7 @@ public class ActivityFeedDAOImpl extends IBatisSqlMapper implements ActivityFeed
params.setActivitySummaryFormat(format); params.setActivitySummaryFormat(format);
params.setPostDate(keepDate); params.setPostDate(keepDate);
return getSqlMapClient().delete("delete.activity.feed.for.site.entries.older.than.date", params); return getSqlMapClient().delete("alfresco.activities.delete_activity_feed_for_site_entries_older_than_date", params);
} }
public int deleteUserFeedEntries(String feedUserId, String format, Date keepDate) throws SQLException public int deleteUserFeedEntries(String feedUserId, String format, Date keepDate) throws SQLException
@@ -63,13 +63,13 @@ public class ActivityFeedDAOImpl extends IBatisSqlMapper implements ActivityFeed
params.setActivitySummaryFormat(format); params.setActivitySummaryFormat(format);
params.setPostDate(keepDate); params.setPostDate(keepDate);
return getSqlMapClient().delete("delete.activity.feed.for.feeduser.entries.older.than.date", params); return getSqlMapClient().delete("alfresco.activities.delete_activity_feed_for_feeduser_entries_older_than_date", params);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public List<ActivityFeedEntity> selectFeedsToClean(int maxFeedSize) throws SQLException public List<ActivityFeedEntity> selectFeedsToClean(int maxFeedSize) throws SQLException
{ {
return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("select.activity.feed.greater.than.max", maxFeedSize); return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_greater_than_max", maxFeedSize);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@@ -92,17 +92,17 @@ public class ActivityFeedDAOImpl extends IBatisSqlMapper implements ActivityFeed
if ((!excludeThisUser) && (!excludeOtherUsers)) if ((!excludeThisUser) && (!excludeOtherUsers))
{ {
// no excludes => everyone => where feed user is me // no excludes => everyone => where feed user is me
return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("select.activity.feed.for.feeduser.and.site", params); return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_feeduser_and_site", params);
} }
else if ((excludeThisUser) && (!excludeOtherUsers)) else if ((excludeThisUser) && (!excludeOtherUsers))
{ {
// exclude feed user => others => where feed user is me and post user is not me // exclude feed user => others => where feed user is me and post user is not me
return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("select.activity.feed.for.feeduser.others.and.site", params); return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_feeduser_others_and_site", params);
} }
else if ((excludeOtherUsers) && (!excludeThisUser)) else if ((excludeOtherUsers) && (!excludeThisUser))
{ {
// exclude others => me => where feed user is me and post user is me // exclude others => me => where feed user is me and post user is me
return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("select.activity.feed.for.feeduser.me.and.site", params); return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_feeduser_me_and_site", params);
} }
} }
else else
@@ -117,17 +117,17 @@ public class ActivityFeedDAOImpl extends IBatisSqlMapper implements ActivityFeed
if (!excludeThisUser && !excludeOtherUsers) if (!excludeThisUser && !excludeOtherUsers)
{ {
// no excludes => everyone => where feed user is me // no excludes => everyone => where feed user is me
return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("select.activity.feed.for.feeduser", params); return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_feeduser", params);
} }
else if (excludeThisUser) else if (excludeThisUser)
{ {
// exclude feed user => others => where feed user is me and post user is not me // exclude feed user => others => where feed user is me and post user is not me
return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("select.activity.feed.for.feeduser.others", params); return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_feeduser_others", params);
} }
else if (excludeOtherUsers) else if (excludeOtherUsers)
{ {
// exclude others => me => where feed user is me and post user is me // exclude others => me => where feed user is me and post user is me
return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("select.activity.feed.for.feeduser.me", params); return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_feeduser_me", params);
} }
} }
@@ -143,6 +143,6 @@ public class ActivityFeedDAOImpl extends IBatisSqlMapper implements ActivityFeed
params.setActivitySummaryFormat(format); params.setActivitySummaryFormat(format);
// for given site // for given site
return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("select.activity.feed.for.site", params); return (List<ActivityFeedEntity>)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_site", params);
} }
} }

18
source/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java
View File

@@ -42,11 +42,11 @@ public class ActivityPostDAOImpl extends IBatisSqlMapper implements ActivityPost
(activityPost.getMaxId() != -1) && (activityPost.getMaxId() != -1) &&
(activityPost.getStatus() != null)) (activityPost.getStatus() != null))
{ {
return (List<ActivityPostEntity>)getSqlMapClient().queryForList("select.activity.posts", activityPost); return (List<ActivityPostEntity>)getSqlMapClient().queryForList("alfresco.activities.select_activity_posts", activityPost);
} }
else if (activityPost.getStatus() != null) else if (activityPost.getStatus() != null)
{ {
return (List<ActivityPostEntity>)getSqlMapClient().queryForList("select.activity.posts.by.status.only", activityPost); return (List<ActivityPostEntity>)getSqlMapClient().queryForList("alfresco.activities.select_activity_posts_by_status_only", activityPost);
} }
else else
{ {
@@ -56,17 +56,17 @@ public class ActivityPostDAOImpl extends IBatisSqlMapper implements ActivityPost
public Long getMaxActivitySeq() throws SQLException public Long getMaxActivitySeq() throws SQLException
{ {
return (Long)getSqlMapClient().queryForObject("select.activity.post.max.seq"); return (Long)getSqlMapClient().queryForObject("alfresco.activities.select_activity_post_max_seq");
} }
public Long getMinActivitySeq() throws SQLException public Long getMinActivitySeq() throws SQLException
{ {
return (Long)getSqlMapClient().queryForObject("select.activity.post.min.seq"); return (Long)getSqlMapClient().queryForObject("alfresco.activities.select_activity_post_min_seq");
} }
public Integer getMaxNodeHash() throws SQLException public Integer getMaxNodeHash() throws SQLException
{ {
return (Integer)getSqlMapClient().queryForObject("select.activity.post.max.jobtasknode"); return (Integer)getSqlMapClient().queryForObject("alfresco.activities.select_activity_post_max_jobtasknode");
} }
public int updatePost(long id, String siteNetwork, String activityData, ActivityPostEntity.STATUS status) throws SQLException public int updatePost(long id, String siteNetwork, String activityData, ActivityPostEntity.STATUS status) throws SQLException
@@ -78,7 +78,7 @@ public class ActivityPostDAOImpl extends IBatisSqlMapper implements ActivityPost
post.setStatus(status.toString()); post.setStatus(status.toString());
post.setLastModified(new Date()); post.setLastModified(new Date());
return getSqlMapClient().update("update.activity.post.data", post); return getSqlMapClient().update("alfresco.activities.update_activity_post_data", post);
} }
public int updatePostStatus(long id, ActivityPostEntity.STATUS status) throws SQLException public int updatePostStatus(long id, ActivityPostEntity.STATUS status) throws SQLException
@@ -88,7 +88,7 @@ public class ActivityPostDAOImpl extends IBatisSqlMapper implements ActivityPost
post.setStatus(status.toString()); post.setStatus(status.toString());
post.setLastModified(new Date()); post.setLastModified(new Date());
return getSqlMapClient().update("update.activity.post.status", post); return getSqlMapClient().update("alfresco.activities.update_activity_post_status", post);
} }
public int deletePosts(Date keepDate, ActivityPostEntity.STATUS status) throws SQLException public int deletePosts(Date keepDate, ActivityPostEntity.STATUS status) throws SQLException
@@ -97,12 +97,12 @@ public class ActivityPostDAOImpl extends IBatisSqlMapper implements ActivityPost
params.setPostDate(keepDate); params.setPostDate(keepDate);
params.setStatus(status.toString()); params.setStatus(status.toString());
return getSqlMapClient().delete("delete.activity.posts.older.than.date", params); return getSqlMapClient().delete("alfresco.activities.delete_activity_posts_older_than_date", params);
} }
public long insertPost(ActivityPostEntity activityPost) throws SQLException public long insertPost(ActivityPostEntity activityPost) throws SQLException
{ {
Long id = (Long)getSqlMapClient().insert("insert.activity.post", activityPost); Long id = (Long)getSqlMapClient().insert("alfresco.activities.insert_activity_post", activityPost);
return (id != null ? id : -1); return (id != null ? id : -1);
} }
} }

8
source/java/org/alfresco/repo/domain/activities/ibatis/FeedControlDAOImpl.java
View File

@@ -34,13 +34,13 @@ public class FeedControlDAOImpl extends IBatisSqlMapper implements FeedControlDA
{ {
public long insertFeedControl(FeedControlEntity activityFeedControl) throws SQLException public long insertFeedControl(FeedControlEntity activityFeedControl) throws SQLException
{ {
Long id = (Long)getSqlMapClient().insert("insert.activity.feedcontrol", activityFeedControl); Long id = (Long)getSqlMapClient().insert("alfresco.activities.insert_activity_feedcontrol", activityFeedControl);
return (id != null ? id : -1); return (id != null ? id : -1);
} }
public int deleteFeedControl(FeedControlEntity activityFeedControl) throws SQLException public int deleteFeedControl(FeedControlEntity activityFeedControl) throws SQLException
{ {
return getSqlMapClient().delete("delete.activity.feedcontrol", activityFeedControl); return getSqlMapClient().delete("alfresco.activities.delete_activity_feedcontrol", activityFeedControl);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@@ -48,12 +48,12 @@ public class FeedControlDAOImpl extends IBatisSqlMapper implements FeedControlDA
{ {
FeedControlEntity params = new FeedControlEntity(feedUserId); FeedControlEntity params = new FeedControlEntity(feedUserId);
return (List<FeedControlEntity>)getSqlMapClient().queryForList("select.activity.feedcontrols.for.user", params); return (List<FeedControlEntity>)getSqlMapClient().queryForList("alfresco.activities.select_activity_feedcontrols_for_user", params);
} }
public long selectFeedControl(FeedControlEntity activityFeedControl) throws SQLException public long selectFeedControl(FeedControlEntity activityFeedControl) throws SQLException
{ {
Long id = (Long)getSqlMapClient().queryForObject("select.activity.feedcontrol", activityFeedControl); Long id = (Long)getSqlMapClient().queryForObject("alfresco.activities.select_activity_feedcontrol", activityFeedControl);
return (id != null ? id : -1); return (id != null ? id : -1);
} }
} }

15
source/java/org/alfresco/repo/domain/audit/AuditQueryResult.java
View File

@@ -25,6 +25,9 @@
package org.alfresco.repo.domain.audit; package org.alfresco.repo.domain.audit;
import java.util.Date; import java.util.Date;
import java.util.List;
import org.alfresco.repo.domain.propval.PropertyIdSearchRow;
/** /**
* Results bean for <b>alf_audit_entry</b> table. * Results bean for <b>alf_audit_entry</b> table.
@@ -39,6 +42,7 @@ public class AuditQueryResult
private String auditUser; private String auditUser;
private long auditTime; private long auditTime;
private Long auditValuesId; private Long auditValuesId;
private List<PropertyIdSearchRow> auditValues;
public AuditQueryResult() public AuditQueryResult()
{ {
@@ -54,6 +58,7 @@ public class AuditQueryResult
.append(", auditUser=").append(auditUser) .append(", auditUser=").append(auditUser)
.append(", auditTime").append(new Date(auditTime)) .append(", auditTime").append(new Date(auditTime))
.append(", auditValuesId=").append(auditValuesId) .append(", auditValuesId=").append(auditValuesId)
.append(", auditValues=").append(auditValues.size())
.append("]"); .append("]");
return sb.toString(); return sb.toString();
} }
@@ -107,4 +112,14 @@ public class AuditQueryResult
{ {
this.auditValuesId = auditValuesId; this.auditValuesId = auditValuesId;
} }
public List<PropertyIdSearchRow> getAuditValues()
{
return auditValues;
}
public void setAuditValues(List<PropertyIdSearchRow> auditValues)
{
this.auditValues = auditValues;
}
} }

32
source/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java
View File

@@ -48,15 +48,16 @@ import com.ibatis.sqlmap.client.event.RowHandler;
*/ */
public class AuditDAOImpl extends AbstractAuditDAOImpl public class AuditDAOImpl extends AbstractAuditDAOImpl
{ {
private static final String SELECT_MODEL_BY_CRC = "select.AuditModelByCrc"; private static final String SELECT_MODEL_BY_CRC = "alfresco.audit.select_AuditModelByCrc";
private static final String INSERT_MODEL = "insert.AuditModel"; private static final String INSERT_MODEL = "alfresco.audit.insert_AuditModel";
private static final String SELECT_APPLICATION_BY_MODEL_ID = "select.AuditApplicationByModelId"; private static final String SELECT_APPLICATION_BY_MODEL_ID = "alfresco.audit.select_AuditApplicationByModelId";
private static final String INSERT_APPLICATION = "insert.AuditApplication"; private static final String INSERT_APPLICATION = "alfresco.audit.insert_AuditApplication";
private static final String INSERT_ENTRY = "insert.AuditEntry"; private static final String INSERT_ENTRY = "alfresco.audit.insert_AuditEntry";
private static final String SELECT_ENTRIES_SIMPLE = "select.AuditEntriesSimple"; private static final String SELECT_ENTRIES_SIMPLE = "alfresco.audit.select_AuditEntriesSimple";
private static final String SELECT_ENTRIES_WITH_VALUES = "alfresco.audit.select_AuditEntriesWithValues";
private SqlMapClientTemplate template; private SqlMapClientTemplate template;
@@ -162,6 +163,7 @@ public class AuditDAOImpl extends AbstractAuditDAOImpl
AuditQueryParameters params = new AuditQueryParameters(); AuditQueryParameters params = new AuditQueryParameters();
if (appName != null) if (appName != null)
{ {
// Look up the application's ID (this is unique)
Pair<String, Long> appNameCrcPair = propertyValueDAO.getPropertyStringCaseSensitiveSearchParameters(appName); Pair<String, Long> appNameCrcPair = propertyValueDAO.getPropertyStringCaseSensitiveSearchParameters(appName);
params.setAuditAppNameCrcPair(appNameCrcPair); params.setAuditAppNameCrcPair(appNameCrcPair);
} }
@@ -173,7 +175,15 @@ public class AuditDAOImpl extends AbstractAuditDAOImpl
params.setAuditFromTime(from); params.setAuditFromTime(from);
params.setAuditToTime(to); params.setAuditToTime(to);
if (maxResults <= 0) if (maxResults > 0)
{
List<AuditQueryResult> rows = template.queryForList(SELECT_ENTRIES_SIMPLE, params, 0, maxResults);
for (AuditQueryResult row : rows)
{
rowHandler.processResult(row);
}
}
else
{ {
RowHandler rowHandlerInternal = new RowHandler() RowHandler rowHandlerInternal = new RowHandler()
{ {
@@ -185,13 +195,5 @@ public class AuditDAOImpl extends AbstractAuditDAOImpl
}; };
template.queryWithRowHandler(SELECT_ENTRIES_SIMPLE, params, rowHandlerInternal); template.queryWithRowHandler(SELECT_ENTRIES_SIMPLE, params, rowHandlerInternal);
} }
else
{
List<AuditQueryResult> rows = template.queryForList(SELECT_ENTRIES_SIMPLE, params, 0, maxResults);
for (AuditQueryResult row : rows)
{
rowHandler.processResult(row);
}
}
} }
} }

8
source/java/org/alfresco/repo/domain/contentclean/ibatis/ContentCleanDAOImpl.java
View File

@@ -48,10 +48,10 @@ public class ContentCleanDAOImpl implements ContentCleanDAO
private static final int DEFAULT_BATCH_SIZE = 50; private static final int DEFAULT_BATCH_SIZE = 50;
private static final String INSERT_CONTENT_CLEAN = "insert.ContentCleanUrl"; private static final String INSERT_CONTENT_CLEAN = "alfresco.content.insert_ContentCleanUrl";
private static final String SELECT_CONTENT_CLEAN_URLS = "select.ContentCleanUrls"; private static final String SELECT_CONTENT_CLEAN_URLS = "alfresco.content.select_ContentCleanUrls";
private static final String DELETE_CONTENT_CLEAN_BY_URL = "delete.ContentCleanUrl"; private static final String DELETE_CONTENT_CLEAN_BY_URL = "alfresco.content.delete_ContentCleanUrl";
private static final String DELETE_CONTENT_CLEAN = "delete.ContentCleanUrls"; private static final String DELETE_CONTENT_CLEAN = "alfresco.content.delete_ContentCleanUrls";
private SqlMapClientTemplate template; private SqlMapClientTemplate template;

20
source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java
View File

@@ -44,16 +44,16 @@ import com.ibatis.sqlmap.client.event.RowHandler;
*/ */
public class ContentDataDAOImpl extends AbstractContentDataDAOImpl public class ContentDataDAOImpl extends AbstractContentDataDAOImpl
{ {
private static final String SELECT_CONTENT_URL_BY_ID = "select.ContentUrlById"; private static final String SELECT_CONTENT_URL_BY_ID = "alfresco.content.select_ContentUrlById";
private static final String SELECT_CONTENT_URL_BY_KEY = "select.ContentUrlByKey"; private static final String SELECT_CONTENT_URL_BY_KEY = "alfresco.content.select_ContentUrlByKey";
private static final String SELECT_CONTENT_URL_BY_KEY_UNREFERENCED = "select.ContentUrlByKeyUnreferenced"; private static final String SELECT_CONTENT_URL_BY_KEY_UNREFERENCED = "alfresco.content.select_ContentUrlByKeyUnreferenced";
private static final String SELECT_CONTENT_URLS = "select.ContentUrls"; private static final String SELECT_CONTENT_URLS = "alfresco.content.select_ContentUrls";
private static final String SELECT_CONTENT_DATA_BY_ID = "select.ContentDataById"; private static final String SELECT_CONTENT_DATA_BY_ID = "alfresco.content.select_ContentDataById";
private static final String SELECT_CONTENT_DATA_BY_NODE_AND_QNAME = "select.ContentDataByNodeAndQName"; private static final String SELECT_CONTENT_DATA_BY_NODE_AND_QNAME = "alfresco.content.select_ContentDataByNodeAndQName";
private static final String INSERT_CONTENT_URL = "insert.ContentUrl"; private static final String INSERT_CONTENT_URL = "alfresco.content.insert_ContentUrl";
private static final String INSERT_CONTENT_DATA = "insert.ContentData"; private static final String INSERT_CONTENT_DATA = "alfresco.content.insert_ContentData";
private static final String DELETE_CONTENT_DATA = "delete.ContentData"; private static final String DELETE_CONTENT_DATA = "alfresco.content.delete_ContentData";
private static final String DELETE_CONTENT_URL = "delete.ContentUrl"; private static final String DELETE_CONTENT_URL = "alfresco.content.delete_ContentUrl";
private SqlMapClientTemplate template; private SqlMapClientTemplate template;

6
source/java/org/alfresco/repo/domain/encoding/ibatis/EncodingDAOImpl.java
View File

@@ -37,9 +37,9 @@ import org.springframework.orm.ibatis.SqlMapClientTemplate;
*/ */
public class EncodingDAOImpl extends AbstractEncodingDAOImpl public class EncodingDAOImpl extends AbstractEncodingDAOImpl
{ {
private static final String SELECT_ENCODING_BY_ID = "select.EncodingById"; private static final String SELECT_ENCODING_BY_ID = "alfresco.content.select_EncodingById";
private static final String SELECT_ENCODING_BY_KEY = "select.EncodingByKey"; private static final String SELECT_ENCODING_BY_KEY = "alfresco.content.select_EncodingByKey";
private static final String INSERT_ENCODING = "insert.Encoding"; private static final String INSERT_ENCODING = "alfresco.content.insert_Encoding";
private SqlMapClientTemplate template; private SqlMapClientTemplate template;

16
source/java/org/alfresco/repo/domain/locks/ibatis/LockDAOImpl.java
View File

@@ -41,14 +41,14 @@ import org.springframework.orm.ibatis.SqlMapClientTemplate;
*/ */
public class LockDAOImpl extends AbstractLockDAOImpl public class LockDAOImpl extends AbstractLockDAOImpl
{ {
private static final String SELECT_LOCKRESOURCE_BY_QNAME = "select.LockResourceByQName"; private static final String SELECT_LOCKRESOURCE_BY_QNAME = "alfresco.lock.select_LockResourceByQName";
private static final String SELECT_LOCK_BY_ID = "select.LockByID"; private static final String SELECT_LOCK_BY_ID = "alfresco.lock.select_LockByID";
private static final String SELECT_LOCK_BY_KEY = "select.LockByKey"; private static final String SELECT_LOCK_BY_KEY = "alfresco.lock.select_LockByKey";
private static final String SELECT_LOCK_BY_SHARED_IDS = "select.LockBySharedIds"; private static final String SELECT_LOCK_BY_SHARED_IDS = "alfresco.lock.select_LockBySharedIds";
private static final String INSERT_LOCKRESOURCE = "insert.LockResource"; private static final String INSERT_LOCKRESOURCE = "alfresco.lock.insert_LockResource";
private static final String INSERT_LOCK = "insert.Lock"; private static final String INSERT_LOCK = "alfresco.lock.insert_Lock";
private static final String UPDATE_LOCK = "update.Lock"; private static final String UPDATE_LOCK = "alfresco.lock.update_Lock";
private static final String UPDATE_EXCLUSIVE_LOCK = "update.ExclusiveLock"; private static final String UPDATE_EXCLUSIVE_LOCK = "alfresco.lock.update_ExclusiveLock";
private SqlMapClientTemplate template; private SqlMapClientTemplate template;

6
source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java
View File

@@ -36,9 +36,9 @@ import org.springframework.orm.ibatis.SqlMapClientTemplate;
*/ */
public class MimetypeDAOImpl extends AbstractMimetypeDAOImpl public class MimetypeDAOImpl extends AbstractMimetypeDAOImpl
{ {
private static final String SELECT_MIMETYPE_BY_ID = "select.MimetypeById"; private static final String SELECT_MIMETYPE_BY_ID = "alfresco.content.select_MimetypeById";
private static final String SELECT_MIMETYPE_BY_KEY = "select.MimetypeByKey"; private static final String SELECT_MIMETYPE_BY_KEY = "alfresco.content.select_MimetypeByKey";
private static final String INSERT_MIMETYPE = "insert.Mimetype"; private static final String INSERT_MIMETYPE = "alfresco.content.insert_Mimetype";
private SqlMapClientTemplate template; private SqlMapClientTemplate template;

40
source/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java
View File

@@ -50,32 +50,32 @@ import org.springframework.orm.ibatis.SqlMapClientTemplate;
*/ */
public class PropertyValueDAOImpl extends AbstractPropertyValueDAOImpl public class PropertyValueDAOImpl extends AbstractPropertyValueDAOImpl
{ {
private static final String SELECT_PROPERTY_CLASS_BY_ID = "select.PropertyClassByID"; private static final String SELECT_PROPERTY_CLASS_BY_ID = "alfresco.propval.select_PropertyClassByID";
private static final String SELECT_PROPERTY_CLASS_BY_NAME = "select.PropertyClassByName"; private static final String SELECT_PROPERTY_CLASS_BY_NAME = "alfresco.propval.select_PropertyClassByName";
private static final String INSERT_PROPERTY_CLASS = "insert.PropertyClass"; private static final String INSERT_PROPERTY_CLASS = "alfresco.propval.insert_PropertyClass";
private static final String SELECT_PROPERTY_DATE_VALUE_BY_ID = "select.PropertyDateValueByID"; private static final String SELECT_PROPERTY_DATE_VALUE_BY_ID = "alfresco.propval.select_PropertyDateValueByID";
private static final String SELECT_PROPERTY_DATE_VALUE_BY_VALUE = "select.PropertyDateValueByValue"; private static final String SELECT_PROPERTY_DATE_VALUE_BY_VALUE = "alfresco.propval.select_PropertyDateValueByValue";
private static final String INSERT_PROPERTY_DATE_VALUE = "insert.PropertyDateValue"; private static final String INSERT_PROPERTY_DATE_VALUE = "alfresco.propval.insert_PropertyDateValue";
private static final String SELECT_PROPERTY_STRING_VALUE_BY_ID = "select.PropertyStringValueByID"; private static final String SELECT_PROPERTY_STRING_VALUE_BY_ID = "alfresco.propval.select_PropertyStringValueByID";
private static final String SELECT_PROPERTY_STRING_VALUE_BY_VALUE = "select.PropertyStringValueByValue"; private static final String SELECT_PROPERTY_STRING_VALUE_BY_VALUE = "alfresco.propval.select_PropertyStringValueByValue";
private static final String INSERT_PROPERTY_STRING_VALUE = "insert.PropertyStringValue"; private static final String INSERT_PROPERTY_STRING_VALUE = "alfresco.propval.insert_PropertyStringValue";
private static final String SELECT_PROPERTY_DOUBLE_VALUE_BY_ID = "select.PropertyDoubleValueByID"; private static final String SELECT_PROPERTY_DOUBLE_VALUE_BY_ID = "alfresco.propval.select_PropertyDoubleValueByID";
private static final String SELECT_PROPERTY_DOUBLE_VALUE_BY_VALUE = "select.PropertyDoubleValueByValue"; private static final String SELECT_PROPERTY_DOUBLE_VALUE_BY_VALUE = "alfresco.propval.select_PropertyDoubleValueByValue";
private static final String INSERT_PROPERTY_DOUBLE_VALUE = "insert.PropertyDoubleValue"; private static final String INSERT_PROPERTY_DOUBLE_VALUE = "alfresco.propval.insert_PropertyDoubleValue";
private static final String SELECT_PROPERTY_SERIALIZABLE_VALUE_BY_ID = "select.PropertySerializableValueByID"; private static final String SELECT_PROPERTY_SERIALIZABLE_VALUE_BY_ID = "alfresco.propval.select_PropertySerializableValueByID";
private static final String INSERT_PROPERTY_SERIALIZABLE_VALUE = "insert.PropertySerializableValue"; private static final String INSERT_PROPERTY_SERIALIZABLE_VALUE = "alfresco.propval.insert_PropertySerializableValue";
private static final String SELECT_PROPERTY_VALUE_BY_ID = "select.PropertyValueById"; private static final String SELECT_PROPERTY_VALUE_BY_ID = "alfresco.propval.select_PropertyValueById";
private static final String SELECT_PROPERTY_VALUE_BY_LOCAL_VALUE = "select.PropertyValueByLocalValue"; private static final String SELECT_PROPERTY_VALUE_BY_LOCAL_VALUE = "alfresco.propval.select_PropertyValueByLocalValue";
private static final String SELECT_PROPERTY_VALUE_BY_DOUBLE_VALUE = "select.PropertyValueByDoubleValue"; private static final String SELECT_PROPERTY_VALUE_BY_DOUBLE_VALUE = "alfresco.propval.select_PropertyValueByDoubleValue";
private static final String SELECT_PROPERTY_VALUE_BY_STRING_VALUE = "select.PropertyValueByStringValue"; private static final String SELECT_PROPERTY_VALUE_BY_STRING_VALUE = "alfresco.propval.select_PropertyValueByStringValue";
private static final String INSERT_PROPERTY_VALUE = "insert.PropertyValue"; private static final String INSERT_PROPERTY_VALUE = "alfresco.propval.insert_PropertyValue";
private static final String INSERT_PROPERTY_LINK = "insert.PropertyLink"; private static final String INSERT_PROPERTY_LINK = "alfresco.propval.insert_PropertyLink";
private SqlMapClientTemplate template; private SqlMapClientTemplate template;