Repository: syncope
Updated Branches:
  refs/heads/SYNCOPE-156 2aba8fba7 -> 7526a2d59


http://git-wip-us.apache.org/repos/asf/syncope/blob/02456545/core/persistence-jpa/src/test/resources/domains/TwoContent.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/resources/domains/TwoContent.xml 
b/core/persistence-jpa/src/test/resources/domains/TwoContent.xml
index b4c5d9b..023b840 100644
--- a/core/persistence-jpa/src/test/resources/domains/TwoContent.xml
+++ b/core/persistence-jpa/src/test/resources/domains/TwoContent.xml
@@ -111,7 +111,7 @@ under the License.
                 location="${connid.location}"
                 connectorName="net.tirasa.connid.bundles.ldap.LdapConnector"
                 version="${connid.ldap.version}" 
-                
jsonConf='[{"schema":{"name":"synchronizePasswords","displayName":"Enable 
Password Synchronization","helpMessage":"If true, the connector will 
synchronize passwords. The Password Capture Plugin needs to be installed for 
password synchronization to 
work.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"maintainLdapGroupMembership","displayName":"Maintain
 LDAP Group Membership","helpMessage":"When enabled and a user is renamed or 
deleted, update any LDAP groups to which the user belongs to reflect the new 
name. Otherwise, the LDAP resource must maintain referential integrity with 
respect to group 
membership.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["true"]},{"schema":{"name":"host","displayName":"Host","helpMessage":"The
 name or IP address of the host where the LDAP server is running.","type":"jav
 
a.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["localhost"]},{"schema":{"name":"passwordHashAlgorithm","displayName":"Password
 Hash Algorithm","helpMessage":"Indicates the algorithm that the Identity 
system should use to hash the password. Currently supported values are SSHA, 
SHA, SSHA1, and SHA1. A blank value indicates that the system will not hash 
passwords. This will cause cleartext passwords to be stored in LDAP unless the 
LDAP server performs the hash (Netscape Directory Server and iPlanet Directory 
Server 
do).","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["SHA"]},{"schema":{"name":"blockSize","displayName":"Block
 Size","helpMessage":"The maximum number of accounts that can be in a block 
when retrieving accounts in 
blocks.","type":"int","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"valu
 es":[]},{"schema":{"name":"useBlocks","displayName":"Use 
Blocks","helpMessage":"When performing operations on large numbers of accounts, 
the accounts are processed in blocks to reduce the amount of memory used by the 
operation. Select this option to process accounts in 
blocks.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[false]},{"schema":{"name":"usePagedResultControl","displayName":"Use
 Paged Result Control","helpMessage":"When enabled, the LDAP Paged Results 
control is preferred over the VLV control when retrieving 
accounts.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"port","displayName":"TCP
 Port","helpMessage":"TCP/IP port number used to communicate with the LDAP 
server.","type":"int","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[1389]},{"schema":{"nam
 e":"vlvSortAttribute","displayName":"VLV Sort 
Attribute","helpMessage":"Specify the sort attribute to use for VLV indexes on 
the 
resource.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"statusManagementClass","displayName":"Status
 management class ","helpMessage":"Class to be used to manage enabled/disabled 
status. If no class is specified then identity status management wont be 
possible.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["net.tirasa.connid.bundles.ldap.commons.AttributeStatusManagement"]},{"schema":{"name":"accountObjectClasses","displayName":"Account
 Object Classes","helpMessage":"The object class or classes that will be used 
when creating new user objects in the LDAP tree. When entering more than one 
object class, each entry should be on its own line; do not use commas or 
semi-colons to s
 eparate multiple object classes. Some object classes may require that you 
specify all object classes in the class 
hierarchy.","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["inetOrgPerson"]},{"schema":{"name":"accountUserNameAttributes","displayName":"Account
 User Name Attributes","helpMessage":"Attribute or attributes which holds the 
account user name. They will be used when authenticating to find the LDAP entry 
for the user name to 
authenticate.","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["uid"]},{"schema":{"name":"baseContextsToSynchronize","displayName":"Base
 Contexts to Synchronize","helpMessage":"One or more starting points in the 
LDAP tree that will be used to determine if a change should be synchronized. 
The base contexts attribute will be used to synchronize a change if this 
property is not set.","type":"[Lja
 
va.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["ou=people,o=isp","ou=groups,o=isp"]},{"schema":{"name":"accountSynchronizationFilter","displayName":"LDAP
 Filter for Accounts to Synchronize","helpMessage":"An optional LDAP filter for 
the objects to synchronize. Because the change log is for all objects, this 
filter updates only objects that match the specified filter. If you specify a 
filter, an object will be synchronized only if it matches the filter and 
includes a synchronized object 
class.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"removeLogEntryObjectClassFromFilter","displayName":"Remove
 Log Entry Object Class from Filter","helpMessage":"If this property is set 
(the default), the filter used to fetch change log entries does not contain the 
\"changeLogEntry\" object class, expecting that there are no entri
 es of other object types in the change 
log.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"passwordDecryptionKey","displayName":"Password
 Decryption Key","helpMessage":"The key to decrypt passwords with when 
performing password 
synchronization.","type":"org.identityconnectors.common.security.GuardedByteArray","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"readSchema","displayName":"Read
 Schema","helpMessage":"If true, the connector will read the schema from the 
server. If false, the connector will provide a default schema based on the 
object classes in the configuration. This property must be true in order to use 
extended object 
classes.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"ssl","displayName":"SSL","hel
 pMessage":"Select the check box to connect to the LDAP server using 
SSL.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"passwordAttributeToSynchronize","displayName":"Password
 Attribute to Synchronize","helpMessage":"The name of the password attribute to 
synchronize when performing password 
synchronization.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"accountSearchFilter","displayName":"LDAP
 Filter for Retrieving Accounts","helpMessage":"An optional LDAP filter to 
control which accounts are returned from the LDAP resource. If no filter is 
specified, only accounts that include all specified object classes are 
returned.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["uid=*"]},{"schema":{"name":"passwordDec
 ryptionInitializationVector","displayName":"Password Decryption Initialization 
Vector","helpMessage":"The initialization vector to decrypt passwords with when 
performing password 
synchronization.","type":"org.identityconnectors.common.security.GuardedByteArray","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"groupMemberAttribute","displayName":"Group
 Member Attribute","helpMessage":"The name of the group attribute that will be 
updated with the distinguished name of the user when the user is added to the 
group.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"failover","displayName":"Failover
 Servers","helpMessage":"List all servers that should be used for failover in 
case the preferred server fails. If the preferred server fails, JNDI will 
connect to the next available server in the list. List all servers in the
  form of \"ldap://ldap.example.com:389/\";, which follows the standard LDAP v3 
URLs described in RFC 2255. Only the host and port parts of the URL are 
relevant in this 
setting.","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"modifiersNamesToFilterOut","displayName":"Filter
 Out Changes By","helpMessage":"The names (DNs) of directory administrators to 
filter from the changes. Changes with the attribute \"modifiersName\" that 
match entries in this list will be filtered out. The standard value is the 
administrator name used by this adapter, to prevent loops. Entries should be of 
the format \"cn=Directory 
Manager\".","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"groupNameAttributes","displayName":"Group
 Name Attributes","helpMessage":"Attribute or attributes which holds the group 
nam
 
e.","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["cn"]},{"schema":{"name":"uidAttribute","displayName":"Uid
 Attribute","helpMessage":"The name of the LDAP attribute which is mapped to 
the Uid 
attribute.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["cn"]},{"schema":{"name":"respectResourcePasswordPolicyChangeAfterReset","displayName":"Respect
 Resource Password Policy Change-After-Reset","helpMessage":"When this resource 
is specified in a Login Module (i.e., this resource is a pass-through 
authentication target) and the resource password policy is configured for 
change-after-reset, a user whose resource account password has been 
administratively reset will be required to change that password after 
successfully 
authenticating.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overrida
 
ble":false,"values":["false"]},{"schema":{"name":"filterWithOrInsteadOfAnd","displayName":"Filter
 with Or Instead of And","helpMessage":"Normally the the filter used to fetch 
change log entries is an and-based filter retrieving an interval of change 
entries. If this property is set, the filter will or together the required 
change numbers 
instead.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"principal","displayName":"Principal","helpMessage":"The
 distinguished name with which to authenticate to the LDAP 
server.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["uid=admin,ou=system"]},{"schema":{"name":"changeLogBlockSize","displayName":"Change
 Log Block Size","helpMessage":"The number of change log entries to fetch per 
query.","type":"int","required":true,"order":0,"confidential":false,"defaultValues":null},
 
"overridable":false,"values":[100]},{"schema":{"name":"baseContexts","displayName":"Base
 Contexts","helpMessage":"One or more starting points in the LDAP tree that 
will be used when searching the tree. Searches are performed when discovering 
users from the LDAP server or when looking for the groups of which a user is a 
member.","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["ou=people,o=isp","ou=groups,o=isp"]},{"schema":{"name":"passwordAttribute","displayName":"Password
 Attribute","helpMessage":"The name of the LDAP attribute which holds the 
password. When changing an user password, the new password is set to this 
attribute.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["userpassword"]},{"schema":{"name":"changeNumberAttribute","displayName":"Change
 Number Attribute","helpMessage":"The name of the change number attribute
  in the change log 
entry.","type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["changeNumber"]},{"schema":{"name":"objectClassesToSynchronize","displayName":"Object
 Classes to Synchronize","helpMessage":"The object classes to synchronize. The 
change log is for all objects; this filters updates to just the listed object 
classes. You should not list the superclasses of an object class unless you 
intend to synchronize objects with any of the superclass values. For example, 
if only \"inetOrgPerson\" objects should be synchronized, but the superclasses 
of \"inetOrgPerson\" (\"person\", \"organizationalperson\" and \"top\") should 
be filtered out, then list only \"inetOrgPerson\" here. All objects in LDAP are 
subclassed from \"top\". For this reason, you should never list \"top\", 
otherwise no object would be 
filtered.","type":"[Ljava.lang.String;","required":true,"order":0,"confidential":false,"defaultValues":null},
 
"overridable":false,"values":["inetOrgPerson","groupOfUniqueNames"]},{"schema":{"name":"credentials","displayName":"Password","helpMessage":"Password
 for the 
principal.","type":"org.identityconnectors.common.security.GuardedString","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["secret"]},{"schema":{"name":"attributesToSynchronize","displayName":"Attributes
 to Synchronize","helpMessage":"The names of the attributes to synchronize. 
This ignores updates from the change log if they do not update any of the named 
attributes. For example, if only \"department\" is listed, then only changes 
that affect \"department\" will be processed. All other updates are ignored. If 
blank (the default), then all changes are 
processed.","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"maintainPosixGroupMembership","displayName":"Maintain
 POSIX Group M
 embership","helpMessage":"When enabled and a user is renamed or deleted, 
update any POSIX groups to which the user belongs to reflect the new name. 
Otherwise, the LDAP resource must maintain referential integrity with respect 
to group 
membership.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["truemaintainLdapGroupMembership"]}]'/>
+                
jsonConf='[{"schema":{"name":"synchronizePasswords","displayName":"Enable 
Password Synchronization","helpMessage":"If true, the connector will 
synchronize passwords. The Password Capture Plugin needs to be installed for 
password synchronization to 
work.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"maintainLdapGroupMembership","displayName":"Maintain
 LDAP Group Membership","helpMessage":"When enabled and a user is renamed or 
deleted, update any LDAP groups to which the user belongs to reflect the new 
name. Otherwise, the LDAP resource must maintain referential integrity with 
respect to group 
membership.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["true"]},{"schema":{"name":"host","displayName":"Host","helpMessage":"The
 name or IP address of the host where the LDAP server is running.","type":"jav
 
a.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["localhost"]},{"schema":{"name":"passwordHashAlgorithm","displayName":"Password
 Hash Algorithm","helpMessage":"Indicates the algorithm that the Identity 
system should use to hash the password. Currently supported values are SSHA, 
SHA, SSHA1, and SHA1. A blank value indicates that the system will not hash 
passwords. This will cause cleartext passwords to be stored in LDAP unless the 
LDAP server performs the hash (Netscape Directory Server and iPlanet Directory 
Server 
do).","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["SHA"]},{"schema":{"name":"port","displayName":"TCP
 Port","helpMessage":"TCP/IP port number used to communicate with the LDAP 
server.","type":"int","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[1389]},{"schema":{"name":"vlvSo
 rtAttribute","displayName":"VLV Sort Attribute","helpMessage":"Specify the 
sort attribute to use for VLV indexes on the 
resource.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"statusManagementClass","displayName":"Status
 management class ","helpMessage":"Class to be used to manage enabled/disabled 
status. If no class is specified then identity status management wont be 
possible.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["net.tirasa.connid.bundles.ldap.commons.AttributeStatusManagement"]},{"schema":{"name":"accountObjectClasses","displayName":"Account
 Object Classes","helpMessage":"The object class or classes that will be used 
when creating new user objects in the LDAP tree. When entering more than one 
object class, each entry should be on its own line; do not use commas or 
semi-colons to separate m
 ultiple object classes. Some object classes may require that you specify all 
object classes in the class 
hierarchy.","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["inetOrgPerson"]},{"schema":{"name":"accountUserNameAttributes","displayName":"Account
 User Name Attributes","helpMessage":"Attribute or attributes which holds the 
account user name. They will be used when authenticating to find the LDAP entry 
for the user name to 
authenticate.","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["uid"]},{"schema":{"name":"baseContextsToSynchronize","displayName":"Base
 Contexts to Synchronize","helpMessage":"One or more starting points in the 
LDAP tree that will be used to determine if a change should be synchronized. 
The base contexts attribute will be used to synchronize a change if this 
property is not set.","type":"[Ljava.lang.S
 
tring;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["ou=people,o=isp","ou=groups,o=isp"]},{"schema":{"name":"accountSynchronizationFilter","displayName":"LDAP
 Filter for Accounts to Synchronize","helpMessage":"An optional LDAP filter for 
the objects to synchronize. Because the change log is for all objects, this 
filter updates only objects that match the specified filter. If you specify a 
filter, an object will be synchronized only if it matches the filter and 
includes a synchronized object 
class.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"removeLogEntryObjectClassFromFilter","displayName":"Remove
 Log Entry Object Class from Filter","helpMessage":"If this property is set 
(the default), the filter used to fetch change log entries does not contain the 
\"changeLogEntry\" object class, expecting that there are no entries of oth
 er object types in the change 
log.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"passwordDecryptionKey","displayName":"Password
 Decryption Key","helpMessage":"The key to decrypt passwords with when 
performing password 
synchronization.","type":"org.identityconnectors.common.security.GuardedByteArray","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"readSchema","displayName":"Read
 Schema","helpMessage":"If true, the connector will read the schema from the 
server. If false, the connector will provide a default schema based on the 
object classes in the configuration. This property must be true in order to use 
extended object 
classes.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"ssl","displayName":"SSL","helpMessage"
 :"Select the check box to connect to the LDAP server using 
SSL.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"passwordAttributeToSynchronize","displayName":"Password
 Attribute to Synchronize","helpMessage":"The name of the password attribute to 
synchronize when performing password 
synchronization.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"accountSearchFilter","displayName":"LDAP
 Filter for Retrieving Accounts","helpMessage":"An optional LDAP filter to 
control which accounts are returned from the LDAP resource. If no filter is 
specified, only accounts that include all specified object classes are 
returned.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["uid=*"]},{"schema":{"name":"passwordDecryptionIn
 itializationVector","displayName":"Password Decryption Initialization 
Vector","helpMessage":"The initialization vector to decrypt passwords with when 
performing password 
synchronization.","type":"org.identityconnectors.common.security.GuardedByteArray","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"groupMemberAttribute","displayName":"Group
 Member Attribute","helpMessage":"The name of the group attribute that will be 
updated with the distinguished name of the user when the user is added to the 
group.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"failover","displayName":"Failover
 Servers","helpMessage":"List all servers that should be used for failover in 
case the preferred server fails. If the preferred server fails, JNDI will 
connect to the next available server in the list. List all servers in the form 
of 
 \"ldap://ldap.example.com:389/\";, which follows the standard LDAP v3 URLs 
described in RFC 2255. Only the host and port parts of the URL are relevant in 
this 
setting.","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"modifiersNamesToFilterOut","displayName":"Filter
 Out Changes By","helpMessage":"The names (DNs) of directory administrators to 
filter from the changes. Changes with the attribute \"modifiersName\" that 
match entries in this list will be filtered out. The standard value is the 
administrator name used by this adapter, to prevent loops. Entries should be of 
the format \"cn=Directory 
Manager\".","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"groupNameAttributes","displayName":"Group
 Name Attributes","helpMessage":"Attribute or attributes which holds the group 
name.","type
 
":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["cn"]},{"schema":{"name":"uidAttribute","displayName":"Uid
 Attribute","helpMessage":"The name of the LDAP attribute which is mapped to 
the Uid 
attribute.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["cn"]},{"schema":{"name":"respectResourcePasswordPolicyChangeAfterReset","displayName":"Respect
 Resource Password Policy Change-After-Reset","helpMessage":"When this resource 
is specified in a Login Module (i.e., this resource is a pass-through 
authentication target) and the resource password policy is configured for 
change-after-reset, a user whose resource account password has been 
administratively reset will be required to change that password after 
successfully 
authenticating.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":fals
 
e,"values":["false"]},{"schema":{"name":"filterWithOrInsteadOfAnd","displayName":"Filter
 with Or Instead of And","helpMessage":"Normally the the filter used to fetch 
change log entries is an and-based filter retrieving an interval of change 
entries. If this property is set, the filter will or together the required 
change numbers 
instead.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"principal","displayName":"Principal","helpMessage":"The
 distinguished name with which to authenticate to the LDAP 
server.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["uid=admin,ou=system"]},{"schema":{"name":"changeLogBlockSize","displayName":"Change
 Log Block Size","helpMessage":"The number of change log entries to fetch per 
query.","type":"int","required":true,"order":0,"confidential":false,"defaultValues":null},"overrida
 
ble":false,"values":[100]},{"schema":{"name":"baseContexts","displayName":"Base 
Contexts","helpMessage":"One or more starting points in the LDAP tree that will 
be used when searching the tree. Searches are performed when discovering users 
from the LDAP server or when looking for the groups of which a user is a 
member.","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["ou=people,o=isp","ou=groups,o=isp"]},{"schema":{"name":"passwordAttribute","displayName":"Password
 Attribute","helpMessage":"The name of the LDAP attribute which holds the 
password. When changing an user password, the new password is set to this 
attribute.","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["userpassword"]},{"schema":{"name":"changeNumberAttribute","displayName":"Change
 Number Attribute","helpMessage":"The name of the change number attribute in 
the c
 hange log 
entry.","type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["changeNumber"]},{"schema":{"name":"objectClassesToSynchronize","displayName":"Object
 Classes to Synchronize","helpMessage":"The object classes to synchronize. The 
change log is for all objects; this filters updates to just the listed object 
classes. You should not list the superclasses of an object class unless you 
intend to synchronize objects with any of the superclass values. For example, 
if only \"inetOrgPerson\" objects should be synchronized, but the superclasses 
of \"inetOrgPerson\" (\"person\", \"organizationalperson\" and \"top\") should 
be filtered out, then list only \"inetOrgPerson\" here. All objects in LDAP are 
subclassed from \"top\". For this reason, you should never list \"top\", 
otherwise no object would be 
filtered.","type":"[Ljava.lang.String;","required":true,"order":0,"confidential":false,"defaultValues":null},"overrida
 
ble":false,"values":["inetOrgPerson","groupOfUniqueNames"]},{"schema":{"name":"credentials","displayName":"Password","helpMessage":"Password
 for the 
principal.","type":"org.identityconnectors.common.security.GuardedString","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["secret"]},{"schema":{"name":"attributesToSynchronize","displayName":"Attributes
 to Synchronize","helpMessage":"The names of the attributes to synchronize. 
This ignores updates from the change log if they do not update any of the named 
attributes. For example, if only \"department\" is listed, then only changes 
that affect \"department\" will be processed. All other updates are ignored. If 
blank (the default), then all changes are 
processed.","type":"[Ljava.lang.String;","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"maintainPosixGroupMembership","displayName":"Maintain
 POSIX Group Membership
 ","helpMessage":"When enabled and a user is renamed or deleted, update any 
POSIX groups to which the user belongs to reflect the new name. Otherwise, the 
LDAP resource must maintain referential integrity with respect to group 
membership.","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["truemaintainLdapGroupMembership"]}]'/>
   <ConnInstance_capabilities ConnInstance_id="100" 
capability="ONE_PHASE_CREATE"/>
   <ConnInstance_capabilities ConnInstance_id="100" 
capability="ONE_PHASE_UPDATE"/>
   <ConnInstance_capabilities ConnInstance_id="100" 
capability="ONE_PHASE_DELETE"/>

http://git-wip-us.apache.org/repos/asf/syncope/blob/02456545/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
index 53cae3e..1fdbcb5 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
@@ -23,12 +23,14 @@ import java.util.List;
 import java.util.Set;
 import org.apache.syncope.common.lib.types.PropagationMode;
 import org.apache.syncope.common.lib.types.ResourceOperation;
+import org.apache.syncope.core.persistence.api.dao.search.OrderByClause;
 import org.apache.syncope.core.persistence.api.entity.ConnInstance;
 import org.apache.syncope.core.persistence.api.entity.resource.MappingItem;
 import org.identityconnectors.framework.common.objects.Attribute;
 import org.identityconnectors.framework.common.objects.ConnectorObject;
 import org.identityconnectors.framework.common.objects.ObjectClass;
 import org.identityconnectors.framework.common.objects.OperationOptions;
+import org.identityconnectors.framework.common.objects.ResultsHandler;
 import org.identityconnectors.framework.common.objects.SyncResultsHandler;
 import org.identityconnectors.framework.common.objects.SyncToken;
 import org.identityconnectors.framework.common.objects.Uid;
@@ -91,7 +93,16 @@ public interface Connector {
             Uid uid, OperationOptions options, Set<String> 
propagationAttempted);
 
     /**
-     * Sync users / groups from a connector instance.
+     * Fetches all remote objects (for use during full reconciliation).
+     *
+     * @param objectClass ConnId's object class.
+     * @param handler to be used to handle deltas.
+     * @param options ConnId's OperationOptions.
+     */
+    void getAllObjects(ObjectClass objectClass, SyncResultsHandler handler, 
OperationOptions options);
+
+    /**
+     * Sync remote objects from a connector instance.
      *
      * @param objectClass ConnId's object class
      * @param token to be passed to the underlying connector
@@ -129,28 +140,46 @@ public interface Connector {
      * @param options ConnId's OperationOptions
      * @return ConnId's connector object for given uid
      */
-    ConnectorObject getObject(PropagationMode propagationMode, 
ResourceOperation operationType, ObjectClass objectClass,
-            Uid uid, OperationOptions options);
+    ConnectorObject getObject(
+            PropagationMode propagationMode,
+            ResourceOperation operationType,
+            ObjectClass objectClass,
+            Uid uid,
+            OperationOptions options);
 
     /**
      * Search for remote objects.
      *
      * @param objectClass ConnId's object class
      * @param filter search filter
+     * @param handler class responsible for working with the objects returned 
from the search; may be null.
      * @param options ConnId's OperationOptions
-     * @return ConnId's connector objects matching the given filter
      */
-    List<ConnectorObject> search(ObjectClass objectClass, Filter filter, 
OperationOptions options);
+    void search(
+            ObjectClass objectClass,
+            Filter filter,
+            ResultsHandler handler,
+            OperationOptions options);
 
     /**
-     * Get remote object used by the propagation manager in order to choose 
for a create (object doesn't exist) or an
-     * update (object exists).
+     * Search for remote objects.
      *
-     * @param objectClass ConnId's object class.
-     * @param handler to be used to handle deltas.
-     * @param options ConnId's OperationOptions.
-     */
-    void getAllObjects(ObjectClass objectClass, SyncResultsHandler handler, 
OperationOptions options);
+     * @param objectClass ConnId's object class
+     * @param filter search filter
+     * @param handler class responsible for working with the objects returned 
from the search; may be null.
+     * @param pageSize requested page results page size
+     * @param pagedResultsCookie an opaque cookie which is used by the 
connector to track its position in the set of
+     * query results
+     * @param orderBy the sort keys which should be used for ordering the 
{@link ConnectorObject} returned by
+     * search request
+     */
+    void search(
+            ObjectClass objectClass,
+            Filter filter,
+            ResultsHandler handler,
+            int pageSize,
+            String pagedResultsCookie,
+            List<OrderByClause> orderBy);
 
     /**
      * Read attribute for a given connector object.

http://git-wip-us.apache.org/repos/asf/syncope/blob/02456545/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnIdBundleManagerImpl.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnIdBundleManagerImpl.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnIdBundleManagerImpl.java
index 866f41f..40ff432 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnIdBundleManagerImpl.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnIdBundleManagerImpl.java
@@ -267,13 +267,10 @@ public class ConnIdBundleManagerImpl implements 
ConnIdBundleManager {
         }
 
         // create default configuration
-        final APIConfiguration apiConfig = 
info.createDefaultAPIConfiguration();
-        if (apiConfig == null) {
-            throw new NotFoundException("Default API configuration");
-        }
+        APIConfiguration apiConfig = info.createDefaultAPIConfiguration();
 
         // retrieve the ConfigurationProperties.
-        final ConfigurationProperties properties = 
apiConfig.getConfigurationProperties();
+        ConfigurationProperties properties = 
apiConfig.getConfigurationProperties();
         if (properties == null) {
             throw new NotFoundException("Configuration properties");
         }

http://git-wip-us.apache.org/repos/asf/syncope/blob/02456545/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
index bcea03d..3f53f2b 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
@@ -27,7 +27,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-import javax.ws.rs.NotFoundException;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Transformer;
 import org.apache.syncope.common.lib.types.ConnConfProperty;
 import org.apache.syncope.common.lib.types.ConnectorCapability;
 import org.apache.syncope.common.lib.types.PropagationMode;
@@ -38,6 +39,7 @@ import 
org.apache.syncope.core.provisioning.api.ConnPoolConfUtils;
 import org.apache.syncope.core.provisioning.api.Connector;
 import org.apache.syncope.core.provisioning.api.TimeoutException;
 import org.apache.syncope.core.misc.spring.ApplicationContextProvider;
+import org.apache.syncope.core.persistence.api.dao.search.OrderByClause;
 import org.apache.syncope.core.persistence.api.entity.resource.MappingItem;
 import org.identityconnectors.common.security.GuardedByteArray;
 import org.identityconnectors.common.security.GuardedString;
@@ -54,12 +56,15 @@ import 
org.identityconnectors.framework.common.objects.OperationOptions;
 import org.identityconnectors.framework.common.objects.OperationOptionsBuilder;
 import org.identityconnectors.framework.common.objects.OperationalAttributes;
 import org.identityconnectors.framework.common.objects.ResultsHandler;
+import org.identityconnectors.framework.common.objects.SearchResult;
+import org.identityconnectors.framework.common.objects.SortKey;
 import org.identityconnectors.framework.common.objects.SyncDeltaBuilder;
 import org.identityconnectors.framework.common.objects.SyncDeltaType;
 import org.identityconnectors.framework.common.objects.SyncResultsHandler;
 import org.identityconnectors.framework.common.objects.SyncToken;
 import org.identityconnectors.framework.common.objects.Uid;
 import org.identityconnectors.framework.common.objects.filter.Filter;
+import org.identityconnectors.framework.spi.SearchResultsHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,6 +74,8 @@ public class ConnectorFacadeProxy implements Connector {
 
     private static final Logger LOG = 
LoggerFactory.getLogger(ConnectorFacadeProxy.class);
 
+    private static final Integer DEFAULT_PAGE_SIZE = 100;
+
     /**
      * Connector facade wrapped instance.
      */
@@ -100,6 +107,8 @@ public class ConnectorFacadeProxy implements Connector {
 
         // create default configuration
         APIConfiguration apiConfig = info.createDefaultAPIConfiguration();
+        // enable filtered results handler in validation mode
+        
apiConfig.getResultsHandlerConfiguration().setFilteredResultsHandlerInValidationMode(true);
 
         // set connector configuration according to conninstance's
         ConfigurationProperties properties = 
apiConfig.getConfigurationProperties();
@@ -122,9 +131,6 @@ public class ConnectorFacadeProxy implements Connector {
 
         // gets new connector, with the given configuration
         connector = 
ConnectorFacadeFactory.getInstance().newInstance(apiConfig);
-        if (connector == null) {
-            throw new NotFoundException("Connector");
-        }
 
         // make sure we have set up the Configuration properly
         connector.validate();
@@ -308,37 +314,34 @@ public class ConnectorFacadeProxy implements Connector {
     public ConnectorObject getObject(final PropagationMode propagationMode, 
final ResourceOperation operationType,
             final ObjectClass objectClass, final Uid uid, final 
OperationOptions options) {
 
-        Future<ConnectorObject> future = null;
+        boolean hasCapablities = false;
 
         if 
(activeConnInstance.getCapabilities().contains(ConnectorCapability.SEARCH)) {
             if (operationType == null) {
-                future = asyncFacade.getObject(connector, objectClass, uid, 
options);
+                hasCapablities = true;
             } else {
                 switch (operationType) {
                     case CREATE:
-                        if (propagationMode == null || (propagationMode == 
PropagationMode.ONE_PHASE
-                                ? activeConnInstance.getCapabilities().
-                                contains(ConnectorCapability.ONE_PHASE_CREATE)
-                                : activeConnInstance.getCapabilities().
-                                
contains(ConnectorCapability.TWO_PHASES_CREATE))) {
-
-                            future = asyncFacade.getObject(connector, 
objectClass, uid, options);
-                        }
+                        hasCapablities = propagationMode == null || 
(propagationMode == PropagationMode.ONE_PHASE
+                                ? 
activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_CREATE)
+                                : 
activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_CREATE));
                         break;
-                    case UPDATE:
-                        if (propagationMode == null || (propagationMode == 
PropagationMode.ONE_PHASE
-                                ? activeConnInstance.getCapabilities().
-                                contains(ConnectorCapability.ONE_PHASE_UPDATE)
-                                : activeConnInstance.getCapabilities().
-                                
contains(ConnectorCapability.TWO_PHASES_UPDATE))) {
 
-                            future = asyncFacade.getObject(connector, 
objectClass, uid, options);
-                        }
+                    case UPDATE:
+                        hasCapablities = propagationMode == null || 
(propagationMode == PropagationMode.ONE_PHASE
+                                ? 
activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_UPDATE)
+                                : 
activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_UPDATE));
                         break;
+
                     default:
-                        future = asyncFacade.getObject(connector, objectClass, 
uid, options);
+                        hasCapablities = true;
                 }
             }
+        }
+
+        Future<ConnectorObject> future = null;
+        if (hasCapablities) {
+            future = asyncFacade.getObject(connector, objectClass, uid, 
options);
         } else {
             LOG.info("Search was attempted, although the connector only has 
these capabilities: {}. No action.",
                     activeConnInstance.getCapabilities());
@@ -362,23 +365,6 @@ public class ConnectorFacadeProxy implements Connector {
     }
 
     @Override
-    public List<ConnectorObject> search(
-            final ObjectClass objectClass, final Filter filter, final 
OperationOptions options) {
-
-        final List<ConnectorObject> result = new ArrayList<>();
-
-        search(objectClass, filter, new ResultsHandler() {
-
-            @Override
-            public boolean handle(final ConnectorObject obj) {
-                return result.add(obj);
-            }
-        }, options);
-
-        return result;
-    }
-
-    @Override
     public void getAllObjects(
             final ObjectClass objectClass, final SyncResultsHandler handler, 
final OperationOptions options) {
 
@@ -509,14 +495,43 @@ public class ConnectorFacadeProxy implements Connector {
         }
     }
 
-    private void search(
+    @Override
+    public void search(
             final ObjectClass objectClass,
             final Filter filter,
             final ResultsHandler handler,
             final OperationOptions options) {
 
         if 
(activeConnInstance.getCapabilities().contains(ConnectorCapability.SEARCH)) {
-            connector.search(objectClass, filter, handler, options);
+            if (options.getPageSize() == null && 
options.getPagedResultsCookie() == null) {
+                OperationOptionsBuilder builder = new 
OperationOptionsBuilder(options);
+                builder.setPageSize(DEFAULT_PAGE_SIZE);
+
+                final String[] cookies = new String[] { null };
+                do {
+                    if (cookies[0] != null) {
+                        builder.setPagedResultsCookie(cookies[0]);
+                    }
+
+                    connector.search(objectClass, filter, new 
SearchResultsHandler() {
+
+                        @Override
+                        public void handleResult(final SearchResult result) {
+                            if (handler instanceof SearchResultsHandler) {
+                                
SearchResultsHandler.class.cast(handler).handleResult(result);
+                            }
+                            cookies[0] = result.getPagedResultsCookie();
+                        }
+
+                        @Override
+                        public boolean handle(final ConnectorObject 
connectorObject) {
+                            return handler.handle(connectorObject);
+                        }
+                    }, builder.build());
+                } while (cookies[0] != null);
+            } else {
+                connector.search(objectClass, filter, handler, options);
+            }
         } else {
             LOG.info("Search was attempted, although the connector only has 
these capabilities: {}. No action.",
                     activeConnInstance.getCapabilities());
@@ -524,6 +539,30 @@ public class ConnectorFacadeProxy implements Connector {
     }
 
     @Override
+    public void search(
+            final ObjectClass objectClass,
+            final Filter filter,
+            final ResultsHandler handler,
+            final int pageSize,
+            final String pagedResultsCookie,
+            final List<OrderByClause> orderBy) {
+
+        OperationOptionsBuilder builder = new 
OperationOptionsBuilder().setPageSize(pageSize);
+        if (pagedResultsCookie != null) {
+            builder.setPagedResultsCookie(pagedResultsCookie);
+        }
+        builder.setSortKeys(CollectionUtils.collect(orderBy, new 
Transformer<OrderByClause, SortKey>() {
+
+            @Override
+            public SortKey transform(final OrderByClause clause) {
+                return new SortKey(clause.getField(), clause.getDirection() == 
OrderByClause.Direction.ASC);
+            }
+        }, new ArrayList<SortKey>(orderBy.size())));
+
+        search(objectClass, filter, handler, builder.build());
+    }
+
+    @Override
     public ConnInstance getActiveConnInstance() {
         return activeConnInstance;
     }
@@ -533,9 +572,9 @@ public class ConnectorFacadeProxy implements Connector {
         // -------------------------------------
         // Ask just for mapped attributes
         // -------------------------------------
-        final OperationOptionsBuilder oob = new OperationOptionsBuilder();
+        OperationOptionsBuilder builder = new OperationOptionsBuilder();
 
-        final Set<String> attrsToGet = new HashSet<>();
+        Set<String> attrsToGet = new HashSet<>();
         attrsToGet.add(Name.NAME);
         attrsToGet.add(Uid.NAME);
         attrsToGet.add(OperationalAttributes.ENABLE_NAME);
@@ -544,17 +583,17 @@ public class ConnectorFacadeProxy implements Connector {
             attrsToGet.add(item.getExtAttrName());
         }
 
-        oob.setAttributesToGet(attrsToGet);
+        builder.setAttributesToGet(attrsToGet);
         // -------------------------------------
 
-        return oob.build();
+        return builder.build();
     }
 
     private Object getPropertyValue(final String propType, final List<?> 
values) {
         Object value = null;
 
         try {
-            final Class<?> propertySchemaClass = ClassUtils.forName(propType, 
ClassUtils.getDefaultClassLoader());
+            Class<?> propertySchemaClass = ClassUtils.forName(propType, 
ClassUtils.getDefaultClassLoader());
 
             if (GuardedString.class.equals(propertySchemaClass)) {
                 value = new 
GuardedString(values.get(0).toString().toCharArray());

http://git-wip-us.apache.org/repos/asf/syncope/blob/02456545/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncUtils.java
----------------------------------------------------------------------
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncUtils.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncUtils.java
index 642181f..6fe699b 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncUtils.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/sync/SyncUtils.java
@@ -55,6 +55,7 @@ import 
org.identityconnectors.framework.common.objects.AttributeUtil;
 import org.identityconnectors.framework.common.objects.ConnectorObject;
 import org.identityconnectors.framework.common.objects.Name;
 import org.identityconnectors.framework.common.objects.OperationalAttributes;
+import org.identityconnectors.framework.common.objects.ResultsHandler;
 import org.identityconnectors.framework.common.objects.filter.EqualsFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -116,9 +117,18 @@ public class SyncUtils {
 
         AnyUtils anyUtils = anyUtilsFactory.getInstance(anyType.getKind());
 
-        List<ConnectorObject> found = 
connector.search(provision.getObjectClass(),
-                new EqualsFilter(new Name(name)), 
connector.getOperationOptions(
-                        MappingUtils.getMappingItems(provision, 
MappingPurpose.SYNCHRONIZATION)));
+        final List<ConnectorObject> found = new ArrayList<>();
+        connector.search(
+                provision.getObjectClass(),
+                new EqualsFilter(new Name(name)),
+                new ResultsHandler() {
+
+                    @Override
+                    public boolean handle(final ConnectorObject obj) {
+                        return found.add(obj);
+                    }
+                },
+                
connector.getOperationOptions(MappingUtils.getMappingItems(provision, 
MappingPurpose.SYNCHRONIZATION)));
 
         if (found.isEmpty()) {
             LOG.debug("No {} found on {} with __NAME__ {}", 
provision.getObjectClass(), resource, name);

http://git-wip-us.apache.org/repos/asf/syncope/blob/02456545/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
----------------------------------------------------------------------
diff --git 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
index 179e021..408fb04 100644
--- 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
+++ 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java
@@ -21,24 +21,32 @@ package org.apache.syncope.core.rest.cxf.service;
 import java.net.URI;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
+import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.BulkAction;
 import org.apache.syncope.common.lib.to.BulkActionResult;
 import org.apache.syncope.common.lib.to.ConnObjectTO;
+import org.apache.syncope.common.lib.to.PagedConnObjectTOResult;
 import org.apache.syncope.common.lib.to.ResourceTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
 import org.apache.syncope.common.lib.types.ResourceDeassociationActionType;
 import org.apache.syncope.common.lib.wrap.AnyKey;
 import org.apache.syncope.common.lib.wrap.BooleanWrap;
 import org.apache.syncope.common.rest.api.RESTHeaders;
+import org.apache.syncope.common.rest.api.beans.ConnObjectTOListQuery;
 import org.apache.syncope.common.rest.api.service.ResourceService;
 import org.apache.syncope.core.logic.AbstractResourceAssociator;
 import org.apache.syncope.core.logic.AnyObjectLogic;
 import org.apache.syncope.core.logic.ResourceLogic;
 import org.apache.syncope.core.logic.GroupLogic;
 import org.apache.syncope.core.logic.UserLogic;
+import org.identityconnectors.framework.common.objects.SearchResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -92,6 +100,36 @@ public class ResourceServiceImpl extends 
AbstractServiceImpl implements Resource
     }
 
     @Override
+    public PagedConnObjectTOResult listConnObjects(
+            final String key, final String anyTypeKey, final 
ConnObjectTOListQuery listQuery) {
+
+        Pair<SearchResult, List<ConnObjectTO>> list = 
logic.listConnObjects(key, anyTypeKey,
+                listQuery.getSize(), listQuery.getPagedResultsCookie(), 
getOrderByClauses(listQuery.getOrderBy()));
+
+        PagedConnObjectTOResult result = new PagedConnObjectTOResult();
+        if (list.getLeft() != null) {
+            
result.setAllResultsReturned(list.getLeft().isAllResultsReturned());
+            
result.setPagedResultsCookie(list.getLeft().getPagedResultsCookie());
+            
result.setRemainingPagedResults(list.getLeft().getRemainingPagedResults());
+        }
+        result.getResult().addAll(list.getRight());
+
+        UriBuilder builder = uriInfo.getAbsolutePathBuilder();
+        MultivaluedMap<String, String> queryParams = 
uriInfo.getQueryParameters();
+        for (Map.Entry<String, List<String>> queryParam : 
queryParams.entrySet()) {
+            builder = builder.queryParam(queryParam.getKey(), 
queryParam.getValue().toArray());
+        }
+
+        if (StringUtils.isNotBlank(result.getPagedResultsCookie())) {
+            result.setNext(builder.
+                    replaceQueryParam(PARAM_CONNID_PAGED_RESULTS_COOKIE, 
result.getPagedResultsCookie()).
+                    build());
+        }
+
+        return result;
+    }
+
+    @Override
     public BooleanWrap check(final ResourceTO resourceTO) {
         BooleanWrap result = new BooleanWrap();
         result.setElement(logic.check(resourceTO));

http://git-wip-us.apache.org/repos/asf/syncope/blob/02456545/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java
----------------------------------------------------------------------
diff --git 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java
 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java
index 6242d96..99aa93b 100644
--- 
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java
+++ 
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ResourceITCase.java
@@ -26,16 +26,24 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.security.AccessControlException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import javax.ws.rs.core.Response;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Transformer;
+import org.apache.syncope.client.lib.SyncopeClient;
+import org.apache.syncope.client.lib.builders.ConnObjectTOListQueryBuilder;
 import org.apache.syncope.common.lib.SyncopeClientException;
 import org.apache.syncope.common.lib.to.BulkAction;
+import org.apache.syncope.common.lib.to.ConnObjectTO;
+import org.apache.syncope.common.lib.to.GroupTO;
 import org.apache.syncope.common.lib.to.MappingItemTO;
 import org.apache.syncope.common.lib.to.MappingTO;
+import org.apache.syncope.common.lib.to.PagedConnObjectTOResult;
 import org.apache.syncope.common.lib.to.ProvisionTO;
 import org.apache.syncope.common.lib.to.ResourceTO;
 import org.apache.syncope.common.lib.types.AnyTypeKind;
@@ -502,6 +510,77 @@ public class ResourceITCase extends AbstractITCase {
     }
 
     @Test
+    public void anonymous() {
+        ResourceService unauthenticated = 
clientFactory.createAnonymous().getService(ResourceService.class);
+        try {
+            unauthenticated.list();
+            fail();
+        } catch (AccessControlException e) {
+            assertNotNull(e);
+        }
+
+        ResourceService anonymous = clientFactory.create(ANONYMOUS_UNAME, 
ANONYMOUS_KEY).
+                getService(ResourceService.class);
+        assertFalse(anonymous.list().isEmpty());
+    }
+
+    @Test
+    public void listConnObjects() {
+        List<Long> groupKeys = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            GroupTO group = GroupITCase.getSampleTO("group");
+            group.getResources().add(RESOURCE_NAME_LDAP);
+            group = createGroup(group);
+            groupKeys.add(group.getKey());
+        }
+
+        int totalRead = 0;
+        Set<String> read = new HashSet<>();
+        try {
+            ConnObjectTOListQueryBuilder builder = 
SyncopeClient.getConnObjectTOListQueryBuilder().size(10);
+            PagedConnObjectTOResult list;
+            do {
+                list = null;
+
+                boolean succeeded = false;
+                // needed because ApacheDS seems to randomly fail when 
searching with cookie
+                for (int i = 0; i < 5 && !succeeded; i++) {
+                    try {
+                        list = resourceService.listConnObjects(
+                                RESOURCE_NAME_LDAP,
+                                AnyTypeKind.GROUP.name(),
+                                builder.build());
+                        succeeded = true;
+                    } catch (SyncopeClientException e) {
+                        assertEquals(ClientExceptionType.ConnectorException, 
e.getType());
+                    }
+                }
+                assertNotNull(list);
+
+                totalRead += list.getResult().size();
+                CollectionUtils.collect(list.getResult(), new 
Transformer<ConnObjectTO, String>() {
+
+                    @Override
+                    public String transform(final ConnObjectTO input) {
+                        return 
input.getPlainAttrMap().get("__NAME__").getValues().get(0);
+                    }
+                }, read);
+
+                if (list.getPagedResultsCookie() != null) {
+                    builder.pagedResultsCookie(list.getPagedResultsCookie());
+                }
+            } while (list.getPagedResultsCookie() != null);
+            
+            assertEquals(totalRead, read.size());
+            assertTrue(totalRead >= 10);
+        } finally {
+            for (Long key : groupKeys) {
+                groupService.delete(key);
+            }
+        }
+    }
+
+    @Test
     public void issueSYNCOPE360() {
         final String name = "SYNCOPE360-" + getUUIDString();
         resourceService.create(buildResourceTO(name));
@@ -566,21 +645,6 @@ public class ResourceITCase extends AbstractITCase {
     }
 
     @Test
-    public void anonymous() {
-        ResourceService unauthenticated = 
clientFactory.createAnonymous().getService(ResourceService.class);
-        try {
-            unauthenticated.list();
-            fail();
-        } catch (AccessControlException e) {
-            assertNotNull(e);
-        }
-
-        ResourceService anonymous = clientFactory.create(ANONYMOUS_UNAME, 
ANONYMOUS_KEY).
-                getService(ResourceService.class);
-        assertFalse(anonymous.list().isEmpty());
-    }
-
-    @Test
     public void issueSYNCOPE493() {
         // create resource with attribute mapping set to NONE and check its 
propagation
         String resourceName = RESOURCE_NAME_CREATE_NONE;

http://git-wip-us.apache.org/repos/asf/syncope/blob/02456545/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b121bc..a1e03ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,11 +319,11 @@ under the License.
   <properties>
     <syncope.version>${project.version}</syncope.version>
 
-    <connid.version>1.4.1.0</connid.version>
+    <connid.version>1.4.2.0-SNAPSHOT</connid.version>
     <connid.soap.version>1.4.0-SNAPSHOT</connid.soap.version>
     <connid.database.version>2.2.3-SNAPSHOT</connid.database.version>
     <connid.csvdir.version>0.8.2</connid.csvdir.version>
-    <connid.ldap.version>1.4.0</connid.ldap.version>
+    <connid.ldap.version>1.5.0-SNAPSHOT</connid.ldap.version>
     <connid.ad.version>1.2.3</connid.ad.version>
 
     <cxf.version>3.1.3-SNAPSHOT</cxf.version>

Reply via email to