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

Merged V4.0-BUG-FIX to HEAD

Browse Source 
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
This commit is contained in:
Dave Ward
2012-05-24 10:29:48 +00:00
parent 1029814dbe
commit 1236e1ef84
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.Dialect/AclChangeSet-Tracking2.sql
View File

@@ -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)

2
config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.MySQLInnoDBDialect/AclChangeSet-Tracking.sql
View File

@@ -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}
;

2
config/alfresco/dbscripts/upgrade/4.0/org.hibernate.dialect.PostgreSQLDialect/AclChangeSet-Tracking.sql
View File

@@ -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}
;

4
source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorClientException.java
View File

@@ -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;

4
source/java/org/alfresco/service/cmr/remoteconnector/RemoteConnectorServerException.java
View File

@@ -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;