You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2015/09/24 14:59:37 UTC
[1/4] syncope git commit: [SYNCOPE-697] No more PHASES
Repository: syncope
Updated Branches:
refs/heads/master c14a20d74 -> ceea93c0d
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/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 023b840..cce2ec8 100644
--- a/core/persistence-jpa/src/test/resources/domains/TwoContent.xml
+++ b/core/persistence-jpa/src/test/resources/domains/TwoContent.xml
@@ -112,9 +112,9 @@ under the License.
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":"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"/>
+ <ConnInstance_capabilities ConnInstance_id="100" capability="CREATE"/>
+ <ConnInstance_capabilities ConnInstance_id="100" capability="UPDATE"/>
+ <ConnInstance_capabilities ConnInstance_id="100" capability="DELETE"/>
<ConnInstance_capabilities ConnInstance_id="100" capability="SEARCH"/>
</dataset>
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/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 1fdbcb5..1be141f 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
@@ -21,7 +21,6 @@ package org.apache.syncope.core.provisioning.api;
import java.util.Collection;
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;
@@ -54,21 +53,20 @@ public interface Connector {
/**
* Create user / group on a connector instance.
*
- * @param propagationMode propagation mode
* @param objectClass ConnId's object class
* @param attrs attributes for creation
* @param options ConnId's OperationOptions
* @param propagationAttempted if creation is actually performed (based on connector instance's capabilities)
* @return Uid for created object
*/
- Uid create(PropagationMode propagationMode, ObjectClass objectClass,
- Set<Attribute> attrs, OperationOptions options,
+ Uid create(ObjectClass objectClass,
+ Set<Attribute> attrs,
+ OperationOptions options,
Set<String> propagationAttempted);
/**
* Update user / group on a connector instance.
*
- * @param propagationMode propagation mode
* @param objectClass ConnId's object class
* @param uid user to be updated
* @param attrs attributes for update
@@ -76,20 +74,21 @@ public interface Connector {
* @param propagationAttempted if update is actually performed (based on connector instance's capabilities)
* @return Uid for updated object
*/
- Uid update(PropagationMode propagationMode, ObjectClass objectClass,
- Uid uid, Set<Attribute> attrs, OperationOptions options,
+ Uid update(ObjectClass objectClass,
+ Uid uid,
+ Set<Attribute> attrs,
+ OperationOptions options,
Set<String> propagationAttempted);
/**
* Delete user / group on a connector instance.
*
- * @param propagationMode propagation mode
* @param objectClass ConnId's object class
* @param uid user to be deleted
* @param options ConnId's OperationOptions
* @param propagationAttempted if deletion is actually performed (based on connector instance's capabilities)
*/
- void delete(PropagationMode propagationMode, ObjectClass objectClass,
+ void delete(ObjectClass objectClass,
Uid uid, OperationOptions options, Set<String> propagationAttempted);
/**
@@ -133,7 +132,6 @@ public interface Connector {
* Get remote object used by the propagation manager in order to choose for a create (object doesn't exist) or an
* update (object exists).
*
- * @param propagationMode propagation mode
* @param operationType resource operation type
* @param objectClass ConnId's object class
* @param uid ConnId's Uid
@@ -141,7 +139,6 @@ public interface Connector {
* @return ConnId's connector object for given uid
*/
ConnectorObject getObject(
- PropagationMode propagationMode,
ResourceOperation operationType,
ObjectClass objectClass,
Uid uid,
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/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 3f53f2b..a28f44e 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
@@ -31,7 +31,6 @@ 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;
import org.apache.syncope.common.lib.types.ResourceOperation;
import org.apache.syncope.core.persistence.api.entity.ConnInstance;
import org.apache.syncope.core.provisioning.api.ConnIdBundleManager;
@@ -165,15 +164,15 @@ public class ConnectorFacadeProxy implements Connector {
}
@Override
- public Uid create(final PropagationMode propagationMode, final ObjectClass objectClass, final Set<Attribute> attrs,
- final OperationOptions options, final Set<String> propagationAttempted) {
+ public Uid create(
+ final ObjectClass objectClass,
+ final Set<Attribute> attrs,
+ final OperationOptions options,
+ final Set<String> propagationAttempted) {
Uid result = null;
- if (propagationMode == PropagationMode.ONE_PHASE
- ? activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_CREATE)
- : activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_CREATE)) {
-
+ if (activeConnInstance.getCapabilities().contains(ConnectorCapability.CREATE)) {
propagationAttempted.add("create");
Future<Uid> future = asyncFacade.create(connector, objectClass, attrs, options);
@@ -199,15 +198,16 @@ public class ConnectorFacadeProxy implements Connector {
}
@Override
- public Uid update(final PropagationMode propagationMode, final ObjectClass objectClass, final Uid uid,
- final Set<Attribute> attrs, final OperationOptions options, final Set<String> propagationAttempted) {
+ public Uid update(
+ final ObjectClass objectClass,
+ final Uid uid,
+ final Set<Attribute> attrs,
+ final OperationOptions options,
+ final Set<String> propagationAttempted) {
Uid result = null;
- if (propagationMode == PropagationMode.ONE_PHASE
- ? activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_UPDATE)
- : activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_UPDATE)) {
-
+ if (activeConnInstance.getCapabilities().contains(ConnectorCapability.UPDATE)) {
propagationAttempted.add("update");
Future<Uid> future = asyncFacade.update(connector, objectClass, uid, attrs, options);
@@ -235,13 +235,13 @@ public class ConnectorFacadeProxy implements Connector {
}
@Override
- public void delete(final PropagationMode propagationMode, final ObjectClass objectClass, final Uid uid,
- final OperationOptions options, final Set<String> propagationAttempted) {
-
- if (propagationMode == PropagationMode.ONE_PHASE
- ? activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_DELETE)
- : activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_DELETE)) {
+ public void delete(
+ final ObjectClass objectClass,
+ final Uid uid,
+ final OperationOptions options,
+ final Set<String> propagationAttempted) {
+ if (activeConnInstance.getCapabilities().contains(ConnectorCapability.DELETE)) {
propagationAttempted.add("delete");
Future<Uid> future = asyncFacade.delete(connector, objectClass, uid, options);
@@ -307,12 +307,15 @@ public class ConnectorFacadeProxy implements Connector {
@Override
public ConnectorObject getObject(final ObjectClass objectClass, final Uid uid, final OperationOptions options) {
- return getObject(null, null, objectClass, uid, options);
+ return getObject(null, objectClass, uid, options);
}
@Override
- public ConnectorObject getObject(final PropagationMode propagationMode, final ResourceOperation operationType,
- final ObjectClass objectClass, final Uid uid, final OperationOptions options) {
+ public ConnectorObject getObject(
+ final ResourceOperation operationType,
+ final ObjectClass objectClass,
+ final Uid uid,
+ final OperationOptions options) {
boolean hasCapablities = false;
@@ -322,15 +325,11 @@ public class ConnectorFacadeProxy implements Connector {
} else {
switch (operationType) {
case CREATE:
- hasCapablities = propagationMode == null || (propagationMode == PropagationMode.ONE_PHASE
- ? activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_CREATE)
- : activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_CREATE));
+ hasCapablities = activeConnInstance.getCapabilities().contains(ConnectorCapability.CREATE);
break;
case UPDATE:
- hasCapablities = propagationMode == null || (propagationMode == PropagationMode.ONE_PHASE
- ? activeConnInstance.getCapabilities().contains(ConnectorCapability.ONE_PHASE_UPDATE)
- : activeConnInstance.getCapabilities().contains(ConnectorCapability.TWO_PHASES_UPDATE));
+ hasCapablities = activeConnInstance.getCapabilities().contains(ConnectorCapability.UPDATE);
break;
default:
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
index 5821106..e5dfadf 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ResourceDataBinderImpl.java
@@ -108,8 +108,6 @@ public class ResourceDataBinderImpl implements ResourceDataBinder {
resource.setRandomPwdIfNotProvided(resourceTO.isRandomPwdIfNotProvided());
- resource.setPropagationMode(resourceTO.getPropagationMode());
-
// 1. add or update all (valid) provisions from TO
for (ProvisionTO provisionTO : resourceTO.getProvisions()) {
AnyType anyType = anyTypeDAO.find(provisionTO.getAnyType());
@@ -323,8 +321,6 @@ public class ResourceDataBinderImpl implements ResourceDataBinder {
resourceTO.setRandomPwdIfNotProvided(resource.isRandomPwdIfNotProvided());
- resourceTO.setPropagationMode(resource.getPropagationMode());
-
resourceTO.setCreateTraceLevel(resource.getCreateTraceLevel());
resourceTO.setUpdateTraceLevel(resource.getUpdateTraceLevel());
resourceTO.setDeleteTraceLevel(resource.getDeleteTraceLevel());
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
index 90d3dbc..4ccc0c4 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
@@ -29,7 +29,6 @@ import java.util.Set;
import org.apache.syncope.common.lib.types.AuditElements;
import org.apache.syncope.common.lib.types.AuditElements.Result;
import org.apache.syncope.common.lib.types.MappingPurpose;
-import org.apache.syncope.common.lib.types.PropagationMode;
import org.apache.syncope.common.lib.types.PropagationTaskExecStatus;
import org.apache.syncope.common.lib.types.TraceLevel;
import org.apache.syncope.core.persistence.api.dao.GroupDAO;
@@ -182,7 +181,6 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
if (beforeObj == null) {
LOG.debug("Create {} on {}", attributes, task.getResource().getKey());
connector.create(
- task.getResource().getPropagationMode(),
new ObjectClass(task.getObjectClassName()),
attributes,
null,
@@ -229,8 +227,8 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
// 3. provision entry
LOG.debug("Update {} on {}", strictlyModified, task.getResource().getKey());
- connector.update(task.getResource().getPropagationMode(), beforeObj.getObjectClass(),
- beforeObj.getUid(), strictlyModified, null, propagationAttempted);
+ connector.update(
+ beforeObj.getObjectClass(), beforeObj.getUid(), strictlyModified, null, propagationAttempted);
}
}
}
@@ -303,7 +301,6 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
LOG.debug("Delete {} on {}", beforeObj.getUid(), task.getResource().getKey());
connector.delete(
- task.getMode(),
beforeObj.getObjectClass(),
beforeObj.getUid(),
null,
@@ -359,9 +356,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
default:
}
- execution.setStatus(task.getMode() == PropagationMode.ONE_PHASE
- ? PropagationTaskExecStatus.SUCCESS.name()
- : PropagationTaskExecStatus.SUBMITTED.name());
+ execution.setStatus(PropagationTaskExecStatus.SUCCESS.name());
for (PropagationActions action : actions) {
action.after(task, execution, afterObj);
@@ -390,9 +385,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
}
try {
- execution.setStatus(task.getMode() == PropagationMode.ONE_PHASE
- ? PropagationTaskExecStatus.FAILURE.name()
- : PropagationTaskExecStatus.UNSUBMITTED.name());
+ execution.setStatus(PropagationTaskExecStatus.FAILURE.name());
} catch (Exception wft) {
LOG.error("While executing KO action on {}", execution, wft);
}
@@ -486,7 +479,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
protected boolean hasToBeregistered(final PropagationTask task, final TaskExec execution) {
boolean result;
- final boolean failed = !PropagationTaskExecStatus.valueOf(execution.getStatus()).isSuccessful();
+ boolean failed = PropagationTaskExecStatus.valueOf(execution.getStatus()) != PropagationTaskExecStatus.SUCCESS;
switch (task.getOperation()) {
@@ -530,7 +523,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
ConnectorObject obj = null;
try {
- obj = connector.getObject(task.getMode(),
+ obj = connector.getObject(
task.getOperation(),
new ObjectClass(task.getObjectClassName()),
new Uid(connObjectKey),
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
index 320de88..a3c4951 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
@@ -64,7 +64,7 @@ public class PriorityPropagationTaskExecutor extends AbstractPropagationTaskExec
LOG.error("Unexpected execution status found {}", execution.getStatus());
execStatus = PropagationTaskExecStatus.FAILURE;
}
- if (task.getResource().isPropagationPrimary() && !execStatus.isSuccessful()) {
+ if (task.getResource().isPropagationPrimary() && execStatus != PropagationTaskExecStatus.SUCCESS) {
result = Result.FAILURE;
throw new PropagationException(task.getResource().getKey(), execution.getMessage());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
index 53d55a9..b8bc838 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationManagerImpl.java
@@ -380,7 +380,6 @@ public class PropagationManagerImpl implements PropagationManager {
task.setAnyKey(any.getKey());
}
task.setOperation(operation);
- task.setMode(resource.getPropagationMode());
task.setOldConnObjectKey(propByRes.getOldConnObjectKey(resource.getKey()));
Pair<String, Set<Attribute>> preparedAttrs = MappingUtils.prepareAttrs(
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/ResourceDataBinderTest.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/ResourceDataBinderTest.java b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/ResourceDataBinderTest.java
index 13f1557..061b17a 100644
--- a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/ResourceDataBinderTest.java
+++ b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/ResourceDataBinderTest.java
@@ -30,7 +30,6 @@ import org.apache.syncope.common.lib.to.ResourceTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.IntMappingType;
import org.apache.syncope.common.lib.types.MappingPurpose;
-import org.apache.syncope.common.lib.types.PropagationMode;
import org.apache.syncope.core.persistence.api.dao.AnyTypeDAO;
import org.apache.syncope.core.persistence.api.dao.ExternalResourceDAO;
import org.apache.syncope.core.persistence.api.dao.PlainSchemaDAO;
@@ -78,7 +77,6 @@ public class ResourceDataBinderTest extends AbstractTest {
ResourceTO resourceTO = new ResourceTO();
resourceTO.setKey("resource-issue42");
resourceTO.setConnector(100L);
- resourceTO.setPropagationMode(PropagationMode.ONE_PHASE);
resourceTO.setEnforceMandatoryCondition(true);
ProvisionTO provisionTO = new ProvisionTO();
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
index 3744583..5da1042 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
@@ -27,13 +27,11 @@ import org.apache.syncope.common.lib.to.BulkAction;
import org.apache.syncope.common.lib.to.BulkActionResult;
import org.apache.syncope.common.lib.to.PagedResult;
import org.apache.syncope.common.lib.to.PushTaskTO;
-import org.apache.syncope.common.lib.to.ReportExecTO;
import org.apache.syncope.common.lib.to.SchedTaskTO;
import org.apache.syncope.common.lib.to.SyncTaskTO;
import org.apache.syncope.common.lib.to.TaskExecTO;
import org.apache.syncope.common.lib.types.JobAction;
import org.apache.syncope.common.lib.types.JobStatusType;
-import org.apache.syncope.common.lib.types.PropagationTaskExecStatus;
import org.apache.syncope.common.lib.types.TaskType;
import org.apache.syncope.common.rest.api.RESTHeaders;
import org.apache.syncope.common.rest.api.beans.TaskQuery;
@@ -110,13 +108,6 @@ public class TaskServiceImpl extends AbstractServiceImpl implements TaskService
}
@Override
- public void report(final Long executionKey, final ReportExecTO reportExec) {
- reportExec.setKey(executionKey);
- logic.report(
- executionKey, PropagationTaskExecStatus.fromString(reportExec.getStatus()), reportExec.getMessage());
- }
-
- @Override
public void update(final AbstractTaskTO taskTO) {
if (taskTO instanceof SyncTaskTO) {
logic.updateSync((SyncTaskTO) taskTO);
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ConnectorITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ConnectorITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ConnectorITCase.java
index 194de73..cc97936 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ConnectorITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/ConnectorITCase.java
@@ -149,9 +149,8 @@ public class ConnectorITCase extends AbstractITCase {
connectorTO.getConfiguration().addAll(conf);
// set connector capabilities
- connectorTO.getCapabilities().add(ConnectorCapability.TWO_PHASES_CREATE);
- connectorTO.getCapabilities().add(ConnectorCapability.ONE_PHASE_CREATE);
- connectorTO.getCapabilities().add(ConnectorCapability.TWO_PHASES_UPDATE);
+ connectorTO.getCapabilities().add(ConnectorCapability.CREATE);
+ connectorTO.getCapabilities().add(ConnectorCapability.UPDATE);
// set connector pool conf
ConnPoolConfTO cpc = new ConnPoolConfTO();
@@ -180,7 +179,7 @@ public class ConnectorITCase extends AbstractITCase {
Throwable t = null;
// check update
- actual.getCapabilities().remove(ConnectorCapability.TWO_PHASES_UPDATE);
+ actual.getCapabilities().remove(ConnectorCapability.UPDATE);
actual.getPoolConf().setMaxObjects(null);
try {
@@ -193,8 +192,7 @@ public class ConnectorITCase extends AbstractITCase {
assertNull(t);
assertNotNull(actual);
- assertEquals(EnumSet.of(ConnectorCapability.ONE_PHASE_CREATE, ConnectorCapability.TWO_PHASES_CREATE),
- actual.getCapabilities());
+ assertEquals(EnumSet.of(ConnectorCapability.CREATE), actual.getCapabilities());
assertEquals(10, actual.getPoolConf().getMaxObjects(), 0);
// check also for the deletion of the created object
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java
index c78f47b..c1ce3b0 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/MultitenancyITCase.java
@@ -21,7 +21,6 @@ package org.apache.syncope.fit.core.reference;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.security.AccessControlException;
@@ -202,7 +201,7 @@ public class MultitenancyITCase extends AbstractITCase {
// verify execution status
String status = execution.getStatus();
assertNotNull(status);
- assertTrue(PropagationTaskExecStatus.valueOf(status).isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(status));
// verify that synchronized user is found
PagedResult<UserTO> matchingUsers = adminClient.getService(UserService.class).search(
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java
index 3125841..4115bfa 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PropagationTaskITCase.java
@@ -25,17 +25,13 @@ import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.List;
-import javax.ws.rs.core.Response;
import org.apache.syncope.client.lib.SyncopeClient;
-import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.to.AbstractTaskTO;
import org.apache.syncope.common.lib.to.BulkAction;
import org.apache.syncope.common.lib.to.PagedResult;
import org.apache.syncope.common.lib.to.PropagationTaskTO;
-import org.apache.syncope.common.lib.to.ReportExecTO;
import org.apache.syncope.common.lib.to.TaskExecTO;
import org.apache.syncope.common.lib.to.UserTO;
-import org.apache.syncope.common.lib.types.PropagationTaskExecStatus;
import org.apache.syncope.common.lib.types.TaskType;
import org.junit.FixMethodOrder;
import org.junit.Test;
@@ -89,34 +85,6 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
}
@Test
- public void deal() {
- // Currently test is not re-runnable.
- // To successfully run test second time it is necessary to restart cargo
- try {
- taskService.delete(0L);
- } catch (SyncopeClientException e) {
- assertEquals(Response.Status.NOT_FOUND, e.getType().getResponseStatus());
- }
- TaskExecTO exec = taskService.execute(1L, false);
- assertEquals(PropagationTaskExecStatus.SUBMITTED.name(), exec.getStatus());
-
- ReportExecTO report = new ReportExecTO();
- report.setStatus(PropagationTaskExecStatus.SUCCESS.name());
- report.setMessage("OK");
- taskService.report(exec.getKey(), report);
- exec = taskService.readExecution(exec.getKey());
- assertEquals(PropagationTaskExecStatus.SUCCESS.name(), exec.getStatus());
- assertEquals("OK", exec.getMessage());
-
- taskService.delete(1L);
- try {
- taskService.readExecution(exec.getKey());
- } catch (SyncopeClientException e) {
- assertEquals(Response.Status.NOT_FOUND, e.getType().getResponseStatus());
- }
- }
-
- @Test
public void issue196() {
TaskExecTO exec = taskService.execute(6L, false);
assertNotNull(exec);
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java
index 5ddcae4..d980345 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/PushTaskITCase.java
@@ -326,7 +326,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
// execute the new task
TaskExecTO pushExec = execProvisioningTask(taskService, push.getKey(), 50, false);
- assertTrue(PropagationTaskExecStatus.valueOf(pushExec.getStatus()).isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(pushExec.getStatus()));
} finally {
groupService.delete(groupTO.getKey());
if (newResourceTO != null) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java
index f4db643..eaff578 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/SyncTaskITCase.java
@@ -253,7 +253,7 @@ public class SyncTaskITCase extends AbstractTaskITCase {
// update sync task
TaskExecTO execution = execProvisioningTask(taskService, 7L, 50, false);
assertNotNull(execution.getStatus());
- assertTrue(PropagationTaskExecStatus.valueOf(execution.getStatus()).isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(execution.getStatus()));
UserTO userTO = readUser("testuser1");
assertNotNull(userTO);
@@ -267,7 +267,7 @@ public class SyncTaskITCase extends AbstractTaskITCase {
// re-execute the same SyncTask: now user must be active
execution = execProvisioningTask(taskService, 7L, 50, false);
assertNotNull(execution.getStatus());
- assertTrue(PropagationTaskExecStatus.valueOf(execution.getStatus()).isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(execution.getStatus()));
userTO = readUser("testuser1");
assertNotNull(userTO);
@@ -317,9 +317,7 @@ public class SyncTaskITCase extends AbstractTaskITCase {
TaskExecTO execution = execProvisioningTask(taskService, 11L, 50, false);
// 1. verify execution status
- String status = execution.getStatus();
- assertNotNull(status);
- assertTrue(PropagationTaskExecStatus.valueOf(status).isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(execution.getStatus()));
// 2. verify that synchronized group is found
PagedResult<GroupTO> matchingGroups = groupService.search(
@@ -455,9 +453,7 @@ public class SyncTaskITCase extends AbstractTaskITCase {
assertFalse(((UserTO) actual.getTemplates().get(AnyTypeKind.USER.name())).getMemberships().isEmpty());
TaskExecTO execution = execProvisioningTask(taskService, actual.getKey(), 50, false);
- final String status = execution.getStatus();
- assertNotNull(status);
- assertTrue(PropagationTaskExecStatus.valueOf(status).isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(execution.getStatus()));
userTO = readUser("testuser2");
assertNotNull(userTO);
@@ -560,12 +556,12 @@ public class SyncTaskITCase extends AbstractTaskITCase {
try {
assertNotNull(userTO);
assertEquals(1, userTO.getPropagationStatusTOs().size());
- assertTrue(userTO.getPropagationStatusTOs().get(0).getStatus().isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
TaskExecTO taskExecTO = execProvisioningTask(taskService, 24L, 50, false);
assertNotNull(taskExecTO.getStatus());
- assertTrue(PropagationTaskExecStatus.valueOf(taskExecTO.getStatus()).isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(taskExecTO.getStatus()));
userTO = userService.read(userTO.getKey());
assertNotNull(userTO);
@@ -669,9 +665,7 @@ public class SyncTaskITCase extends AbstractTaskITCase {
assertEquals(actual.getJobDelegateClassName(), syncTask.getJobDelegateClassName());
TaskExecTO execution = execProvisioningTask(taskService, syncTask.getKey(), 50, false);
- final String status = execution.getStatus();
- assertNotNull(status);
- assertTrue(PropagationTaskExecStatus.valueOf(status).isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(execution.getStatus()));
// 5. Test the sync'd user
UserTO updatedUser = userService.read(user.getKey());
@@ -743,9 +737,7 @@ public class SyncTaskITCase extends AbstractTaskITCase {
assertEquals(actual.getJobDelegateClassName(), syncTask.getJobDelegateClassName());
TaskExecTO execution = execProvisioningTask(taskService, syncTask.getKey(), 50, false);
- String status = execution.getStatus();
- assertNotNull(status);
- assertTrue(PropagationTaskExecStatus.valueOf(status).isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, PropagationTaskExecStatus.valueOf(execution.getStatus()));
// 7. Test the sync'd user
String syncedPassword = Encryptor.getInstance().encode("security123", CipherAlgorithm.SHA1);
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java
index 146c51b..283f532 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/UserITCase.java
@@ -295,7 +295,7 @@ public class UserITCase extends AbstractITCase {
userTO = createUser(userTO);
assertNotNull(userTO);
assertEquals(1, userTO.getPropagationStatusTOs().size());
- assertTrue(userTO.getPropagationStatusTOs().get(0).getStatus().isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
}
@Test(expected = SyncopeClientException.class)
@@ -504,7 +504,7 @@ public class UserITCase extends AbstractITCase {
// check for propagation result
assertFalse(userTO.getPropagationStatusTOs().isEmpty());
- assertTrue(userTO.getPropagationStatusTOs().get(0).getStatus().isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
try {
userService.delete(userTO.getKey());
@@ -532,7 +532,7 @@ public class UserITCase extends AbstractITCase {
// check for propagation result
assertFalse(userTO.getPropagationStatusTOs().isEmpty());
- assertTrue(userTO.getPropagationStatusTOs().get(0).getStatus().isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
try {
userService.read(userTO.getKey());
@@ -1058,9 +1058,7 @@ public class UserITCase extends AbstractITCase {
assertNotNull(propagations);
assertEquals(1, propagations.size());
- PropagationTaskExecStatus status = propagations.get(0).getStatus();
- assertNotNull(status);
- assertTrue(status.isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, propagations.get(0).getStatus());
String resource = propagations.get(0).getResource();
assertEquals(RESOURCE_NAME_TESTDB, resource);
@@ -1077,17 +1075,14 @@ public class UserITCase extends AbstractITCase {
userTO = createUser(userTO);
assertNotNull(userTO);
- final List<PropagationStatus> propagations = userTO.getPropagationStatusTOs();
-
+ List<PropagationStatus> propagations = userTO.getPropagationStatusTOs();
assertNotNull(propagations);
assertEquals(1, propagations.size());
- final PropagationTaskExecStatus status = propagations.get(0).getStatus();
- final String resource = propagations.get(0).getResource();
+ assertNotEquals(PropagationTaskExecStatus.SUCCESS, propagations.get(0).getStatus());
- assertNotNull(status);
+ String resource = propagations.get(0).getResource();
assertEquals(RESOURCE_NAME_CSV, resource);
- assertFalse(status.isSuccessful());
}
@Test
@@ -1365,7 +1360,7 @@ public class UserITCase extends AbstractITCase {
assertNotNull(userTO);
assertFalse(userTO.getPropagationStatusTOs().isEmpty());
assertEquals(RESOURCE_NAME_DBVIRATTR, userTO.getPropagationStatusTOs().get(0).getResource());
- assertEquals(PropagationTaskExecStatus.SUBMITTED, userTO.getPropagationStatusTOs().get(0).getStatus());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
ConnObjectTO connObjectTO =
resourceService.readConnObject(RESOURCE_NAME_DBVIRATTR, AnyTypeKind.USER.name(), userTO.getKey());
@@ -1407,7 +1402,7 @@ public class UserITCase extends AbstractITCase {
userTO = createUser(userTO);
assertEquals(RESOURCE_NAME_TIMEOUT, userTO.getPropagationStatusTOs().get(0).getResource());
assertNotNull(userTO.getPropagationStatusTOs().get(0).getFailureReason());
- assertEquals(PropagationTaskExecStatus.UNSUBMITTED, userTO.getPropagationStatusTOs().get(0).getStatus());
+ assertEquals(PropagationTaskExecStatus.FAILURE, userTO.getPropagationStatusTOs().get(0).getStatus());
}
@Test
@@ -1510,7 +1505,7 @@ public class UserITCase extends AbstractITCase {
PropagationStatus prop = props.iterator().next();
assertNotNull(prop);
assertEquals(RESOURCE_NAME_WS1, prop.getResource());
- assertEquals(PropagationTaskExecStatus.SUBMITTED, prop.getStatus());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, prop.getStatus());
} finally {
// restore initial cipher algorithm
pwdCipherAlgo.getValues().set(0, origpwdCipherAlgo);
@@ -1734,7 +1729,7 @@ public class UserITCase extends AbstractITCase {
operation(PatchOperation.ADD_REPLACE).value(RESOURCE_NAME_TESTDB).build());
userTO = updateUser(userPatch);
assertEquals(RESOURCE_NAME_TESTDB, userTO.getResources().iterator().next());
- assertFalse(userTO.getPropagationStatusTOs().get(0).getStatus().isSuccessful());
+ assertNotEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
assertNotNull(userTO.getPropagationStatusTOs().get(0).getFailureReason());
// 3. request to change password only on testdb
@@ -1745,7 +1740,7 @@ public class UserITCase extends AbstractITCase {
userTO = updateUser(userPatch);
assertEquals(RESOURCE_NAME_TESTDB, userTO.getResources().iterator().next());
- assertTrue(userTO.getPropagationStatusTOs().get(0).getStatus().isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
}
@Test
@@ -1789,7 +1784,7 @@ public class UserITCase extends AbstractITCase {
assertNotNull(ws1PropagationStatus);
assertEquals(RESOURCE_NAME_WS1, ws1PropagationStatus.getResource());
assertNotNull(ws1PropagationStatus.getFailureReason());
- assertEquals(PropagationTaskExecStatus.UNSUBMITTED, ws1PropagationStatus.getStatus());
+ assertEquals(PropagationTaskExecStatus.FAILURE, ws1PropagationStatus.getStatus());
}
@Test
@@ -2103,7 +2098,7 @@ public class UserITCase extends AbstractITCase {
userTO = userService.update(userPatch).readEntity(UserTO.class);
assertEquals(Collections.singleton(RESOURCE_NAME_WS1), userTO.getResources());
- assertFalse(userTO.getPropagationStatusTOs().get(0).getStatus().isSuccessful());
+ assertNotEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
assertTrue(userTO.getPropagationStatusTOs().get(0).getFailureReason().
startsWith("Not attempted because there are mandatory attributes without value(s): [__PASSWORD__]"));
}
@@ -2181,7 +2176,7 @@ public class UserITCase extends AbstractITCase {
userTO = createUser(userTO);
assertNotNull(userTO);
assertEquals(1, userTO.getPropagationStatusTOs().size());
- assertTrue(userTO.getPropagationStatusTOs().get(0).getStatus().isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
ConnObjectTO actual =
resourceService.readConnObject(RESOURCE_NAME_WS1, AnyTypeKind.USER.name(), userTO.getKey());
@@ -2221,7 +2216,7 @@ public class UserITCase extends AbstractITCase {
userTO = updateUser(userPatch);
assertNotNull(userTO);
assertEquals(1, userTO.getPropagationStatusTOs().size());
- assertTrue(userTO.getPropagationStatusTOs().get(0).getStatus().isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
ConnObjectTO newUser =
resourceService.readConnObject(RESOURCE_NAME_WS1, AnyTypeKind.USER.name(), userTO.getKey());
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java
index f321dfa..0ceceda 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/reference/VirAttrITCase.java
@@ -101,7 +101,7 @@ public class VirAttrITCase extends AbstractITCase {
assertNotNull(userTO);
assertFalse(userTO.getPropagationStatusTOs().isEmpty());
assertEquals(RESOURCE_NAME_WS2, userTO.getPropagationStatusTOs().get(0).getResource());
- assertEquals(PropagationTaskExecStatus.SUBMITTED, userTO.getPropagationStatusTOs().get(0).getStatus());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
ConnObjectTO connObjectTO =
resourceService.readConnObject(RESOURCE_NAME_WS2, AnyTypeKind.USER.name(), userTO.getKey());
@@ -120,7 +120,7 @@ public class VirAttrITCase extends AbstractITCase {
assertNotNull(userTO);
assertFalse(userTO.getPropagationStatusTOs().isEmpty());
assertEquals("ws-target-resource-2", userTO.getPropagationStatusTOs().get(0).getResource());
- assertEquals(PropagationTaskExecStatus.SUBMITTED, userTO.getPropagationStatusTOs().get(0).getStatus());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
connObjectTO = resourceService.readConnObject(RESOURCE_NAME_WS2, AnyTypeKind.USER.name(), userTO.getKey());
assertNotNull(connObjectTO);
@@ -164,7 +164,7 @@ public class VirAttrITCase extends AbstractITCase {
assertNotNull(userTO);
assertFalse(userTO.getPropagationStatusTOs().isEmpty());
assertEquals(RESOURCE_NAME_WS2, userTO.getPropagationStatusTOs().get(0).getResource());
- assertEquals(PropagationTaskExecStatus.SUBMITTED, userTO.getPropagationStatusTOs().get(0).getStatus());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
connObjectTO = resourceService.readConnObject(RESOURCE_NAME_WS2, AnyTypeKind.USER.name(), userTO.getKey());
assertNotNull(connObjectTO);
@@ -189,7 +189,7 @@ public class VirAttrITCase extends AbstractITCase {
assertTrue(userTO.getVirAttrs().isEmpty());
assertFalse(userTO.getPropagationStatusTOs().isEmpty());
assertEquals(RESOURCE_NAME_WS2, userTO.getPropagationStatusTOs().get(0).getResource());
- assertEquals(PropagationTaskExecStatus.SUBMITTED, userTO.getPropagationStatusTOs().get(0).getStatus());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
connObjectTO = resourceService.readConnObject(RESOURCE_NAME_WS2, AnyTypeKind.USER.name(), userTO.getKey());
assertNotNull(connObjectTO);
@@ -502,8 +502,8 @@ public class VirAttrITCase extends AbstractITCase {
userTO = createUser(userTO);
assertEquals(2, userTO.getPropagationStatusTOs().size());
- assertTrue(userTO.getPropagationStatusTOs().get(0).getStatus().isSuccessful());
- assertTrue(userTO.getPropagationStatusTOs().get(1).getStatus().isSuccessful());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(0).getStatus());
+ assertEquals(PropagationTaskExecStatus.SUCCESS, userTO.getPropagationStatusTOs().get(1).getStatus());
JdbcTemplate jdbcTemplate = new JdbcTemplate(testDataSource);
[4/4] syncope git commit: Upgrading log4j
Posted by il...@apache.org.
Upgrading log4j
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ceea93c0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ceea93c0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ceea93c0
Branch: refs/heads/master
Commit: ceea93c0db562bc6ed6b91a62e4dc7b5908222ed
Parents: 44cbf34
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Sep 24 14:59:24 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Sep 24 14:59:24 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ceea93c0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b53d66f..9aa7f7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -350,7 +350,7 @@ under the License.
<activiti.version>5.18.0</activiti.version>
<slf4j.version>1.7.12</slf4j.version>
- <log4j.version>2.3</log4j.version>
+ <log4j.version>2.4</log4j.version>
<disruptor.version>3.3.2</disruptor.version>
<commons-io.version>2.4</commons-io.version>
[3/4] syncope git commit: [SYNCOPE-697] No more PHASES
Posted by il...@apache.org.
[SYNCOPE-697] No more PHASES
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/44cbf349
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/44cbf349
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/44cbf349
Branch: refs/heads/master
Commit: 44cbf349ad92ecc7059186ceaf47e01a666b055c
Parents: c14a20d
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Sep 24 14:49:23 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Sep 24 14:49:23 2015 +0200
----------------------------------------------------------------------
.../console/panels/ResourceDetailsPanel.java | 7 --
.../console/panels/ResourceDetailsPanel.html | 9 --
.../common/lib/to/PropagationTaskTO.java | 11 --
.../syncope/common/lib/to/ResourceTO.java | 33 +-----
.../common/lib/types/ConnectorCapability.java | 9 +-
.../common/lib/types/PropagationMode.java | 29 -----
.../lib/types/PropagationTaskExecStatus.java | 14 ---
.../common/rest/api/service/TaskService.java | 12 --
.../apache/syncope/core/logic/TaskLogic.java | 44 --------
.../api/entity/resource/ExternalResource.java | 5 -
.../api/entity/task/PropagationTask.java | 5 -
.../entity/resource/JPAExternalResource.java | 16 ---
.../jpa/entity/task/JPAPropagationTask.java | 19 ----
.../entity/PropagationTaskValidator.java | 3 +-
.../core/persistence/jpa/inner/TaskTest.java | 2 -
.../core/persistence/jpa/outer/TaskTest.java | 2 -
.../test/resources/domains/MasterContent.xml | 109 ++++++++-----------
.../src/test/resources/domains/TwoContent.xml | 6 +-
.../core/provisioning/api/Connector.java | 19 ++--
.../provisioning/java/ConnectorFacadeProxy.java | 55 +++++-----
.../java/data/ResourceDataBinderImpl.java | 4 -
.../AbstractPropagationTaskExecutor.java | 19 +---
.../PriorityPropagationTaskExecutor.java | 2 +-
.../propagation/PropagationManagerImpl.java | 1 -
.../java/ResourceDataBinderTest.java | 2 -
.../core/rest/cxf/service/TaskServiceImpl.java | 9 --
.../fit/core/reference/ConnectorITCase.java | 10 +-
.../fit/core/reference/MultitenancyITCase.java | 3 +-
.../core/reference/PropagationTaskITCase.java | 32 ------
.../fit/core/reference/PushTaskITCase.java | 2 +-
.../fit/core/reference/SyncTaskITCase.java | 24 ++--
.../syncope/fit/core/reference/UserITCase.java | 37 +++----
.../fit/core/reference/VirAttrITCase.java | 12 +-
33 files changed, 137 insertions(+), 429 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java
index d556346..59ab76f 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java
@@ -30,7 +30,6 @@ import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPa
import org.apache.syncope.client.console.wicket.markup.html.form.SpinnerFieldPanel;
import org.apache.syncope.common.lib.to.ConnInstanceTO;
import org.apache.syncope.common.lib.to.ResourceTO;
-import org.apache.syncope.common.lib.types.PropagationMode;
import org.apache.syncope.common.lib.types.TraceLevel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -94,12 +93,6 @@ public class ResourceDetailsPanel extends Panel {
new PropertyModel<Integer>(resourceTO, "propagationPriority"), null, null);
add(propagationPriority);
- final AjaxDropDownChoicePanel<PropagationMode> propagationMode = new AjaxDropDownChoicePanel<>(
- "propagationMode", new ResourceModel("propagationMode", "propagationMode").getObject(),
- new PropertyModel<PropagationMode>(resourceTO, "propagationMode"));
- propagationMode.setChoices(Arrays.asList(PropagationMode.values()));
- add(propagationMode);
-
final AjaxCheckBoxPanel randomPwdIfNotProvided = new AjaxCheckBoxPanel("randomPwdIfNotProvided",
new ResourceModel("randomPwdIfNotProvided", "randomPwdIfNotProvided").getObject(),
new PropertyModel<Boolean>(resourceTO, "randomPwdIfNotProvided"));
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html
index 0b7ca7f..7d518ce 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html
@@ -64,15 +64,6 @@ under the License.
</div>
</div>
- <div class="tablerow">
- <div class="tablecolumn_label medium_fixedsize">
- <label for="propagationMode"><wicket:message key="propagationMode"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="propagationMode">[propagationMode]</span>
- </div>
- </div>
-
<div class="tablerow alt">
<div class="tablecolumn_label medium_fixedsize">
<label for="randomPwdIfNotProvided"><wicket:message key="randomPwdIfNotProvided"/></label>
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java
index bf30e24..1b1d556 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java
@@ -21,7 +21,6 @@ package org.apache.syncope.common.lib.to;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.PropagationMode;
import org.apache.syncope.common.lib.types.ResourceOperation;
@XmlRootElement(name = "propagationTask")
@@ -30,8 +29,6 @@ public class PropagationTaskTO extends AbstractTaskTO {
private static final long serialVersionUID = 386450127003321197L;
- private PropagationMode mode;
-
private ResourceOperation operation;
private String connObjectKey;
@@ -64,14 +61,6 @@ public class PropagationTaskTO extends AbstractTaskTO {
this.oldConnObjectKey = oldConnObjectKey;
}
- public PropagationMode getMode() {
- return mode;
- }
-
- public void setPropagationMode(final PropagationMode mode) {
- this.mode = mode;
- }
-
public String getResource() {
return resource;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java
index 79d33a1..419b852 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java
@@ -32,7 +32,6 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.syncope.common.lib.types.ConnConfProperty;
-import org.apache.syncope.common.lib.types.PropagationMode;
import org.apache.syncope.common.lib.types.TraceLevel;
@XmlRootElement(name = "resource")
@@ -57,21 +56,19 @@ public class ResourceTO extends AbstractAnnotatedBean {
private boolean propagationPrimary;
- private int propagationPriority;
+ private int propagationPriority = 0;
private boolean randomPwdIfNotProvided;
- private PropagationMode propagationMode;
-
private boolean enforceMandatoryCondition;
- private TraceLevel createTraceLevel;
+ private TraceLevel createTraceLevel = TraceLevel.ALL;
- private TraceLevel updateTraceLevel;
+ private TraceLevel updateTraceLevel = TraceLevel.ALL;
- private TraceLevel deleteTraceLevel;
+ private TraceLevel deleteTraceLevel = TraceLevel.ALL;
- private TraceLevel syncTraceLevel;
+ private TraceLevel syncTraceLevel = TraceLevel.ALL;
private Long passwordPolicy;
@@ -83,18 +80,6 @@ public class ResourceTO extends AbstractAnnotatedBean {
private final List<String> propagationActionsClassNames = new ArrayList<>();
- public ResourceTO() {
- super();
-
- propagationMode = PropagationMode.TWO_PHASES;
- propagationPriority = 0;
-
- createTraceLevel = TraceLevel.ALL;
- updateTraceLevel = TraceLevel.ALL;
- deleteTraceLevel = TraceLevel.ALL;
- syncTraceLevel = TraceLevel.ALL;
- }
-
public String getKey() {
return key;
}
@@ -152,14 +137,6 @@ public class ResourceTO extends AbstractAnnotatedBean {
this.randomPwdIfNotProvided = randomPwdIfNotProvided;
}
- public PropagationMode getPropagationMode() {
- return propagationMode;
- }
-
- public void setPropagationMode(final PropagationMode propagationMode) {
- this.propagationMode = propagationMode;
- }
-
public TraceLevel getCreateTraceLevel() {
return createTraceLevel;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java
index a0e5781..41b1e4a 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java
@@ -27,12 +27,9 @@ import javax.xml.bind.annotation.XmlEnum;
public enum ConnectorCapability {
AUTHENTICATE,
- ONE_PHASE_CREATE,
- TWO_PHASES_CREATE,
- ONE_PHASE_UPDATE,
- TWO_PHASES_UPDATE,
- ONE_PHASE_DELETE,
- TWO_PHASES_DELETE,
+ CREATE,
+ UPDATE,
+ DELETE,
SEARCH,
SYNC;
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationMode.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationMode.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationMode.java
deleted file mode 100644
index 8b10bc8..0000000
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationMode.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.common.lib.types;
-
-import javax.xml.bind.annotation.XmlEnum;
-
-@XmlEnum
-public enum PropagationMode {
-
- ONE_PHASE,
- TWO_PHASES
-
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java
----------------------------------------------------------------------
diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java
index 448b3a9..c676c3b 100644
--- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java
+++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java
@@ -22,26 +22,12 @@ import javax.xml.bind.annotation.XmlEnum;
/**
* Status of a propagation task execution.
- *
- * CREATED -> SUBMITTED or UBSUBMITTED (depending on the external resource to
- * return success or failure).
- * SUBMITTED -> SUCCESS or FAILURE (depending on the external resource to
- * report success or failure).
*/
@XmlEnum
public enum PropagationTaskExecStatus {
CREATED,
- SUBMITTED,
- UNSUBMITTED,
SUCCESS,
FAILURE;
- public boolean isSuccessful() {
- return this == SUCCESS || this == SUBMITTED;
- }
-
- public static PropagationTaskExecStatus fromString(final String value) {
- return PropagationTaskExecStatus.valueOf(value.toUpperCase());
- }
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
index 2d70b2b..d8814d3 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
@@ -38,7 +38,6 @@ import org.apache.syncope.common.lib.to.AbstractTaskTO;
import org.apache.syncope.common.lib.to.BulkAction;
import org.apache.syncope.common.lib.to.BulkActionResult;
import org.apache.syncope.common.lib.to.PagedResult;
-import org.apache.syncope.common.lib.to.ReportExecTO;
import org.apache.syncope.common.lib.to.SchedTaskTO;
import org.apache.syncope.common.lib.to.TaskExecTO;
import org.apache.syncope.common.lib.types.JobAction;
@@ -142,17 +141,6 @@ public interface TaskService extends JAXRSService {
@QueryParam("dryRun") @DefaultValue("false") boolean dryRun);
/**
- * Reports task execution result.
- *
- * @param executionKey key of task execution being reported
- * @param reportExec execution being reported
- */
- @POST
- @Path("executions/{executionKey}/report")
- @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
- void report(@NotNull @PathParam("executionKey") Long executionKey, @NotNull ReportExecTO reportExec);
-
- /**
* Executes the provided bulk action.
*
* @param bulkAction list of task ids against which the bulk action will be performed.
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
index 09d855e..3c9647e 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
@@ -37,8 +37,6 @@ import org.apache.syncope.common.lib.types.ClientExceptionType;
import org.apache.syncope.common.lib.types.Entitlement;
import org.apache.syncope.common.lib.types.JobAction;
import org.apache.syncope.common.lib.types.JobStatusType;
-import org.apache.syncope.common.lib.types.PropagationMode;
-import org.apache.syncope.common.lib.types.PropagationTaskExecStatus;
import org.apache.syncope.common.lib.types.TaskType;
import org.apache.syncope.core.persistence.api.dao.NotFoundException;
import org.apache.syncope.core.persistence.api.dao.TaskDAO;
@@ -247,48 +245,6 @@ public class TaskLogic extends AbstractJobLogic<AbstractTaskTO> {
return result;
}
- @PreAuthorize("hasRole('" + Entitlement.TASK_READ + "')")
- public TaskExecTO report(final Long execKey, final PropagationTaskExecStatus status, final String message) {
- TaskExec exec = taskExecDAO.find(execKey);
- if (exec == null) {
- throw new NotFoundException("Task execution " + execKey);
- }
-
- SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.InvalidPropagationTaskExecReport);
-
- TaskUtils taskUtils = taskUtilsFactory.getInstance(exec.getTask());
- if (TaskType.PROPAGATION == taskUtils.getType()) {
- PropagationTask task = (PropagationTask) exec.getTask();
- if (task.getMode() != PropagationMode.TWO_PHASES) {
- sce.getElements().add("Propagation mode: " + task.getMode());
- }
- } else {
- sce.getElements().add("Task type: " + taskUtils);
- }
-
- switch (status) {
- case SUCCESS:
- case FAILURE:
- break;
-
- case CREATED:
- case SUBMITTED:
- case UNSUBMITTED:
- sce.getElements().add("Execution status to be set: " + status);
- break;
-
- default:
- }
-
- if (!sce.isEmpty()) {
- throw sce;
- }
-
- exec.setStatus(status.toString());
- exec.setMessage(message);
- return binder.getTaskExecTO(taskExecDAO.save(exec));
- }
-
@PreAuthorize("hasRole('" + Entitlement.TASK_DELETE + "')")
public <T extends AbstractTaskTO> T delete(final Long taskKey) {
Task task = taskDAO.find(taskKey);
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/resource/ExternalResource.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/resource/ExternalResource.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/resource/ExternalResource.java
index a8f32c0..26aa9a1 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/resource/ExternalResource.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/resource/ExternalResource.java
@@ -21,7 +21,6 @@ package org.apache.syncope.core.persistence.api.entity.resource;
import java.util.List;
import java.util.Set;
import org.apache.syncope.common.lib.types.ConnConfProperty;
-import org.apache.syncope.common.lib.types.PropagationMode;
import org.apache.syncope.common.lib.types.TraceLevel;
import org.apache.syncope.core.persistence.api.entity.policy.AccountPolicy;
import org.apache.syncope.core.persistence.api.entity.AnnotatedEntity;
@@ -73,10 +72,6 @@ public interface ExternalResource extends AnnotatedEntity<String> {
List<String> getPropagationActionsClassNames();
- PropagationMode getPropagationMode();
-
- void setPropagationMode(PropagationMode propagationMode);
-
Integer getPropagationPriority();
void setPropagationPriority(Integer priority);
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/PropagationTask.java
----------------------------------------------------------------------
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/PropagationTask.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/PropagationTask.java
index 9c5ef29..db9e5a3 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/PropagationTask.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/PropagationTask.java
@@ -20,7 +20,6 @@ package org.apache.syncope.core.persistence.api.entity.task;
import java.util.Set;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.PropagationMode;
import org.apache.syncope.common.lib.types.ResourceOperation;
import org.apache.syncope.core.persistence.api.entity.resource.ExternalResource;
import org.identityconnectors.framework.common.objects.Attribute;
@@ -43,10 +42,6 @@ public interface PropagationTask extends Task {
void setObjectClassName(String objectClassName);
- PropagationMode getMode();
-
- void setMode(PropagationMode mode);
-
ResourceOperation getOperation();
void setOperation(ResourceOperation operation);
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java
index 650ef6a..e9e59fd 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java
@@ -44,7 +44,6 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.types.ConnConfProperty;
-import org.apache.syncope.common.lib.types.PropagationMode;
import org.apache.syncope.common.lib.types.TraceLevel;
import org.apache.syncope.core.persistence.api.entity.policy.AccountPolicy;
import org.apache.syncope.core.persistence.api.entity.ConnInstance;
@@ -125,10 +124,6 @@ public class JPAExternalResource extends AbstractAnnotatedEntity<String> impleme
@Enumerated(EnumType.STRING)
@Column(nullable = false)
- private PropagationMode propagationMode;
-
- @Enumerated(EnumType.STRING)
- @Column(nullable = false)
private TraceLevel createTraceLevel;
@Enumerated(EnumType.STRING)
@@ -178,7 +173,6 @@ public class JPAExternalResource extends AbstractAnnotatedEntity<String> impleme
propagationPrimary = 0;
propagationPriority = 0;
randomPwdIfNotProvided = 0;
- propagationMode = PropagationMode.TWO_PHASES;
createTraceLevel = TraceLevel.FAILURES;
updateTraceLevel = TraceLevel.FAILURES;
@@ -279,16 +273,6 @@ public class JPAExternalResource extends AbstractAnnotatedEntity<String> impleme
}
@Override
- public PropagationMode getPropagationMode() {
- return propagationMode;
- }
-
- @Override
- public void setPropagationMode(final PropagationMode propagationMode) {
- this.propagationMode = propagationMode;
- }
-
- @Override
public String getKey() {
return name;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPAPropagationTask.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPAPropagationTask.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPAPropagationTask.java
index 19fc9f6..2bdd0f3 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPAPropagationTask.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPAPropagationTask.java
@@ -29,7 +29,6 @@ import javax.persistence.ManyToOne;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.PropagationMode;
import org.apache.syncope.common.lib.types.ResourceOperation;
import org.apache.syncope.common.lib.types.TaskType;
import org.apache.syncope.core.persistence.api.entity.resource.ExternalResource;
@@ -50,12 +49,6 @@ public class JPAPropagationTask extends AbstractTask implements PropagationTask
private static final long serialVersionUID = 7086054884614511210L;
/**
- * @see PropagationMode
- */
- @Enumerated(EnumType.STRING)
- private PropagationMode mode;
-
- /**
* @see ResourceOperation
*/
@Enumerated(EnumType.STRING)
@@ -132,18 +125,6 @@ public class JPAPropagationTask extends AbstractTask implements PropagationTask
@Override
- public PropagationMode getMode() {
- return mode;
- }
-
- @Override
-
- public void setMode(final PropagationMode mode) {
- this.mode = mode;
- }
-
- @Override
-
public ResourceOperation getOperation() {
return operation;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PropagationTaskValidator.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PropagationTaskValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PropagationTaskValidator.java
index 48d0cc3..6c8a949 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PropagationTaskValidator.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PropagationTaskValidator.java
@@ -35,8 +35,7 @@ public class PropagationTaskValidator extends AbstractValidator<PropagationTaskC
if (task == null) {
isValid = true;
} else {
- isValid = task.getMode() != null
- && task.getOperation() != null
+ isValid = task.getOperation() != null
&& !task.getAttributes().isEmpty()
&& task.getResource() != null;
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/TaskTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/TaskTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/TaskTest.java
index 9055fbc..7377475 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/TaskTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/TaskTest.java
@@ -29,7 +29,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.common.lib.types.PropagationMode;
import org.apache.syncope.common.lib.types.ResourceOperation;
import org.apache.syncope.common.lib.types.TaskType;
import org.apache.syncope.core.persistence.api.dao.ExternalResourceDAO;
@@ -114,7 +113,6 @@ public class TaskTest extends AbstractTest {
PropagationTask task = entityFactory.newEntity(PropagationTask.class);
task.setResource(resource);
task.setAnyTypeKind(AnyTypeKind.USER);
- task.setMode(PropagationMode.TWO_PHASES);
task.setOperation(ResourceOperation.CREATE);
task.setConnObjectKey("one@two.com");
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/TaskTest.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/TaskTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/TaskTest.java
index 7ef25aa..2b3d6c7 100644
--- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/TaskTest.java
+++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/TaskTest.java
@@ -31,7 +31,6 @@ import java.util.Set;
import org.apache.syncope.common.lib.to.UserTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.MatchingRule;
-import org.apache.syncope.common.lib.types.PropagationMode;
import org.apache.syncope.common.lib.types.PropagationTaskExecStatus;
import org.apache.syncope.common.lib.types.ResourceOperation;
import org.apache.syncope.common.lib.types.TaskType;
@@ -93,7 +92,6 @@ public class TaskTest extends AbstractTest {
PropagationTask task = entityFactory.newEntity(PropagationTask.class);
task.setResource(resource);
task.setAnyTypeKind(AnyTypeKind.USER);
- task.setMode(PropagationMode.TWO_PHASES);
task.setOperation(ResourceOperation.CREATE);
task.setConnObjectKey("one@two.com");
[2/4] syncope git commit: [SYNCOPE-697] No more PHASES
Posted by il...@apache.org.
http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
index 0d1e67b..7ee8002 100644
--- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
@@ -493,12 +493,9 @@ under the License.
connectorName="net.tirasa.connid.bundles.soap.WebServiceConnector"
version="${connid.soap.version}"
jsonConf='[{"schema":{"name":"endpoint","displayName":null,"helpMessage":null,"type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["http://localhost:${cargo.servlet.port}/wssample/services/provisioning"]},{"schema":{"name":"servicename","displayName":null,"helpMessage":null,"type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["net.tirasa.connid.bundles.soap.provisioning.interfaces.Provisioning"]}]'/>
- <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"/>
- <ConnInstance_capabilities ConnInstance_id="100" capability="TWO_PHASES_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="100" capability="TWO_PHASES_UPDATE"/>
- <ConnInstance_capabilities ConnInstance_id="100" capability="TWO_PHASES_DELETE"/>
+ <ConnInstance_capabilities ConnInstance_id="100" capability="CREATE"/>
+ <ConnInstance_capabilities ConnInstance_id="100" capability="UPDATE"/>
+ <ConnInstance_capabilities ConnInstance_id="100" capability="DELETE"/>
<ConnInstance_capabilities ConnInstance_id="100" capability="SEARCH"/>
<ConnInstance id="101" displayName="H2"
@@ -508,12 +505,9 @@ under the License.
version="${connid.database.version}"
jsonConf='[{"schema":{"name":"disabledStatusValue","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"user","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["sa"]},{"schema":{"name":"keyColumn","displayName":null,"helpMessage":null,"type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["id"]},{"schema":{"name":"retrievePassword","displayName":null,"helpMessage":null,"type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["true"]},{"schema":{"name":"cipherAlgorithm","displayName":null,"helpMessage":null,"type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValu
es":null},"overridable":false,"values":["SHA1"]},{"schema":{"name":"enabledStatusValue","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["true"]},{"schema":{"name":"passwordColumn","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["password"]},{"schema":{"name":"jdbcDriver","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["org.h2.Driver"]},{"schema":{"name":"defaultStatusValue","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["true"]},{"schema":{"name":"table","displayName":null,"helpMessage":null,"type":"java.lang.String","required
":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["test"]},{"schema":{"name":"password","displayName":null,"helpMessage":null,"type":"org.identityconnectors.common.security.GuardedString","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["sa"]},{"schema":{"name":"statusColumn","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["status"]},{"schema":{"name":"jdbcUrlTemplate","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["${testdb.url}"]}]'/>
<ConnInstance_capabilities ConnInstance_id="101" capability="AUTHENTICATE"/>
- <ConnInstance_capabilities ConnInstance_id="101" capability="ONE_PHASE_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="101" capability="ONE_PHASE_UPDATE"/>
- <ConnInstance_capabilities ConnInstance_id="101" capability="ONE_PHASE_DELETE"/>
- <ConnInstance_capabilities ConnInstance_id="101" capability="TWO_PHASES_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="101" capability="TWO_PHASES_UPDATE"/>
- <ConnInstance_capabilities ConnInstance_id="101" capability="TWO_PHASES_DELETE"/>
+ <ConnInstance_capabilities ConnInstance_id="101" capability="CREATE"/>
+ <ConnInstance_capabilities ConnInstance_id="101" capability="UPDATE"/>
+ <ConnInstance_capabilities ConnInstance_id="101" capability="DELETE"/>
<ConnInstance_capabilities ConnInstance_id="101" capability="SEARCH"/>
<ConnInstance_capabilities ConnInstance_id="101" capability="SYNC"/>
@@ -524,12 +518,9 @@ under the License.
version="${connid.soap.version}"
connRequestTimeout="10"
jsonConf='[{"schema":{"name":"servicename","displayName":null,"helpMessage":null,"type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["net.tirasa.connid.bundles.soap.provisioning.interfaces.Provisioning"]},{"schema":{"name":"endpoint","displayName":null,"helpMessage":null,"type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":true,"values":["http://localhost:${cargo.servlet.port}/wssample/services/provisioning"]}]'/>
- <ConnInstance_capabilities ConnInstance_id="102" capability="ONE_PHASE_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="102" capability="ONE_PHASE_UPDATE"/>
- <ConnInstance_capabilities ConnInstance_id="102" capability="ONE_PHASE_DELETE"/>
- <ConnInstance_capabilities ConnInstance_id="102" capability="TWO_PHASES_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="102" capability="TWO_PHASES_UPDATE"/>
- <ConnInstance_capabilities ConnInstance_id="102" capability="TWO_PHASES_DELETE"/>
+ <ConnInstance_capabilities ConnInstance_id="102" capability="CREATE"/>
+ <ConnInstance_capabilities ConnInstance_id="102" capability="UPDATE"/>
+ <ConnInstance_capabilities ConnInstance_id="102" capability="DELETE"/>
<ConnInstance_capabilities ConnInstance_id="102" capability="SEARCH"/>
<ConnInstance id="103" displayName="ConnInstance103"
@@ -545,12 +536,9 @@ under the License.
connectorName="net.tirasa.connid.bundles.csvdir.CSVDirConnector"
version="${connid.csvdir.version}"
jsonConf='[{"schema":{"name":"fields","displayName":"fields","helpMessage":"Column names separated by comma","type":"[Ljava.lang.String;","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["id","name","surname","email","password","theirgroup","membership","status","deleted"]},{"schema":{"name":"keyColumnNames","displayName":"Key column name","helpMessage":"Name of the column used to identify user uniquely","type":"[Ljava.lang.String;","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["name","surname"]},{"schema":{"name":"deleteColumnName","displayName":"Delete column name","helpMessage":"Name of the column used to specify users to be deleted","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["deleted"]},{"schema":{"name":"passwordColumnName","displayName":"Password column name","helpMessage":"Name
of the column used to specify user password","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["password"]},{"schema":{"name":"keyseparator","displayName":"Key separator","helpMessage":"Character used to separate keys in a multi-key scenario","type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[","]},{"schema":{"name":"ignoreHeader","displayName":"Ignore header","helpMessage":"Specify it first line file must be ignored","type":"java.lang.Boolean","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[false]},{"schema":{"name":"fieldDelimiter","displayName":"fieldDelimiter","helpMessage":"fieldDelimiter","type":"char","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[","]},{"schema":{"name":"quotationRequired","displayName":"Value quotation requi
red","helpMessage":"Specify if value quotation is required","type":"java.lang.Boolean","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":[false]},{"schema":{"name":"statusColumn","displayName":"statusColumn","helpMessage":"Status column","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["status"]},{"schema":{"name":"sourcePath","displayName":"Source path","helpMessage":"Absolute path of a directory where are located CSV files to be processed","type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["${test.csvdir.path}"]},{"schema":{"name":"fileMask","displayName":"File mask","helpMessage":"Regular expression describing files to be processed","type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["test.csv"]}]'/>
- <ConnInstance_capabilities ConnInstance_id="104" capability="ONE_PHASE_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="104" capability="ONE_PHASE_UPDATE"/>
- <ConnInstance_capabilities ConnInstance_id="104" capability="ONE_PHASE_DELETE"/>
- <ConnInstance_capabilities ConnInstance_id="104" capability="TWO_PHASES_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="104" capability="TWO_PHASES_UPDATE"/>
- <ConnInstance_capabilities ConnInstance_id="104" capability="TWO_PHASES_DELETE"/>
+ <ConnInstance_capabilities ConnInstance_id="104" capability="CREATE"/>
+ <ConnInstance_capabilities ConnInstance_id="104" capability="UPDATE"/>
+ <ConnInstance_capabilities ConnInstance_id="104" capability="DELETE"/>
<ConnInstance_capabilities ConnInstance_id="104" capability="SEARCH"/>
<ConnInstance_capabilities ConnInstance_id="104" capability="SYNC"/>
@@ -559,9 +547,9 @@ under the License.
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":"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":["false"]}]'/>
- <ConnInstance_capabilities ConnInstance_id="105" capability="ONE_PHASE_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="105" capability="ONE_PHASE_UPDATE"/>
- <ConnInstance_capabilities ConnInstance_id="105" capability="ONE_PHASE_DELETE"/>
+ <ConnInstance_capabilities ConnInstance_id="105" capability="CREATE"/>
+ <ConnInstance_capabilities ConnInstance_id="105" capability="UPDATE"/>
+ <ConnInstance_capabilities ConnInstance_id="105" capability="DELETE"/>
<ConnInstance_capabilities ConnInstance_id="105" capability="SEARCH"/>
<ConnInstance id="106" displayName="H2-test2"
@@ -570,8 +558,8 @@ under the License.
connectorName="net.tirasa.connid.bundles.db.table.DatabaseTableConnector"
version="${connid.database.version}"
jsonConf='[{"schema":{"name":"disabledStatusValue","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"user","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["sa"]},{"schema":{"name":"keyColumn","displayName":null,"helpMessage":null,"type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["id"]},{"schema":{"name":"cipherAlgorithm","displayName":null,"helpMessage":null,"type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["SHA1"]},{"schema":{"name":"enabledStatusValue","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"
defaultValues":null},"overridable":false,"values":["true"]},{"schema":{"name":"passwordColumn","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["password"]},{"schema":{"name":"jdbcDriver","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["org.h2.Driver"]},{"schema":{"name":"retrievePassword","displayName":null,"helpMessage":null,"type":"java.lang.Boolean","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["true"]},{"schema":{"name":"defaultStatusValue","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["true"]},{"schema":{"name":"password","displayName":null,"helpMessage":null,"type":"org.identityco
nnectors.common.security.GuardedString","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["sa"]},{"schema":{"name":"statusColumn","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["status"]},{"schema":{"name":"jdbcUrlTemplate","displayName":null,"helpMessage":null,"type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["${testdb.url}"]},{"schema":{"name":"table","displayName":null,"helpMessage":null,"type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":false,"values":["test2"]}]'/>
- <ConnInstance_capabilities ConnInstance_id="106" capability="ONE_PHASE_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="106" capability="ONE_PHASE_UPDATE"/>
+ <ConnInstance_capabilities ConnInstance_id="106" capability="CREATE"/>
+ <ConnInstance_capabilities ConnInstance_id="106" capability="UPDATE"/>
<ConnInstance_capabilities ConnInstance_id="106" capability="SEARCH"/>
<ConnInstance_capabilities ConnInstance_id="106" capability="SYNC"/>
@@ -580,12 +568,9 @@ under the License.
connectorName="net.tirasa.connid.bundles.db.table.DatabaseTableConnector"
displayName="H2-testsync" version="${connid.database.version}"
jsonConf='[{"schema":{"name":"changeLogColumn","displayName":"Change Log Column (Sync)","helpMessage":"=<b>Change Log Column</b><br>The change log column store the latest change time. Providing this value the Sync capabilities are activated.","type":"java.lang.String","required":false,"order":21,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"nativeTimestamps","displayName":"Native Timestamps ","helpMessage":"<b>Native Timestamps</b><br>Select to retrieve Timestamp data type of the columns in java.sql.Timestamp format from the database table.","type":"boolean","required":false,"order":18,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"cipherAlgorithm","displayName":"Password cipher algorithm (defaults to CLEARTEXT)","helpMessage":"Cipher algorithm used to encode password before to store it onto the database table.\nSpecify one of th
e values among CLEARTEXT,AES, MD5, SHA1, SHA256 or a custom implementation identified by its class name.","type":"java.lang.String","required":false,"order":24,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"enabledStatusValue","displayName":"Enabled Status Value","helpMessage":"<b>Enabled Status Value</b><br>Enter the value for enabled status.","type":"java.lang.String","required":false,"order":12,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"retrievePassword","displayName":"Retrieve password","helpMessage":"Specify if password must be retrieved by default.","type":"boolean","required":true,"order":27,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"datasource","displayName":"Datasource Path","helpMessage":"<b>JDBC Data Source Name/Path</b><br>Enter the JDBC Data Source Name/Path to connect to the Or
acle server. If specified, connector will only try to connect using Datasource and ignore other resource parameters specified.<br>the example value is: <CODE>jdbc/SampleDataSourceName</CODE>","type":"java.lang.String","required":false,"order":22,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"allNative","displayName":"All native","helpMessage":"<b>All native</b><br>Select to retrieve all data type of the columns in a native format from the database table.","type":"boolean","required":false,"order":19,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"user","displayName":"User","helpMessage":"<b>User</b><br>Enter the name of the mandatory Database user with permission to account table.","type":"java.lang.String","required":false,"order":4,"confidential":false,"defaultValues":null},"overridable":false,"values":["sa"]},{"schema":{"name"
:"pwdEncodeToLowerCase","displayName":"Force password encoding to lower case","helpMessage":"Force password encoding to lower case.","type":"boolean","required":false,"order":26,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"jdbcUrlTemplate","displayName":"JDBC Connection URL","helpMessage":"<b>JDBC Connection URL</b><br>Specify the JDBC Driver Connection URL.<br> Oracle template is jdbc:oracle:thin:@[host]:[port(1521)]:[DB].<br> MySQL template is jdbc:mysql://[host]:[port(3306)]/[db], for more info, read the JDBC driver documentation.<br>Could be empty if datasource is provided.","type":"java.lang.String","required":false,"order":15,"confidential":false,"defaultValues":null},"overridable":false,"values":["${testdb.url}"]},{"schema":{"name":"keyColumn","displayName":"Key Column","helpMessage":"<b>Key Column</b><br>This mandatory column value will be used as the unique identi
fier for rows in the table.<br>","type":"java.lang.String","required":true,"order":8,"confidential":false,"defaultValues":null},"overridable":false,"values":["id"]},{"schema":{"name":"validConnectionQuery","displayName":"Validate Connection Query","helpMessage":"<b>Validate Connection Query</b><br>There can be specified the check connection alive query. If empty, default implementation will test it using the switch on/off the autocommit. Some select 1 from dummy table could be more efficient.","type":"java.lang.String","required":false,"order":20,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"rethrowAllSQLExceptions","displayName":"Rethrow all SQLExceptions","helpMessage":"If this is not checked, SQL statements which throw SQLExceptions with a 0 ErrorCode will be have the exception caught and suppressed. Check it to have exceptions with 0 ErrorCodes rethrown.","type":"boolean","required":false,"order":17,"confid
ential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"passwordColumn","displayName":"Password Column","helpMessage":"<b>Password Column</b><br>Enter the name of the column in the table that will hold the password values. If empty, no validation on resource and passwords are activated.","type":"java.lang.String","required":false,"order":9,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"jndiProperties","displayName":"Initial JNDI Properties","helpMessage":"<b>Initial JNDI Properties</b><br>Could be empty or enter the JDBC JNDI Initial context factory, context provider in a format: key = value.","type":"[Ljava.lang.String;","required":false,"order":23,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"password","displayName":"User Password","helpMessage":"<b>User Password</b><br>Enter a user account tha
t has permission to access accounts table.","type":"org.identityconnectors.common.security.GuardedString","required":false,"order":5,"confidential":true,"defaultValues":null},"overridable":false,"values":["sa"]},{"schema":{"name":"host","displayName":"Host","helpMessage":"<b>Host</b><br>Enter the name of the host where the database is running.","type":"java.lang.String","required":false,"order":2,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"port","displayName":"Port","helpMessage":"<b>TCP Port</b><br>Enter the port number the database server is listening on.","type":"java.lang.String","required":false,"order":3,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"statusColumn","displayName":"Status Column","helpMessage":"<b>Status Column</b><br>Enter the name of the column in the table that will hold the status values. If empty enabled and
disabled operation wont be performed.","type":"java.lang.String","required":false,"order":10,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"pwdEncodeToUpperCase","displayName":"Force password encoding to upper case","helpMessage":"Force password encoding to upper case.","type":"boolean","required":false,"order":25,"confidential":false,"defaultValues":null},"overridable":false,"values":["false"]},{"schema":{"name":"enableEmptyString","displayName":"Enable writing empty string","helpMessage":"<b>Enable writing empty string</b><br>Select to enable support for writing an empty strings, instead of a NULL value, in character based columns defined as not-null in the table schema. This option does not influence the way strings are written for Oracle based tables. By default empty strings are written as a NULL value.","type":"boolean","required":false,"order":16,"confidential":false,"defaultValues":null},"overridable":false,"
values":["false"]},{"schema":{"name":"database","displayName":"Database","helpMessage":"<b>Database</b><br>Enter the name of the database on the database server that contains the table.","type":"java.lang.String","required":false,"order":6,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"defaultStatusValue","displayName":"Default Status Value","helpMessage":"<b>Default Status Value</b><br>Enter the value for status in case of status not specified.","type":"java.lang.String","required":false,"order":13,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"table","displayName":"Table","helpMessage":"<b>Table</b><br>Enter the name of the table in the database that contains the accounts.","type":"java.lang.String","required":true,"order":7,"confidential":false,"defaultValues":null},"overridable":false,"values":["testsync"]},{"schema":{"name":"disab
ledStatusValue","displayName":"Disabled Status Value","helpMessage":"<b>Disabled Status Value</b><br>Enter the value for disabled status.","type":"java.lang.String","required":false,"order":11,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"jdbcDriver","displayName":"JDBC Driver","helpMessage":"<b>JDBC Driver</b><br>Specify the JDBC Driver class name. Oracle is oracle.jdbc.driver.OracleDriver. MySQL is org.gjt.mm.mysql.Driver.<br>Could be empty if datasource is provided.","type":"java.lang.String","required":false,"order":14,"confidential":false,"defaultValues":null},"overridable":false,"values":["org.h2.Driver"]},{"schema":{"name":"quoting","displayName":"Name Quoting","helpMessage":"<b>Name Quoting</b><br>Select whether database column names for this resource should be quoted, and the quoting characters. By default, database column names are not quoted (None). For other selec
tions (Single, Double, Back, or Brackets), column names will appear between single quotes, double quotes, back quotes, or brackets in the SQL generated to access the database.","type":"java.lang.String","required":false,"order":1,"confidential":false,"defaultValues":null},"overridable":false,"values":[]},{"schema":{"name":"cipherKey","displayName":"Password cipher key","helpMessage":"Specify key in case of reversible algorithm.","type":"java.lang.String","required":false,"order":25,"confidential":false,"defaultValues":null},"overridable":false,"values":[]}]'/>
- <ConnInstance_capabilities ConnInstance_id="107" capability="ONE_PHASE_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="107" capability="TWO_PHASES_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="107" capability="ONE_PHASE_UPDATE"/>
- <ConnInstance_capabilities ConnInstance_id="107" capability="TWO_PHASES_UPDATE"/>
- <ConnInstance_capabilities ConnInstance_id="107" capability="ONE_PHASE_DELETE"/>
- <ConnInstance_capabilities ConnInstance_id="107" capability="TWO_PHASES_DELETE"/>
+ <ConnInstance_capabilities ConnInstance_id="107" capability="CREATE"/>
+ <ConnInstance_capabilities ConnInstance_id="107" capability="UPDATE"/>
+ <ConnInstance_capabilities ConnInstance_id="107" capability="DELETE"/>
<ConnInstance_capabilities ConnInstance_id="107" capability="SEARCH"/>
<ConnInstance id="108" bundleName="net.tirasa.connid.bundles.db.scriptedsql"
@@ -593,70 +578,70 @@ under the License.
connectorName="net.tirasa.connid.bundles.db.scriptedsql.ScriptedSQLConnector"
displayName="Scripted SQL" version="${connid.database.version}"
jsonConf='[{"schema":{"name":"updateScriptFileName","displayName":"updateScriptFileName","helpMessage":"updateScriptFileName","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[]},"overridable":false,"values":["${conf.directory}/scriptedsql/UpdateScript.groovy"]},{"schema":{"name":"testScript","displayName":"testScript","helpMessage":"testScript","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[""]},"overridable":false,"values":[]},{"schema":{"name":"host","displayName":"Host","helpMessage":"<b>Host<
/b><br/>Enter the name of the host where the database is running.","type":"java.lang.String","required":false,"order":2,"confidential":false,"defaultValues":["localhost"]},"overridable":false},{"schema":{"name":"port","displayName":"Port","helpMessage":"<b>TCP Port</b><br/>Enter the port number the database server is listening on.","type":"java.lang.String","required":false,"order":3,"confidential":false,"defaultValues":["3306"]},"overridable":false},{"schema":{"name":"database","displayName":"Database","helpMessage":"<b>Database</b><br/>Enter the name of the database on the database server that contains the table.","type":"
java.lang.String","required":false,"order":6,"confidential":false,"defaultValues":[""]},"overridable":false},{"schema":{"name":"createScript","displayName":"createScript","helpMessage":"createScript","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[""]},"overridable":false,"values":[]},{"schema":{"name":"jdbcUrlTemplate","displayName":"JDBC Connection URL","helpMessage":"<b>JDBC Connection URL</b><br/>Specify the JDBC Driver Connection URL.<br/> Oracle template is jdbc:oracle:thin:@[host]:[port(1521)]:[DB].<br/> MySQL template is jdbc:mysql://[host]:[port(3306)]/[db], for more info, read the JDBC driver documentation.<br/&g
t;Could be empty if datasource is provided.","type":"java.lang.String","required":false,"order":11,"confidential":false,"defaultValues":["jdbc:mysql://%h:%p/%d"]},"overridable":false,"values":["${testdb.url}"]},{"schema":{"name":"jndiProperties","displayName":"Initial JNDI Properties","helpMessage":"<b>Initial JNDI Properties</b><br/>Could be empty or enter the JDBC JNDI Initial context factory, context provider in a format: key = value.","type":"[Ljava.lang.String;","required":false,"order":21,"confidential":false,"defaultValues":[]},"overridable":false,"values":[]},{"schema":{"name":"enableEmptyString","displayName":"Enable writing empty string","helpMessage&
quot;:"<b>Enable writing empty string</b><br/>Select to enable support for writing an empty strings, instead of a NULL value, in character based columns defined as not-null in the table schema. This option does not influence the way strings are written for Oracle based tables. By default empty strings are written as a NULL value.","type":"boolean","required":false,"order":12,"confidential":false,"defaultValues":[false]},"overridable":false,"values":["false"]},{"schema":{"name":"allNative","displayName":"All native","helpMessage":"<b>All native</b><br/>Select to retrieve all data type of the columns in a native format from the database table.","type":"boolean","required":false,"order":16,"confidential":false,"defaultValues"
;:[false]},"overridable":false,"values":[false]},{"schema":{"name":"password","displayName":"User Password","helpMessage":"<b>User Password</b><br/>Enter a user account that has permission to access accounts table.","type":"org.identityconnectors.common.security.GuardedString","required":false,"order":5,"confidential":true,"defaultValues":[]},"overridable":false,"values":["${testdb.password}"]},{"schema":{"name":"validConnectionQuery","displayName":"Validate Connection Query","helpMessage":"<b>Validate Connection Query</b><br/>There can be specified the check connection alive query. If empty, default implementation will test it using the switch on/off the autocommit. Some select 1 from dummy table could be
more efficient.","type":"java.lang.String","required":false,"order":17,"confidential":false,"defaultValues":[]},"overridable":false,"values":[]},{"schema":{"name":"reloadScriptOnExecution","displayName":"reloadScriptOnExecution","helpMessage":"reloadScriptOnExecution","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":[false]},"overridable":false,"values":["true"]},{"schema":{"name":"schemaScriptFileName","displayName":"schemaScriptFileName","helpMessage":"schemaScriptFileName","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[]},"overridab
le":true,"values":["${conf.directory}/scriptedsql/SchemaScript.groovy"]},{"schema":{"name":"jdbcDriver","displayName":"JDBC Driver","helpMessage":"<b>JDBC Driver</b><br/>Specify the JDBC Driver class name. Oracle is oracle.jdbc.driver.OracleDriver. MySQL is org.gjt.mm.mysql.Driver.<br/>Could be empty if datasource is provided.","type":"java.lang.String","required":false,"order":10,"confidential":false,"defaultValues":["com.mysql.jdbc.Driver"]},"overridable":false,"values":["${testdb.driver}"]},{"schema":{"name":"testScriptFileName","displayName":"testScriptFileName","helpMessage":"testScriptFileName","type":"java.lang.String","required":false,"order":0,"c
onfidential":false,"defaultValues":[]},"overridable":true,"values":["${conf.directory}/scriptedsql/TestScript.groovy"]},{"schema":{"name":"quoting","displayName":"Name Quoting","helpMessage":"<b>Name Quoting</b><br/>Select whether database column names for this resource should be quoted, and the quoting characters. By default, database column names are not quoted (None). For other selections (Single, Double, Back, or Brackets), column names will appear between single quotes, double quotes, back quotes, or brackets in the SQL generated to access the database.","type":"java.lang.String","required":false,"order":-1,"confidential":false,"defaultValues":[""]},"overridable":false,"values":[]},{"schema":{"name":"createScriptFileName","d
isplayName":"createScriptFileName","helpMessage":"createScriptFileName","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[]},"overridable":false,"values":["${conf.directory}/scriptedsql/CreateScript.groovy"]},{"schema":{"name":"clearTextPasswordToScript","displayName":"clearTextPasswordToScript","helpMessage":"clearTextPasswordToScript","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":[true]},"overridable":false,"values":["false"]},{"schema":{"name":"nativeTimestamps","displayName":"Native Timestamps","helpMessage":"<b>Native Timestamps</b><br/>Selec
t to retrieve Timestamp data type of the columns in java.sql.Timestamp format from the database table.","type":"boolean","required":false,"order":15,"confidential":false,"defaultValues":[false]},"overridable":false,"values":[false]},{"schema":{"name":"syncScript","displayName":"syncScript","helpMessage":"syncScript","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[""]},"overridable":false,"values":[]},{"schema":{"name":"autoCommit","displayName":"autoCommit","helpMessage":"autoCommit","type":"boolean","required":false,"order":0,"confidential":false,"defaultValues":[true]},&
quot;overridable":false,"values":[true]},{"schema":{"name":"scriptingLanguage","displayName":"scriptingLanguage","helpMessage":"scriptingLanguage","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":["GROOVY"]},"overridable":false,"values":["GROOVY"]},{"schema":{"name":"datasource","displayName":"Datasource Path","helpMessage":"<b>JDBC Data Source Name/Path</b><br/>Enter the JDBC Data Source Name/Path to connect to the Oracle server. If specified, connector will only try to connect using Datasource and ignore other resource parameters specified.<br/>the example value is: <CODE>jdbc/SampleDataSourceName</CODE>","type":"java.lang.String",&quo
t;required":false,"order":20,"confidential":false,"defaultValues":[""]},"overridable":false,"values":[]},{"schema":{"name":"deleteScript","displayName":"deleteScript","helpMessage":"deleteScript","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[""]},"overridable":false,"values":[]},{"schema":{"name":"rethrowAllSQLExceptions","displayName":"Rethrow all SQLExceptions","helpMessage":"If this is not checked, SQL statements which throw SQLExceptions with a 0 ErrorCode will be have the exception caught and suppressed. Check it to have exceptions with 0 ErrorCodes rethrown.","type":"boolean","required":false,"order":14,
"confidential":false,"defaultValues":[true]},"overridable":false,"values":[true]},{"schema":{"name":"syncScriptFileName","displayName":"syncScriptFileName","helpMessage":"syncScriptFileName","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[]},"overridable":true,"values":["${conf.directory}/scriptedsql/SyncScript.groovy"]},{"schema":{"name":"updateScript","displayName":"updateScript","helpMessage":"updateScript","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[""]},"overridable":false,"values":[]},{"schema":{"name":"user&qu
ot;,"displayName":"User","helpMessage":"<b>User</b><br/>Enter the name of the mandatory Database user with permission to account table.","type":"java.lang.String","required":false,"order":4,"confidential":false,"defaultValues":[""]},"overridable":false,"values":["${testdb.username}"]},{"schema":{"name":"deleteScriptFileName","displayName":"deleteScriptFileName","helpMessage":"deleteScriptFileName","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[]},"overridable":false,"values":["${conf.directory}/scriptedsql/DeleteScript.groovy"]},{"schema":{"name":"searchScriptFileName","displayName":"
;searchScriptFileName","helpMessage":"searchScriptFileName","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[]},"overridable":true,"values":["${conf.directory}/scriptedsql/SearchScript.groovy"]},{"schema":{"name":"searchScript","displayName":"searchScript","helpMessage":"searchScript","type":"java.lang.String","required":false,"order":0,"confidential":false,"defaultValues":[""]},"overridable":false,"values":[]}]'/>
- <ConnInstance_capabilities ConnInstance_id="108" capability="ONE_PHASE_CREATE"/>
- <ConnInstance_capabilities ConnInstance_id="108" capability="ONE_PHASE_UPDATE"/>
- <ConnInstance_capabilities ConnInstance_id="108" capability="ONE_PHASE_DELETE"/>
+ <ConnInstance_capabilities ConnInstance_id="108" capability="CREATE"/>
+ <ConnInstance_capabilities ConnInstance_id="108" capability="UPDATE"/>
+ <ConnInstance_capabilities ConnInstance_id="108" capability="DELETE"/>
<ConnInstance_capabilities ConnInstance_id="108" capability="SEARCH"/>
<ConnInstance_capabilities ConnInstance_id="108" capability="SYNC"/>
<ExternalResource name="ws-target-resource-1" connector_id="100"
- randomPwdIfNotProvided="0" enforceMandatoryCondition="0" propagationMode="TWO_PHASES"
+ randomPwdIfNotProvided="0" enforceMandatoryCondition="0"
propagationPriority="0" propagationPrimary="1" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<ExternalResource name="ws-target-resource-2" connector_id="100"
- randomPwdIfNotProvided="0" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
+ randomPwdIfNotProvided="0" enforceMandatoryCondition="1"
propagationPriority="0" propagationPrimary="0" createTraceLevel="FAILURES" deleteTraceLevel="NONE" updateTraceLevel="ALL" syncTraceLevel="ALL"
syncPolicy_id="9"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<ExternalResource name="ws-target-resource-timeout" connector_id="102"
- randomPwdIfNotProvided="0" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
+ randomPwdIfNotProvided="0" enforceMandatoryCondition="1"
propagationPriority="0" propagationPrimary="1" createTraceLevel="FAILURES" deleteTraceLevel="NONE" updateTraceLevel="ALL" syncTraceLevel="ALL"
jsonConf='[{"schema":{"name":"endpoint","displayName":null,"helpMessage":null,"type":"java.lang.String","required":true,"order":0,"confidential":false,"defaultValues":null},"overridable":true,"values":["http://localhost:${cargo.servlet.port}/syncope-fit-build-tools/services/provisioning"]}]'
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<ExternalResource name="ws-target-resource-list-mappings-1" connector_id="100"
- randomPwdIfNotProvided="0" enforceMandatoryCondition="0" propagationMode="TWO_PHASES"
+ randomPwdIfNotProvided="0" enforceMandatoryCondition="0"
propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<ExternalResource name="ws-target-resource-list-mappings-2" connector_id="100"
- randomPwdIfNotProvided="0" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
+ randomPwdIfNotProvided="0" enforceMandatoryCondition="1"
propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<ExternalResource name="ws-target-resource-delete" connector_id="102"
- randomPwdIfNotProvided="0" enforceMandatoryCondition="0" propagationMode="TWO_PHASES"
+ randomPwdIfNotProvided="0" enforceMandatoryCondition="0"
propagationPriority="2" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<ExternalResource name="ws-target-resource-update" connector_id="100"
- randomPwdIfNotProvided="0" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
+ randomPwdIfNotProvided="0" enforceMandatoryCondition="1"
propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<ExternalResource name="resource-testdb" connector_id="101"
- randomPwdIfNotProvided="0" enforceMandatoryCondition="1" propagationMode="ONE_PHASE"
+ randomPwdIfNotProvided="0" enforceMandatoryCondition="1"
propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<ExternalResource name="resource-testdb2" connector_id="106"
- randomPwdIfNotProvided="1" enforceMandatoryCondition="1" propagationMode="ONE_PHASE"
+ randomPwdIfNotProvided="1" enforceMandatoryCondition="1"
propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<ExternalResource name="resource-csv" connector_id="104"
- randomPwdIfNotProvided="0" enforceMandatoryCondition="0" propagationMode="ONE_PHASE" syncPolicy_id="3"
+ randomPwdIfNotProvided="0" enforceMandatoryCondition="0" syncPolicy_id="3"
propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
- <ExternalResource name="ws-target-resource-update-resetsynctoken" connector_id="100" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
+ <ExternalResource name="ws-target-resource-update-resetsynctoken" connector_id="100" enforceMandatoryCondition="1"
randomPwdIfNotProvided="0" propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<ExternalResource name="resource-ldap" connector_id="105"
- randomPwdIfNotProvided="1" enforceMandatoryCondition="1" propagationMode="ONE_PHASE"
+ randomPwdIfNotProvided="1" enforceMandatoryCondition="1"
propagationPriority="0" propagationPrimary="1"
createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
@@ -664,22 +649,22 @@ under the License.
<ExternalResource_PropActions resource_name="resource-ldap"
actionClassName="org.apache.syncope.core.provisioning.java.propagation.LDAPMembershipPropagationActions"/>
<ExternalResource name="ws-target-resource-nopropagation" connector_id="103"
- randomPwdIfNotProvided="0" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
+ randomPwdIfNotProvided="0" enforceMandatoryCondition="1"
propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
passwordPolicy_id="4"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<!-- The following three resources has been added to verify the issue SYNCOPE-68 -->
- <ExternalResource name="ws-target-resource-nopropagation2" connector_id="103" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
+ <ExternalResource name="ws-target-resource-nopropagation2" connector_id="103" enforceMandatoryCondition="1"
randomPwdIfNotProvided="0" propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
- <ExternalResource name="ws-target-resource-nopropagation3" connector_id="103" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
+ <ExternalResource name="ws-target-resource-nopropagation3" connector_id="103" enforceMandatoryCondition="1"
randomPwdIfNotProvided="0" propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
- <ExternalResource name="ws-target-resource-nopropagation4" connector_id="103" enforceMandatoryCondition="1" propagationMode="TWO_PHASES"
+ <ExternalResource name="ws-target-resource-nopropagation4" connector_id="103" enforceMandatoryCondition="1"
randomPwdIfNotProvided="0" propagationPriority="0" propagationPrimary="0" createTraceLevel="ALL" deleteTraceLevel="ALL" updateTraceLevel="ALL" syncTraceLevel="ALL"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
@@ -688,7 +673,7 @@ under the License.
<ExternalResource name="resource-db-sync" connector_id="107"
randomPwdIfNotProvided="0" createTraceLevel="ALL" deleteTraceLevel="ALL" syncTraceLevel="ALL" updateTraceLevel="ALL"
enforceMandatoryCondition="0"
- propagationMode="TWO_PHASES" propagationPrimary="0" propagationPriority="0"
+ propagationPrimary="0" propagationPriority="0"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
@@ -696,14 +681,14 @@ under the License.
<ExternalResource name="resource-db-virattr" connector_id="107"
randomPwdIfNotProvided="0" createTraceLevel="ALL" deleteTraceLevel="ALL" syncTraceLevel="ALL" updateTraceLevel="ALL"
enforceMandatoryCondition="0"
- propagationMode="TWO_PHASES" propagationPrimary="0" propagationPriority="0"
+ propagationPrimary="0" propagationPriority="0"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
<ExternalResource name="resource-db-scripted" connector_id="108"
randomPwdIfNotProvided="0" createTraceLevel="ALL" deleteTraceLevel="ALL" syncTraceLevel="ALL" updateTraceLevel="ALL"
enforceMandatoryCondition="0"
- propagationMode="ONE_PHASE" propagationPrimary="0" propagationPriority="0"
+ propagationPrimary="0" propagationPriority="0"
creator="admin" lastModifier="admin"
creationDate="2010-10-20 11:00:00" lastChangeDate="2010-10-20 11:00:00"/>
@@ -984,14 +969,14 @@ under the License.
intAttrName="location" intMappingType="AnyObjectPlainSchema"
mandatoryCondition="false" connObjectKey="0" password="0" purpose="BOTH"/>
- <Task DTYPE="PropagationTask" type="PROPAGATION" id="1" mode="TWO_PHASES" operation="UPDATE"
+ <Task DTYPE="PropagationTask" type="PROPAGATION" id="1" operation="UPDATE"
objectClassName="__ACCOUNT__" resource_name="ws-target-resource-2" anyTypeKind="USER" anyKey="1"
xmlAttributes='[{"name":"__PASSWORD__","value":[{"readOnly":false,"disposed":false,"encryptedBytes":"m9nh2US0Sa6m+cXccCq0Xw==","base64SHA1Hash":"GFJ69qfjxEOdrmt+9q+0Cw2uz60="}]},{"name":"__NAME__","value":["userId"],"nameValue":"userId"},{"name":"fullname","value":["fullname"]},{"name":"type","value":["type"]}]'/>
<TaskExec id="1" task_id="1" status="SUCCESS"/>
- <Task DTYPE="PropagationTask" type="PROPAGATION" id="2" mode="ONE_PHASE" operation="CREATE"
+ <Task DTYPE="PropagationTask" type="PROPAGATION" id="2" operation="CREATE"
objectClassName="__ACCOUNT__" resource_name="ws-target-resource-2" anyTypeKind="USER" anyKey="1"
xmlAttributes='[{"name":"__PASSWORD__","value":[{"readOnly":false,"disposed":false,"encryptedBytes":"m9nh2US0Sa6m+cXccCq0Xw==","base64SHA1Hash":"GFJ69qfjxEOdrmt+9q+0Cw2uz60="}]},{"name":"__NAME__","value":["userId"],"nameValue":"userId"},{"name":"fullname","value":["fullname"]},{"name":"type","value":["type"]}]'/>
- <Task DTYPE="PropagationTask" type="PROPAGATION" id="3" mode="TWO_PHASES" operation="DELETE"
+ <Task DTYPE="PropagationTask" type="PROPAGATION" id="3" operation="DELETE"
objectClassName="__ACCOUNT__" resource_name="ws-target-resource-2" anyTypeKind="USER" anyKey="1"
xmlAttributes='[{"name":"__PASSWORD__","value":[{"readOnly":false,"disposed":false,"encryptedBytes":"m9nh2US0Sa6m+cXccCq0Xw==","base64SHA1Hash":"GFJ69qfjxEOdrmt+9q+0Cw2uz60="}]},{"name":"__NAME__","value":["userId"],"nameValue":"userId"},{"name":"type","value":["type"]}]'/>
<Task DTYPE="SyncTask" type="SYNCHRONIZATION" id="4" name="CSV (update matching; assign unmatching)" resource_name="resource-csv"
@@ -1003,7 +988,7 @@ under the License.
template='{"@class":"org.apache.syncope.common.lib.to.GroupTO","creator":null,"creationDate":null,"lastModifier":null,"lastChangeDate":null,"key":0,"type":"GROUP","realm":null,"status":null,"name":null,"userOwner":null,"groupOwner":null,"adynMembershipCond":null,"udynMembershipCond":null,"auxClasses":[],"derAttrs":[],"virAttrs":[],"resources":[],"propagationStatuses":[],"plainAttrs":[]}'/>
<Task DTYPE="SchedTask" type="SCHEDULED" id="5" name="SampleJob Task"
jobDelegateClassName="org.apache.syncope.fit.core.reference.TestSampleJobDelegate" cronExpression="0 0 0 1 * ?"/>
- <Task DTYPE="PropagationTask" type="PROPAGATION" id="6" mode="TWO_PHASES" operation="UPDATE"
+ <Task DTYPE="PropagationTask" type="PROPAGATION" id="6" operation="UPDATE"
objectClassName="__ACCOUNT__" resource_name="ws-target-resource-nopropagation" anyTypeKind="USER" anyKey="1"
xmlAttributes='[{"name":"__PASSWORD__","value":[{"readOnly":false,"disposed":false,"encryptedBytes":"m9nh2US0Sa6m+cXccCq0Xw==","base64SHA1Hash":"GFJ69qfjxEOdrmt+9q+0Cw2uz60="}]},{"name":"__NAME__","value":["userId"],"nameValue":"userId"},{"name":"fullname","value":["fullname"]},{"name":"type","value":["type"]}]'/>
<TaskExec id="6" task_id="6" status="SUCCESS"/>
@@ -1102,7 +1087,7 @@ under the License.
<Task DTYPE="SyncTask" type="SYNCHRONIZATION" id="26" name="CSV (ignore matching; assign unmatching)" resource_name="resource-csv"
destinationRealm_id="1" performCreate="1" performUpdate="1" performDelete="1" syncStatus="1" fullReconciliation="0"
unmatchingRule="ASSIGN" matchingRule="IGNORE"/>
- <Task DTYPE="PropagationTask" type="PROPAGATION" id="27" mode="ONE_PHASE" operation="CREATE"
+ <Task DTYPE="PropagationTask" type="PROPAGATION" id="27" operation="CREATE"
objectClassName="__ACCOUNT__" resource_name="resource-testdb" anyTypeKind="USER" anyKey="1"
xmlAttributes='[{"name":"__PASSWORD__","value":[{"readOnly":false,"disposed":false,"encryptedBytes":"m9nh2US0Sa6m+cXccCq0Xw==","base64SHA1Hash":"GFJ69qfjxEOdrmt+9q+0Cw2uz60="}]},{"name":"__NAME__","value":["userId"],"nameValue":"userId"},{"name":"fullname","value":["fullname"]},{"name":"type","value":["type"]}]'/>
<Task DTYPE="SyncTask" type="SYNCHRONIZATION" id="28" name="Scripted SQL" resource_name="resource-db-scripted"