mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.2 to HEAD
17462: ETHREEOH-3346: New meaning to synchronization.synchronizeChangesOnly property - In the LDAP sync performance optimizations we always used the differential queries to determine the users and groups to be updated. Deletions were determined by a separate query. - This meant that if you ever did want to force the update of all users it wasn't possible. - So now when the flag is false it means don't use differential queries in the scheduled sync job. - The scheduled job now processes deletions regardless. - The default value for the property is now true. 17431: ETHREEOH-3274: Refix NTLM support for share - Fixed NPE introduced by ETHREEOH-2767 - Made web.xml validate against schema for JBoss - Reintroduced missing open comment in webscript-framework-config-custom.xml.sample 17426: ETHREEOH-2997: Fix ticket parameter passing into NTLM/Kerberos WebDAV authentication filters - A NPE was stopping it from working 17425: ETHREEOH-3282: Fixed NPE preventing upload from working with NTLM SSO enabled 17368: ETHREEOH-3197: Use utf8_bin collation in MySQL out of the box to avoid problems with comparison of accented characters 17361: ETHREEOH-3276: Don't attempt to start an LDAP sync when the repository is read only 17347: ETHREEOH-3206: Fix LocalFeedTaskProcessor to work with JBoss 5 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -171,7 +171,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
{
|
||||
newGroup("G2", "U1", "U3", "U4"), newGroup("G6", "U3", "U4", "G7"), newGroup("G7", "U5")
|
||||
}));
|
||||
this.synchronizer.synchronize(true, true);
|
||||
this.synchronizer.synchronize(true, true, true);
|
||||
this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
|
||||
@@ -208,7 +208,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
new NodeDescription[] {}), new MockUserRegistry("Z1", new NodeDescription[] {},
|
||||
new NodeDescription[] {}), new MockUserRegistry("Z2", new NodeDescription[] {},
|
||||
new NodeDescription[] {}));
|
||||
this.synchronizer.synchronize(true, true);
|
||||
this.synchronizer.synchronize(true, true, true);
|
||||
this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
|
||||
@@ -271,7 +271,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
public Object execute() throws Throwable
|
||||
{
|
||||
|
||||
ChainingUserRegistrySynchronizerTest.this.synchronizer.synchronize(false, false);
|
||||
ChainingUserRegistrySynchronizerTest.this.synchronizer.synchronize(false, false, false);
|
||||
// Stay in the same transaction
|
||||
assertExists("Z1", "U1");
|
||||
assertEmailEquals("U1", "changeofemail@alfresco.com");
|
||||
@@ -332,7 +332,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
{
|
||||
newGroup("G2", "U1", "U3", "U4", "U6"), newGroup("G6", "U3", "U4", "G7"), newGroup("G7", "U4", "U5")
|
||||
}));
|
||||
this.synchronizer.synchronize(true, true);
|
||||
this.synchronizer.synchronize(true, true, true);
|
||||
this.retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
|
||||
{
|
||||
|
||||
@@ -369,7 +369,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
List<NodeDescription> persons = new ArrayList<NodeDescription>(new RandomPersonCollection(100));
|
||||
List<NodeDescription> groups = new ArrayList<NodeDescription>(new RandomGroupCollection(100, persons));
|
||||
this.applicationContextManager.setUserRegistries(new MockUserRegistry("Z0", persons, groups));
|
||||
this.synchronizer.synchronize(true, true);
|
||||
this.synchronizer.synchronize(true, true, true);
|
||||
tearDownTestUsersAndGroups();
|
||||
}
|
||||
|
||||
@@ -394,7 +394,7 @@ public class ChainingUserRegistrySynchronizerTest extends TestCase
|
||||
}, true, true);
|
||||
ChainingUserRegistrySynchronizerTest.this.applicationContextManager.setUserRegistries(new MockUserRegistry(
|
||||
"Z0", Collections.<NodeDescription> emptyList(), groups));
|
||||
ChainingUserRegistrySynchronizerTest.this.synchronizer.synchronize(true, true);
|
||||
ChainingUserRegistrySynchronizerTest.this.synchronizer.synchronize(true, true, true);
|
||||
tearDownTestUsersAndGroups();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user