diff --git a/config/alfresco/ibatis/activities-SqlMapConfig.xml b/config/alfresco/ibatis/activities-SqlMapConfig.xml index 461681474e..f47fcc6bf2 100644 --- a/config/alfresco/ibatis/activities-SqlMapConfig.xml +++ b/config/alfresco/ibatis/activities-SqlMapConfig.xml @@ -6,6 +6,8 @@ + + diff --git a/config/alfresco/ibatis/alfresco-SqlMapConfig.xml b/config/alfresco/ibatis/alfresco-SqlMapConfig.xml new file mode 100644 index 0000000000..73e931a79b --- /dev/null +++ b/config/alfresco/ibatis/alfresco-SqlMapConfig.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/config/alfresco/ibatis/audit-SqlMapConfig.xml b/config/alfresco/ibatis/audit-SqlMapConfig.xml deleted file mode 100644 index 75420b9d2c..0000000000 --- a/config/alfresco/ibatis/audit-SqlMapConfig.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/config/alfresco/ibatis/content-SqlMapConfig.xml b/config/alfresco/ibatis/content-SqlMapConfig.xml deleted file mode 100644 index 83aafb92fe..0000000000 --- a/config/alfresco/ibatis/content-SqlMapConfig.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/config/alfresco/ibatis/ibatis-context.xml b/config/alfresco/ibatis/ibatis-context.xml index 12d34beeec..617351ad06 100644 --- a/config/alfresco/ibatis/ibatis-context.xml +++ b/config/alfresco/ibatis/ibatis-context.xml @@ -50,52 +50,25 @@ - - + + - classpath:alfresco/ibatis/locks-SqlMapConfig.xml + classpath:alfresco/ibatis/alfresco-SqlMapConfig.xml - - + + - - - - - - - classpath:alfresco/ibatis/content-SqlMapConfig.xml - + + - - - - - - - - - - classpath:alfresco/ibatis/propval-SqlMapConfig.xml - - - - - - - - - - - - classpath:alfresco/ibatis/audit-SqlMapConfig.xml - + + - + diff --git a/config/alfresco/ibatis/locks-SqlMapConfig.xml b/config/alfresco/ibatis/locks-SqlMapConfig.xml deleted file mode 100644 index d7bc3bce16..0000000000 --- a/config/alfresco/ibatis/locks-SqlMapConfig.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/activities-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/activities-insert-SqlMap.xml index ea26c0b9bf..b6872d2dd3 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/activities-insert-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/activities-insert-SqlMap.xml @@ -6,7 +6,7 @@ - + insert into alf_activity_feed_control (id, feed_user_id, site_network, app_tool, last_modified) values (DEFAULT, #feedUserId#, #siteNetwork#, #appTool#, #lastModified#) @@ -16,7 +16,7 @@ - + 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#) @@ -26,7 +26,7 @@ - + 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#) diff --git a/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/content-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/content-insert-SqlMap.xml index 3827729e62..404d6de512 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/content-insert-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/content-insert-SqlMap.xml @@ -6,29 +6,29 @@ - - + + values IDENTITY_VAL_LOCAL() - - + + values IDENTITY_VAL_LOCAL() - - + + values IDENTITY_VAL_LOCAL() - - + + values IDENTITY_VAL_LOCAL() diff --git a/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/locks-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/locks-insert-SqlMap.xml index 8725231df6..c5e827d0c5 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/locks-insert-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.DerbyDialect/locks-insert-SqlMap.xml @@ -6,15 +6,15 @@ - - + + values IDENTITY_VAL_LOCAL() - - + + values IDENTITY_VAL_LOCAL() diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml index 93627ecacc..1fee1bd1ef 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/activities-common-SqlMap.xml @@ -45,7 +45,7 @@ - - - - - - - - - + - + - + - - - + - - - select max(sequence_id) as maxId from alf_activity_post where status = 'POSTED' - select min(sequence_id) as minId from alf_activity_post where status = 'POSTED' - select max(job_task_node) as maxJobTaskNode from alf_activity_post where status = 'POSTED' - + - + update alf_activity_post set status = #status#, activity_data=#activityData#, site_network=#siteNetwork#, last_modified=#lastModified# where sequence_id = #id# and status != #status# - + update alf_activity_post set status = #status#, last_modified=#lastModified# where sequence_id = #id# and status != #status# diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/audit-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/audit-common-SqlMap.xml index b35a2db66f..4efa79f994 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/audit-common-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/audit-common-SqlMap.xml @@ -20,39 +20,45 @@ - + - + - + - + + + + - + - + @@ -65,17 +71,17 @@ - + insert into alf_audit_model (content_data_id, content_crc) values (#contentDataId#, #contentCrc#) - + insert into alf_audit_app (audit_model_id, app_name_id) values (#auditModelId#, #applicationNameId#) - + insert into alf_audit_entry (audit_app_id, audit_user_id, audit_time, audit_values_id) values (#auditApplicationId#, #auditUserId#, #auditTime#, #auditValuesId#) @@ -85,7 +91,7 @@ - select * from @@ -95,7 +101,7 @@ - select * from @@ -104,10 +110,9 @@ audit_model_id = ? - + - - select entry.id as audit_entry_id, user_sv.string_value as audit_user, @@ -137,6 +142,55 @@ + order by + entry.id + + + + + + \ No newline at end of file diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/content-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/content-common-SqlMap.xml index 32825dcdb7..0e45398cce 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/content-common-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/content-common-SqlMap.xml @@ -20,19 +20,19 @@ - + - + - + @@ -41,7 +41,7 @@ - + @@ -56,11 +56,11 @@ - + - + @@ -69,22 +69,22 @@ - + insert into alf_mimetype (version, mimetype_str) values (#version#, lower(#mimetype#)) - + insert into alf_encoding (version, encoding_str) values (#version#, lower(#encoding#)) - + insert into alf_content_url (version, content_url, content_url_short, content_url_crc, content_size) values (#version#, #contentUrl#, #contentUrlShort#, #contentUrlCrc#, #size#) - + insert into alf_content_data (version, content_url_id, content_mimetype_id, content_encoding_id, content_locale_id) values (#version#, #contentUrlId#, #mimetypeId#, #encodingId#, #localeId#) @@ -94,7 +94,7 @@ - select * from @@ -104,7 +104,7 @@ - select * from @@ -114,7 +114,7 @@ - select * from @@ -124,7 +124,7 @@ - select * from @@ -134,7 +134,7 @@ - select * from @@ -144,7 +144,7 @@ - select * from @@ -155,7 +155,7 @@ - select cu.* from @@ -168,7 +168,7 @@ - + delete from alf_content_url @@ -177,7 +177,7 @@ - select cd.id as id, cd.version as version, @@ -195,7 +195,7 @@ - select np.long_value as id from @@ -208,7 +208,7 @@ - + delete from alf_content_data @@ -217,7 +217,7 @@ - select content_url from @@ -225,12 +225,12 @@ - + insert into alf_content_clean (content_url) values (lower(#contentUrl#)) - select content_url from @@ -238,7 +238,7 @@ - + delete from alf_content_clean @@ -247,7 +247,7 @@ - + delete from alf_content_clean diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/locks-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/locks-common-SqlMap.xml index 73c084ea8a..54cf12f7d9 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/locks-common-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/locks-common-SqlMap.xml @@ -17,14 +17,14 @@ - + - + @@ -38,7 +38,7 @@ - + @@ -50,12 +50,12 @@ - + insert into alf_lock_resource (version, qname_ns_id, qname_localname) values (#version#, #qnameNamespaceId#, lower(#qnameLocalName#)) - + 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#) @@ -65,7 +65,7 @@ - select * from @@ -76,7 +76,7 @@ - select * from @@ -86,7 +86,7 @@ - select * from @@ -97,7 +97,7 @@ - select * from @@ -112,7 +112,7 @@ - + update alf_lock set @@ -126,7 +126,7 @@ - + update alf_lock set diff --git a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/propval-common-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/propval-common-SqlMap.xml index b7dc3bebde..cfae055ede 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.Dialect/propval-common-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.Dialect/propval-common-SqlMap.xml @@ -24,13 +24,13 @@ - + - + @@ -43,21 +43,21 @@ - + - + - + - + @@ -66,13 +66,13 @@ - + - + @@ -89,7 +89,7 @@ - + @@ -97,27 +97,27 @@ - + insert into alf_prop_class (java_class_name, java_class_name_short, java_class_name_crc) values (#javaClassName#, #javaClassNameShort#, #javaClassNameCrc#) - + insert into alf_prop_string_value (string_value, string_end_lower, string_crc) values (#stringValue#, #stringEndLower#, #stringCrc#) - + insert into alf_prop_double_value (double_value) values (#doubleValue#) - + insert into alf_prop_serializable_value (serializable_value) values (?) - + insert into alf_prop_value (actual_type_id, persisted_type, long_value) values (#actualTypeId#, #persistedType#, #longValue#) @@ -127,7 +127,7 @@ - select * from @@ -137,7 +137,7 @@ - select * from @@ -147,7 +147,7 @@ java_class_name_short = #javaClassNameShort# - + insert into alf_prop_date_value ( date_value, @@ -167,7 +167,7 @@ - select * from @@ -177,7 +177,7 @@ - select * from @@ -187,7 +187,7 @@ - select string_value from @@ -198,7 +198,7 @@ - select id from @@ -209,7 +209,7 @@ - select * from @@ -219,7 +219,7 @@ - select * from @@ -229,7 +229,7 @@ - select * from @@ -239,7 +239,7 @@ - select pv.id as id, pv.actual_type_id as actual_type_id, @@ -256,7 +256,7 @@ - select pv.id as id, pv.actual_type_id as actual_type_id, @@ -274,7 +274,7 @@ - select pv.id as id, pv.actual_type_id as actual_type_id, @@ -293,7 +293,7 @@ - select cl.root_prop_id, cl.current_prop_id, cl.value_prop_id, cl.key_prop_id, 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_serializable_value serv on (serv.id = v.long_value and v.persisted_type = 4) where cl.root_prop_id = #id# - order by current_prop_id, value_prop_id, key_prop_id - + insert into alf_prop_link ( root_prop_id, current_prop_id, value_prop_id, key_prop_id diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml index 0b0223b314..14a07b3b1e 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/activities-insert-SqlMap.xml @@ -6,7 +6,7 @@ - + insert into alf_activity_feed_control (feed_user_id, site_network, app_tool, last_modified) values (#feedUserId#, #siteNetwork#, #appTool#, #lastModified#) @@ -17,7 +17,7 @@ - + insert into alf_activity_feed (activity_type, activity_summary, activity_format, feed_user_id, post_user_id, post_date, post_id, site_network, app_tool, feed_date) values (#activityType#, #activitySummary#, #activitySummaryFormat#, #feedUserId#, #postUserId#, #postDate#, #postId#, #siteNetwork#, #appTool#, #feedDate#) @@ -28,7 +28,7 @@ - + insert 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#) diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml index c7c0d796c7..d0da280fbc 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml @@ -6,22 +6,22 @@ - - + + KEY_COLUMN:GENERATED_KEY - - + + KEY_COLUMN:GENERATED_KEY - - + + KEY_COLUMN:GENERATED_KEY diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml index 809476a283..1ad6358e56 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml @@ -6,29 +6,29 @@ - - + + KEY_COLUMN:GENERATED_KEY - - + + KEY_COLUMN:GENERATED_KEY - - + + KEY_COLUMN:GENERATED_KEY - - + + KEY_COLUMN:GENERATED_KEY diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml index 5f347b0ed9..d559493c5b 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml @@ -6,15 +6,15 @@ - - + + KEY_COLUMN:GENERATED_KEY - - + + KEY_COLUMN:GENERATED_KEY diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml index 0c2bad3a0c..0e8f779bc8 100644 --- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml +++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml @@ -6,36 +6,36 @@ - - + + KEY_COLUMN:GENERATED_KEY - - + + KEY_COLUMN:GENERATED_KEY - - + + KEY_COLUMN:GENERATED_KEY - - + + KEY_COLUMN:GENERATED_KEY - - + + KEY_COLUMN:GENERATED_KEY diff --git a/config/alfresco/ibatis/propval-SqlMapConfig.xml b/config/alfresco/ibatis/propval-SqlMapConfig.xml deleted file mode 100644 index 60f732ba35..0000000000 --- a/config/alfresco/ibatis/propval-SqlMapConfig.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - diff --git a/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityFeedDAOImpl.java b/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityFeedDAOImpl.java index 72f6e70761..248c6cb6ca 100644 --- a/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityFeedDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityFeedDAOImpl.java @@ -37,13 +37,13 @@ public class ActivityFeedDAOImpl extends IBatisSqlMapper implements ActivityFeed { 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); } 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 @@ -53,7 +53,7 @@ public class ActivityFeedDAOImpl extends IBatisSqlMapper implements ActivityFeed params.setActivitySummaryFormat(format); 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 @@ -63,13 +63,13 @@ public class ActivityFeedDAOImpl extends IBatisSqlMapper implements ActivityFeed params.setActivitySummaryFormat(format); 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") public List selectFeedsToClean(int maxFeedSize) throws SQLException { - return (List)getSqlMapClient().queryForList("select.activity.feed.greater.than.max", maxFeedSize); + return (List)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_greater_than_max", maxFeedSize); } @SuppressWarnings("unchecked") @@ -92,17 +92,17 @@ public class ActivityFeedDAOImpl extends IBatisSqlMapper implements ActivityFeed if ((!excludeThisUser) && (!excludeOtherUsers)) { // no excludes => everyone => where feed user is me - return (List)getSqlMapClient().queryForList("select.activity.feed.for.feeduser.and.site", params); + return (List)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_feeduser_and_site", params); } else if ((excludeThisUser) && (!excludeOtherUsers)) { // exclude feed user => others => where feed user is me and post user is not me - return (List)getSqlMapClient().queryForList("select.activity.feed.for.feeduser.others.and.site", params); + return (List)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_feeduser_others_and_site", params); } else if ((excludeOtherUsers) && (!excludeThisUser)) { // exclude others => me => where feed user is me and post user is me - return (List)getSqlMapClient().queryForList("select.activity.feed.for.feeduser.me.and.site", params); + return (List)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_feeduser_me_and_site", params); } } else @@ -117,17 +117,17 @@ public class ActivityFeedDAOImpl extends IBatisSqlMapper implements ActivityFeed if (!excludeThisUser && !excludeOtherUsers) { // no excludes => everyone => where feed user is me - return (List)getSqlMapClient().queryForList("select.activity.feed.for.feeduser", params); + return (List)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_feeduser", params); } else if (excludeThisUser) { // exclude feed user => others => where feed user is me and post user is not me - return (List)getSqlMapClient().queryForList("select.activity.feed.for.feeduser.others", params); + return (List)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_feeduser_others", params); } else if (excludeOtherUsers) { // exclude others => me => where feed user is me and post user is me - return (List)getSqlMapClient().queryForList("select.activity.feed.for.feeduser.me", params); + return (List)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); // for given site - return (List)getSqlMapClient().queryForList("select.activity.feed.for.site", params); + return (List)getSqlMapClient().queryForList("alfresco.activities.select_activity_feed_for_site", params); } } diff --git a/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java b/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java index a8193a7760..95d2d653c9 100644 --- a/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/activities/ibatis/ActivityPostDAOImpl.java @@ -42,11 +42,11 @@ public class ActivityPostDAOImpl extends IBatisSqlMapper implements ActivityPost (activityPost.getMaxId() != -1) && (activityPost.getStatus() != null)) { - return (List)getSqlMapClient().queryForList("select.activity.posts", activityPost); + return (List)getSqlMapClient().queryForList("alfresco.activities.select_activity_posts", activityPost); } else if (activityPost.getStatus() != null) { - return (List)getSqlMapClient().queryForList("select.activity.posts.by.status.only", activityPost); + return (List)getSqlMapClient().queryForList("alfresco.activities.select_activity_posts_by_status_only", activityPost); } else { @@ -56,17 +56,17 @@ public class ActivityPostDAOImpl extends IBatisSqlMapper implements ActivityPost 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 { - 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 { - 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 @@ -78,7 +78,7 @@ public class ActivityPostDAOImpl extends IBatisSqlMapper implements ActivityPost post.setStatus(status.toString()); 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 @@ -88,7 +88,7 @@ public class ActivityPostDAOImpl extends IBatisSqlMapper implements ActivityPost post.setStatus(status.toString()); 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 @@ -97,12 +97,12 @@ public class ActivityPostDAOImpl extends IBatisSqlMapper implements ActivityPost params.setPostDate(keepDate); 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 { - 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); } } diff --git a/source/java/org/alfresco/repo/domain/activities/ibatis/FeedControlDAOImpl.java b/source/java/org/alfresco/repo/domain/activities/ibatis/FeedControlDAOImpl.java index 7948fb4b5f..de893d28f5 100644 --- a/source/java/org/alfresco/repo/domain/activities/ibatis/FeedControlDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/activities/ibatis/FeedControlDAOImpl.java @@ -34,13 +34,13 @@ public class FeedControlDAOImpl extends IBatisSqlMapper implements FeedControlDA { 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); } 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") @@ -48,12 +48,12 @@ public class FeedControlDAOImpl extends IBatisSqlMapper implements FeedControlDA { FeedControlEntity params = new FeedControlEntity(feedUserId); - return (List)getSqlMapClient().queryForList("select.activity.feedcontrols.for.user", params); + return (List)getSqlMapClient().queryForList("alfresco.activities.select_activity_feedcontrols_for_user", params); } 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); } } diff --git a/source/java/org/alfresco/repo/domain/audit/AuditQueryResult.java b/source/java/org/alfresco/repo/domain/audit/AuditQueryResult.java index 3f6412815e..f0dba0e9ae 100644 --- a/source/java/org/alfresco/repo/domain/audit/AuditQueryResult.java +++ b/source/java/org/alfresco/repo/domain/audit/AuditQueryResult.java @@ -25,6 +25,9 @@ package org.alfresco.repo.domain.audit; import java.util.Date; +import java.util.List; + +import org.alfresco.repo.domain.propval.PropertyIdSearchRow; /** * Results bean for alf_audit_entry table. @@ -39,6 +42,7 @@ public class AuditQueryResult private String auditUser; private long auditTime; private Long auditValuesId; + private List auditValues; public AuditQueryResult() { @@ -54,6 +58,7 @@ public class AuditQueryResult .append(", auditUser=").append(auditUser) .append(", auditTime").append(new Date(auditTime)) .append(", auditValuesId=").append(auditValuesId) + .append(", auditValues=").append(auditValues.size()) .append("]"); return sb.toString(); } @@ -107,4 +112,14 @@ public class AuditQueryResult { this.auditValuesId = auditValuesId; } + + public List getAuditValues() + { + return auditValues; + } + + public void setAuditValues(List auditValues) + { + this.auditValues = auditValues; + } } diff --git a/source/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java b/source/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java index beb5ce6db8..372978f39a 100644 --- a/source/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/audit/ibatis/AuditDAOImpl.java @@ -48,15 +48,16 @@ import com.ibatis.sqlmap.client.event.RowHandler; */ public class AuditDAOImpl extends AbstractAuditDAOImpl { - private static final String SELECT_MODEL_BY_CRC = "select.AuditModelByCrc"; - private static final String INSERT_MODEL = "insert.AuditModel"; + private static final String SELECT_MODEL_BY_CRC = "alfresco.audit.select_AuditModelByCrc"; + 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 INSERT_APPLICATION = "insert.AuditApplication"; + private static final String SELECT_APPLICATION_BY_MODEL_ID = "alfresco.audit.select_AuditApplicationByModelId"; + 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; @@ -162,6 +163,7 @@ public class AuditDAOImpl extends AbstractAuditDAOImpl AuditQueryParameters params = new AuditQueryParameters(); if (appName != null) { + // Look up the application's ID (this is unique) Pair appNameCrcPair = propertyValueDAO.getPropertyStringCaseSensitiveSearchParameters(appName); params.setAuditAppNameCrcPair(appNameCrcPair); } @@ -173,7 +175,15 @@ public class AuditDAOImpl extends AbstractAuditDAOImpl params.setAuditFromTime(from); params.setAuditToTime(to); - if (maxResults <= 0) + if (maxResults > 0) + { + List rows = template.queryForList(SELECT_ENTRIES_SIMPLE, params, 0, maxResults); + for (AuditQueryResult row : rows) + { + rowHandler.processResult(row); + } + } + else { RowHandler rowHandlerInternal = new RowHandler() { @@ -185,13 +195,5 @@ public class AuditDAOImpl extends AbstractAuditDAOImpl }; template.queryWithRowHandler(SELECT_ENTRIES_SIMPLE, params, rowHandlerInternal); } - else - { - List rows = template.queryForList(SELECT_ENTRIES_SIMPLE, params, 0, maxResults); - for (AuditQueryResult row : rows) - { - rowHandler.processResult(row); - } - } } } diff --git a/source/java/org/alfresco/repo/domain/contentclean/ibatis/ContentCleanDAOImpl.java b/source/java/org/alfresco/repo/domain/contentclean/ibatis/ContentCleanDAOImpl.java index 94e617fa8b..b3cb933453 100644 --- a/source/java/org/alfresco/repo/domain/contentclean/ibatis/ContentCleanDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/contentclean/ibatis/ContentCleanDAOImpl.java @@ -48,10 +48,10 @@ public class ContentCleanDAOImpl implements ContentCleanDAO private static final int DEFAULT_BATCH_SIZE = 50; - private static final String INSERT_CONTENT_CLEAN = "insert.ContentCleanUrl"; - private static final String SELECT_CONTENT_CLEAN_URLS = "select.ContentCleanUrls"; - private static final String DELETE_CONTENT_CLEAN_BY_URL = "delete.ContentCleanUrl"; - private static final String DELETE_CONTENT_CLEAN = "delete.ContentCleanUrls"; + private static final String INSERT_CONTENT_CLEAN = "alfresco.content.insert_ContentCleanUrl"; + private static final String SELECT_CONTENT_CLEAN_URLS = "alfresco.content.select_ContentCleanUrls"; + private static final String DELETE_CONTENT_CLEAN_BY_URL = "alfresco.content.delete_ContentCleanUrl"; + private static final String DELETE_CONTENT_CLEAN = "alfresco.content.delete_ContentCleanUrls"; private SqlMapClientTemplate template; diff --git a/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java b/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java index b0d6765342..0c19d21063 100644 --- a/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/contentdata/ibatis/ContentDataDAOImpl.java @@ -44,16 +44,16 @@ import com.ibatis.sqlmap.client.event.RowHandler; */ public class ContentDataDAOImpl extends AbstractContentDataDAOImpl { - private static final String SELECT_CONTENT_URL_BY_ID = "select.ContentUrlById"; - private static final String SELECT_CONTENT_URL_BY_KEY = "select.ContentUrlByKey"; - private static final String SELECT_CONTENT_URL_BY_KEY_UNREFERENCED = "select.ContentUrlByKeyUnreferenced"; - private static final String SELECT_CONTENT_URLS = "select.ContentUrls"; - private static final String SELECT_CONTENT_DATA_BY_ID = "select.ContentDataById"; - private static final String SELECT_CONTENT_DATA_BY_NODE_AND_QNAME = "select.ContentDataByNodeAndQName"; - private static final String INSERT_CONTENT_URL = "insert.ContentUrl"; - private static final String INSERT_CONTENT_DATA = "insert.ContentData"; - private static final String DELETE_CONTENT_DATA = "delete.ContentData"; - private static final String DELETE_CONTENT_URL = "delete.ContentUrl"; + private static final String SELECT_CONTENT_URL_BY_ID = "alfresco.content.select_ContentUrlById"; + private static final String SELECT_CONTENT_URL_BY_KEY = "alfresco.content.select_ContentUrlByKey"; + private static final String SELECT_CONTENT_URL_BY_KEY_UNREFERENCED = "alfresco.content.select_ContentUrlByKeyUnreferenced"; + private static final String SELECT_CONTENT_URLS = "alfresco.content.select_ContentUrls"; + private static final String SELECT_CONTENT_DATA_BY_ID = "alfresco.content.select_ContentDataById"; + private static final String SELECT_CONTENT_DATA_BY_NODE_AND_QNAME = "alfresco.content.select_ContentDataByNodeAndQName"; + private static final String INSERT_CONTENT_URL = "alfresco.content.insert_ContentUrl"; + private static final String INSERT_CONTENT_DATA = "alfresco.content.insert_ContentData"; + private static final String DELETE_CONTENT_DATA = "alfresco.content.delete_ContentData"; + private static final String DELETE_CONTENT_URL = "alfresco.content.delete_ContentUrl"; private SqlMapClientTemplate template; diff --git a/source/java/org/alfresco/repo/domain/encoding/ibatis/EncodingDAOImpl.java b/source/java/org/alfresco/repo/domain/encoding/ibatis/EncodingDAOImpl.java index 60492bff8f..873ed311fd 100644 --- a/source/java/org/alfresco/repo/domain/encoding/ibatis/EncodingDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/encoding/ibatis/EncodingDAOImpl.java @@ -37,9 +37,9 @@ import org.springframework.orm.ibatis.SqlMapClientTemplate; */ public class EncodingDAOImpl extends AbstractEncodingDAOImpl { - private static final String SELECT_ENCODING_BY_ID = "select.EncodingById"; - private static final String SELECT_ENCODING_BY_KEY = "select.EncodingByKey"; - private static final String INSERT_ENCODING = "insert.Encoding"; + private static final String SELECT_ENCODING_BY_ID = "alfresco.content.select_EncodingById"; + private static final String SELECT_ENCODING_BY_KEY = "alfresco.content.select_EncodingByKey"; + private static final String INSERT_ENCODING = "alfresco.content.insert_Encoding"; private SqlMapClientTemplate template; diff --git a/source/java/org/alfresco/repo/domain/locks/ibatis/LockDAOImpl.java b/source/java/org/alfresco/repo/domain/locks/ibatis/LockDAOImpl.java index 8822038357..7255387794 100644 --- a/source/java/org/alfresco/repo/domain/locks/ibatis/LockDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/locks/ibatis/LockDAOImpl.java @@ -41,14 +41,14 @@ import org.springframework.orm.ibatis.SqlMapClientTemplate; */ public class LockDAOImpl extends AbstractLockDAOImpl { - private static final String SELECT_LOCKRESOURCE_BY_QNAME = "select.LockResourceByQName"; - private static final String SELECT_LOCK_BY_ID = "select.LockByID"; - private static final String SELECT_LOCK_BY_KEY = "select.LockByKey"; - private static final String SELECT_LOCK_BY_SHARED_IDS = "select.LockBySharedIds"; - private static final String INSERT_LOCKRESOURCE = "insert.LockResource"; - private static final String INSERT_LOCK = "insert.Lock"; - private static final String UPDATE_LOCK = "update.Lock"; - private static final String UPDATE_EXCLUSIVE_LOCK = "update.ExclusiveLock"; + private static final String SELECT_LOCKRESOURCE_BY_QNAME = "alfresco.lock.select_LockResourceByQName"; + private static final String SELECT_LOCK_BY_ID = "alfresco.lock.select_LockByID"; + private static final String SELECT_LOCK_BY_KEY = "alfresco.lock.select_LockByKey"; + private static final String SELECT_LOCK_BY_SHARED_IDS = "alfresco.lock.select_LockBySharedIds"; + private static final String INSERT_LOCKRESOURCE = "alfresco.lock.insert_LockResource"; + private static final String INSERT_LOCK = "alfresco.lock.insert_Lock"; + private static final String UPDATE_LOCK = "alfresco.lock.update_Lock"; + private static final String UPDATE_EXCLUSIVE_LOCK = "alfresco.lock.update_ExclusiveLock"; private SqlMapClientTemplate template; diff --git a/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java b/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java index 4cb78aa3aa..13fc5c0e9c 100644 --- a/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/mimetype/ibatis/MimetypeDAOImpl.java @@ -36,9 +36,9 @@ import org.springframework.orm.ibatis.SqlMapClientTemplate; */ public class MimetypeDAOImpl extends AbstractMimetypeDAOImpl { - private static final String SELECT_MIMETYPE_BY_ID = "select.MimetypeById"; - private static final String SELECT_MIMETYPE_BY_KEY = "select.MimetypeByKey"; - private static final String INSERT_MIMETYPE = "insert.Mimetype"; + private static final String SELECT_MIMETYPE_BY_ID = "alfresco.content.select_MimetypeById"; + private static final String SELECT_MIMETYPE_BY_KEY = "alfresco.content.select_MimetypeByKey"; + private static final String INSERT_MIMETYPE = "alfresco.content.insert_Mimetype"; private SqlMapClientTemplate template; diff --git a/source/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java b/source/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java index ae35964372..5bfe50f796 100644 --- a/source/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/propval/ibatis/PropertyValueDAOImpl.java @@ -50,32 +50,32 @@ import org.springframework.orm.ibatis.SqlMapClientTemplate; */ public class PropertyValueDAOImpl extends AbstractPropertyValueDAOImpl { - private static final String SELECT_PROPERTY_CLASS_BY_ID = "select.PropertyClassByID"; - private static final String SELECT_PROPERTY_CLASS_BY_NAME = "select.PropertyClassByName"; - private static final String INSERT_PROPERTY_CLASS = "insert.PropertyClass"; + private static final String SELECT_PROPERTY_CLASS_BY_ID = "alfresco.propval.select_PropertyClassByID"; + private static final String SELECT_PROPERTY_CLASS_BY_NAME = "alfresco.propval.select_PropertyClassByName"; + 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_VALUE = "select.PropertyDateValueByValue"; - private static final String INSERT_PROPERTY_DATE_VALUE = "insert.PropertyDateValue"; + private static final String SELECT_PROPERTY_DATE_VALUE_BY_ID = "alfresco.propval.select_PropertyDateValueByID"; + private static final String SELECT_PROPERTY_DATE_VALUE_BY_VALUE = "alfresco.propval.select_PropertyDateValueByValue"; + 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_VALUE = "select.PropertyStringValueByValue"; - private static final String INSERT_PROPERTY_STRING_VALUE = "insert.PropertyStringValue"; + private static final String SELECT_PROPERTY_STRING_VALUE_BY_ID = "alfresco.propval.select_PropertyStringValueByID"; + private static final String SELECT_PROPERTY_STRING_VALUE_BY_VALUE = "alfresco.propval.select_PropertyStringValueByValue"; + 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_VALUE = "select.PropertyDoubleValueByValue"; - private static final String INSERT_PROPERTY_DOUBLE_VALUE = "insert.PropertyDoubleValue"; + private static final String SELECT_PROPERTY_DOUBLE_VALUE_BY_ID = "alfresco.propval.select_PropertyDoubleValueByID"; + private static final String SELECT_PROPERTY_DOUBLE_VALUE_BY_VALUE = "alfresco.propval.select_PropertyDoubleValueByValue"; + 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 INSERT_PROPERTY_SERIALIZABLE_VALUE = "insert.PropertySerializableValue"; + private static final String SELECT_PROPERTY_SERIALIZABLE_VALUE_BY_ID = "alfresco.propval.select_PropertySerializableValueByID"; + 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_LOCAL_VALUE = "select.PropertyValueByLocalValue"; - private static final String SELECT_PROPERTY_VALUE_BY_DOUBLE_VALUE = "select.PropertyValueByDoubleValue"; - private static final String SELECT_PROPERTY_VALUE_BY_STRING_VALUE = "select.PropertyValueByStringValue"; - private static final String INSERT_PROPERTY_VALUE = "insert.PropertyValue"; + private static final String SELECT_PROPERTY_VALUE_BY_ID = "alfresco.propval.select_PropertyValueById"; + private static final String SELECT_PROPERTY_VALUE_BY_LOCAL_VALUE = "alfresco.propval.select_PropertyValueByLocalValue"; + private static final String SELECT_PROPERTY_VALUE_BY_DOUBLE_VALUE = "alfresco.propval.select_PropertyValueByDoubleValue"; + private static final String SELECT_PROPERTY_VALUE_BY_STRING_VALUE = "alfresco.propval.select_PropertyValueByStringValue"; + 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;