From 1236e1ef8457e0d85e59e8f1b8ad3529a61face8 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Thu, 24 May 2012 10:29:48 +0000 Subject: [PATCH] Merged V4.0-BUG-FIX to HEAD 36800: Fix for ALF-14217 - Repository link in the repository view of Share fails to link to Company Home metadata details page 36801: ALF-13465: Ensure that linked folders go to folder-details and not document-details page 36802: ALF-11027: Merge DEV/MAVEN-POC to V4.0-BUG-FIX 36757: ALF-11027: remove spurious comment 36593: ALF-11027: Fixed running from enterpriseprojects folder and strenghtened error messaging. Maven deployment needs to be run in -f continuous.xml environment and fails when set-build-number was not called in advance 36803: ALF-13775: Set correct status code on missing index package doc response (updated Surf libs r1082) 36805: Tweak exception inheritence to better fit with transaction rollbacks 36806: Merged BRANCHES/DEV/CLOUDSYNCLOCAL2 to BRANCHES/DEV/V4.0-BUG-FIX: 36556: A useful collection conversion utility method. 36827: Record which CloudSyncLocal2 changes already been manually merged in 36859: Merged V4.0 to V4.0-BUG-FIX 36854: Part 2 for ALF-14237 Upgrades from 4.0.0.x/4.0.1.0 will not fix the timestamps on acl changesets - SOLR will skip ACLs set prior to upgrade - add id to avoid many changesets with the same timestamp 36855: Part 3 for ALF-14237 Upgrades from 4.0.0.x/4.0.1.0 will not fix the timestamps on acl changesets - SOLR will skip ACLs set prior to upgrade - fix original patch again ... 36861: Merged V4.0 to V4.0-BUG-FIX 36852: ALF-13745: Merged V3.4-BUG-FIX (3.4.10) to V4.0 (4.0.2) <<< Extra change required for 4.0.x in alfresco-macros.lib.ftl >>> 36851: ALF-13667 Additional OpenOffice mimetypes to be added to the mime-type maps - Added mime-type mappings to alfresco.js git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@36863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql | 2 +- .../AclChangeSet-Tracking.sql | 2 +- .../AclChangeSet-Tracking.sql | 2 +- .../cmr/remoteconnector/RemoteConnectorClientException.java | 4 ++-- .../cmr/remoteconnector/RemoteConnectorServerException.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql index 26b0a87030..5a862266b0 100644 --- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql +++ b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql @@ -11,7 +11,7 @@ --FOREACH alf_acl_change_set.id system.upgrade.alf_acl_change_set.batchsize UPDATE alf_acl_change_set SET - commit_time_ms = (select min(t.commit_time_ms) from alf_transaction t) + commit_time_ms = ((select min(t.commit_time_ms) from alf_transaction t) + id) WHERE id >= ${LOWERBOUND} AND id <= ${UPPERBOUND} AND commit_time_ms < (select min(t.commit_time_ms) from alf_transaction t) diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql index 413c5867b1..7da3bc6583 100644 --- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql +++ b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql @@ -15,7 +15,7 @@ ALTER TABLE alf_acl_change_set --FOREACH alf_acl_change_set.id system.upgrade.alf_acl_change_set.batchsize UPDATE alf_acl_change_set SET - commit_time_ms = ${NOW} + commit_time_ms = ${NOW} + id WHERE id >= ${LOWERBOUND} AND id <= ${UPPERBOUND} ; diff --git a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql index d4e6b452bc..f55aedb476 100644 --- a/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql +++ b/config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql @@ -17,7 +17,7 @@ ALTER TABLE alf_acl_change_set --FOREACH alf_acl_change_set.id system.upgrade.alf_acl_change_set.batchsize UPDATE alf_acl_change_set SET - commit_time_ms = ${NOW} + commit_time_ms = ${NOW} + id WHERE id >= ${LOWERBOUND} AND id <= ${UPPERBOUND} ; diff --git a/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java b/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java index 355794d931..bb3c46dd72 100644 --- a/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java +++ b/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java @@ -18,7 +18,7 @@ */ package org.alfresco.service.cmr.remoteconnector; -import java.io.IOException; +import org.alfresco.error.AlfrescoRuntimeException; /** * An exception thrown when the remote server indicates that the @@ -32,7 +32,7 @@ import java.io.IOException; * @author Nick Burch * @since 4.0.3 */ -public class RemoteConnectorClientException extends IOException +public class RemoteConnectorClientException extends AlfrescoRuntimeException { private static final long serialVersionUID = -639209368873463536L; private final int statusCode; diff --git a/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java b/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java index 673e02e622..7458627e6b 100644 --- a/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java +++ b/source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java @@ -18,7 +18,7 @@ */ package org.alfresco.service.cmr.remoteconnector; -import java.io.IOException; +import org.alfresco.error.AlfrescoRuntimeException; /** * An exception thrown when the remote server indicates that it @@ -28,7 +28,7 @@ import java.io.IOException; * @author Nick Burch * @since 4.0.3 */ -public class RemoteConnectorServerException extends IOException +public class RemoteConnectorServerException extends AlfrescoRuntimeException { private static final long serialVersionUID = -639209368873463536L; private final int statusCode;