diff --git a/components/org.wso2.carbon.identity.account.suspension.notification.task/pom.xml b/components/org.wso2.carbon.identity.account.suspension.notification.task/pom.xml
index 29dc471885..f5507a50d6 100644
--- a/components/org.wso2.carbon.identity.account.suspension.notification.task/pom.xml
+++ b/components/org.wso2.carbon.identity.account.suspension.notification.task/pom.xml
@@ -20,7 +20,7 @@
identity-governance
org.wso2.carbon.identity.governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.api.user.governance/pom.xml b/components/org.wso2.carbon.identity.api.user.governance/pom.xml
index dcc4943fd8..bc02375b0a 100644
--- a/components/org.wso2.carbon.identity.api.user.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.governance/pom.xml
@@ -23,12 +23,12 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../..
org.wso2.carbon.identity.api.user.governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
jar
WSO2 Carbon - User Rest Governance API
WSO2 Carbon - User Rest Governance API
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/pom.xml b/components/org.wso2.carbon.identity.api.user.recovery/pom.xml
index 34b186a26b..a8a4610988 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.recovery/pom.xml
@@ -23,12 +23,12 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../..
org.wso2.carbon.identity.api.user.recovery
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
jar
WSO2 Carbon - Identity Management Recovery Rest API
WSO2 Carbon - Identity Management Recovery Rest API
diff --git a/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml b/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml
index dc87f9d01a..e482e77871 100644
--- a/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml
+++ b/components/org.wso2.carbon.identity.auth.attribute.handler/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.captcha/pom.xml b/components/org.wso2.carbon.identity.captcha/pom.xml
index dab62e3f68..1765752b3d 100644
--- a/components/org.wso2.carbon.identity.captcha/pom.xml
+++ b/components/org.wso2.carbon.identity.captcha/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.captcha/src/main/java/org/wso2/carbon/identity/captcha/internal/CaptchaDataHolder.java b/components/org.wso2.carbon.identity.captcha/src/main/java/org/wso2/carbon/identity/captcha/internal/CaptchaDataHolder.java
index b5e069a6ad..5b704e6a56 100644
--- a/components/org.wso2.carbon.identity.captcha/src/main/java/org/wso2/carbon/identity/captcha/internal/CaptchaDataHolder.java
+++ b/components/org.wso2.carbon.identity.captcha/src/main/java/org/wso2/carbon/identity/captcha/internal/CaptchaDataHolder.java
@@ -171,11 +171,21 @@ public void setReCaptchaScoreThreshold(double reCaptchaScoreThreshold) {
this.reCaptchaScoreThreshold = reCaptchaScoreThreshold;
}
+ /**
+ * Get the recaptcha score used as the threshold for printing warn logs.
+ *
+ * @return Recaptcha score threshold used for warning.
+ */
public double getReCaptchaWarnScoreThreshold() {
return reCaptchaWarnScoreThreshold;
}
+ /**
+ * Set the recaptcha score used as the threshold for printing warn logs.
+ *
+ * @param reCaptchaWarnScoreThreshold Recaptcha score threshold used for warning.
+ */
public void setReCaptchaWarnScoreThreshold(double reCaptchaWarnScoreThreshold) {
this.reCaptchaWarnScoreThreshold = reCaptchaWarnScoreThreshold;
diff --git a/components/org.wso2.carbon.identity.governance/pom.xml b/components/org.wso2.carbon.identity.governance/pom.xml
index 411cc55bfc..beb9ab9867 100644
--- a/components/org.wso2.carbon.identity.governance/pom.xml
+++ b/components/org.wso2.carbon.identity.governance/pom.xml
@@ -18,7 +18,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/service/notification/NotificationTemplateManager.java b/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/service/notification/NotificationTemplateManager.java
index 7259d3bb84..abf5eca938 100644
--- a/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/service/notification/NotificationTemplateManager.java
+++ b/components/org.wso2.carbon.identity.governance/src/main/java/org/wso2/carbon/identity/governance/service/notification/NotificationTemplateManager.java
@@ -42,6 +42,24 @@ default NotificationTemplate getNotificationTemplate(String notificationChannel,
return null;
}
+ /**
+ * Return the notification template from the tenant registry which matches the given channel and template name.
+ *
+ * @param notificationChannel Notification Channel Name (Eg: SMS or EMAIL).
+ * @param templateType Display name of the template.
+ * @param locale Locale.
+ * @param tenantDomain Tenant Domain.
+ * @param applicationUuid Application UUID.
+ * @return Return {@link org.wso2.carbon.identity.governance.model.NotificationTemplate} object.
+ * @throws NotificationTemplateManagerException If an error occurred while getting the notification template.
+ */
+ default NotificationTemplate getNotificationTemplate(String notificationChannel, String templateType, String locale,
+ String tenantDomain, String applicationUuid)
+ throws NotificationTemplateManagerException {
+
+ return null;
+ }
+
/**
* Add the notification template to the registry.
*
@@ -55,6 +73,19 @@ default void addNotificationTemplate(NotificationTemplate notificationTemplate,
}
+ /**
+ * Add the notification template to the registry.
+ *
+ * @param notificationTemplate Notification template.
+ * @param tenantDomain Tenant domain.
+ * @param applicationUuid Application UUID.
+ * @throws NotificationTemplateManagerException If an error occurred while adding the notification template.
+ */
+ default void addNotificationTemplate(NotificationTemplate notificationTemplate, String tenantDomain,
+ String applicationUuid) throws NotificationTemplateManagerException {
+
+ }
+
/**
* Add a new notification template to the registry to the corresponding notification channel root directory.
*
@@ -91,4 +122,19 @@ default List getDefaultNotificationTemplates(String notifi
return null;
}
+
+ /**
+ * Add a new notification template to the registry to the corresponding notification channel root directory.
+ *
+ * @param displayName Notification template display name.
+ * @param notificationChannel Notification channel (Eg: SMS, EMAIL).
+ * @param tenantDomain Tenant domain.
+ * @param applicationUuid Application UUID.
+ * @throws NotificationTemplateManagerException If an error occurred while adding the template to the registry.
+ */
+ default void addNotificationTemplateType(String displayName, String notificationChannel,
+ String tenantDomain, String applicationUuid)
+ throws NotificationTemplateManagerException {
+
+ }
}
diff --git a/components/org.wso2.carbon.identity.idle.account.identification/pom.xml b/components/org.wso2.carbon.identity.idle.account.identification/pom.xml
index 85ad3b6414..90952531bc 100644
--- a/components/org.wso2.carbon.identity.idle.account.identification/pom.xml
+++ b/components/org.wso2.carbon.identity.idle.account.identification/pom.xml
@@ -18,7 +18,7 @@
identity-governance
org.wso2.carbon.identity.governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.resolver.regex/pom.xml b/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.resolver.regex/pom.xml
index 95c7a13f23..f977b3dd48 100644
--- a/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.resolver.regex/pom.xml
+++ b/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.resolver.regex/pom.xml
@@ -21,7 +21,7 @@
identity-governance
org.wso2.carbon.identity.governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../../pom.xml
4.0.0
diff --git a/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.service/pom.xml b/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.service/pom.xml
index c8528c059a..b65cac1bce 100644
--- a/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.service/pom.xml
+++ b/components/org.wso2.carbon.identity.multi.attribute.login/org.wso2.carbon.identity.multi.attribute.login.service/pom.xml
@@ -21,7 +21,7 @@
identity-governance
org.wso2.carbon.identity.governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../../pom.xml
4.0.0
diff --git a/components/org.wso2.carbon.identity.multi.attribute.login/pom.xml b/components/org.wso2.carbon.identity.multi.attribute.login/pom.xml
index 0d95b58e30..39fd22da74 100644
--- a/components/org.wso2.carbon.identity.multi.attribute.login/pom.xml
+++ b/components/org.wso2.carbon.identity.multi.attribute.login/pom.xml
@@ -21,7 +21,7 @@
identity-governance
org.wso2.carbon.identity.governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/components/org.wso2.carbon.identity.password.expiry/pom.xml b/components/org.wso2.carbon.identity.password.expiry/pom.xml
index 5054804e1e..9cf6e1d72f 100644
--- a/components/org.wso2.carbon.identity.password.expiry/pom.xml
+++ b/components/org.wso2.carbon.identity.password.expiry/pom.xml
@@ -20,7 +20,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.password.history/pom.xml b/components/org.wso2.carbon.identity.password.history/pom.xml
index 3b5aa5d3d1..734a2b66ae 100644
--- a/components/org.wso2.carbon.identity.password.history/pom.xml
+++ b/components/org.wso2.carbon.identity.password.history/pom.xml
@@ -18,7 +18,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.password.policy/pom.xml b/components/org.wso2.carbon.identity.password.policy/pom.xml
index 0aead9dbde..636492b608 100644
--- a/components/org.wso2.carbon.identity.password.policy/pom.xml
+++ b/components/org.wso2.carbon.identity.password.policy/pom.xml
@@ -18,7 +18,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.piicontroller/pom.xml b/components/org.wso2.carbon.identity.piicontroller/pom.xml
index bded6615d7..d3d2562b8f 100644
--- a/components/org.wso2.carbon.identity.piicontroller/pom.xml
+++ b/components/org.wso2.carbon.identity.piicontroller/pom.xml
@@ -19,7 +19,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.recovery.endpoint/pom.xml b/components/org.wso2.carbon.identity.recovery.endpoint/pom.xml
index 5d274df4e7..f1249a10e4 100644
--- a/components/org.wso2.carbon.identity.recovery.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.recovery.endpoint/pom.xml
@@ -5,7 +5,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.recovery/pom.xml b/components/org.wso2.carbon.identity.recovery/pom.xml
index 15425de0b7..24dd5a0edd 100644
--- a/components/org.wso2.carbon.identity.recovery/pom.xml
+++ b/components/org.wso2.carbon.identity.recovery/pom.xml
@@ -18,7 +18,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.recovery/src/main/java/org/wso2/carbon/identity/recovery/IdentityRecoveryConstants.java b/components/org.wso2.carbon.identity.recovery/src/main/java/org/wso2/carbon/identity/recovery/IdentityRecoveryConstants.java
index b497d99699..b29bc5bee5 100644
--- a/components/org.wso2.carbon.identity.recovery/src/main/java/org/wso2/carbon/identity/recovery/IdentityRecoveryConstants.java
+++ b/components/org.wso2.carbon.identity.recovery/src/main/java/org/wso2/carbon/identity/recovery/IdentityRecoveryConstants.java
@@ -355,6 +355,8 @@ public enum ErrorMessages {
+ "recovery request"),
ERROR_CODE_USERNAME_RECOVERY_VALIDATION_FAILED("UNR-10003",
"Username recovery validation failed for user account : '%s'"),
+ ERROR_CODE_USERNAME_RECOVERY_MULTIPLE_DOMAINS("UNR-10004", "Multiple domains found in the " +
+ "given claim set"),
// UAR - User Account Recovery.
ERROR_CODE_INVALID_RECOVERY_CODE("UAR-10001", "Invalid recoveryCode : '%s'"),
diff --git a/components/org.wso2.carbon.identity.recovery/src/main/java/org/wso2/carbon/identity/recovery/internal/service/impl/UserAccountRecoveryManager.java b/components/org.wso2.carbon.identity.recovery/src/main/java/org/wso2/carbon/identity/recovery/internal/service/impl/UserAccountRecoveryManager.java
index 844bc80b40..aaec3b1fc9 100644
--- a/components/org.wso2.carbon.identity.recovery/src/main/java/org/wso2/carbon/identity/recovery/internal/service/impl/UserAccountRecoveryManager.java
+++ b/components/org.wso2.carbon.identity.recovery/src/main/java/org/wso2/carbon/identity/recovery/internal/service/impl/UserAccountRecoveryManager.java
@@ -62,6 +62,7 @@
import org.wso2.carbon.user.core.model.OperationalCondition;
import org.wso2.carbon.user.core.model.OperationalOperation;
import org.wso2.carbon.user.core.service.RealmService;
+import org.wso2.carbon.user.core.util.UserCoreUtil;
import java.util.ArrayList;
import java.util.Arrays;
@@ -298,27 +299,19 @@ public String getUsernameByClaims(Map claims, String tenantDomai
}
int tenantId = IdentityTenantUtil.getTenantId(tenantDomain);
try {
- List userStoreDomainNames = getDomainNames(tenantId);
- AbstractUserStoreManager abstractUserStoreManager = (AbstractUserStoreManager) getUserStoreManager(tenantId);
- RealmService realmService = IdentityRecoveryServiceDataHolder.getInstance().getRealmService();
- ClaimManager claimManager = (ClaimManager) realmService.getTenantUserRealm(tenantId).getClaimManager();
ArrayList resultedUserList = new ArrayList<>();
-
- for (String domain : userStoreDomainNames) {
- List expressionConditionList =
- getExpressionConditionList(claims, domain, claimManager);
- if (expressionConditionList.isEmpty()) {
- continue;
- }
- Condition operationalCondition = getOperationalCondition(expressionConditionList);
- /* Get the users list that matches with the condition
- limit : 2, offset : 1, sortBy : null, sortOrder : null */
- resultedUserList.addAll(abstractUserStoreManager.getUserListWithID(operationalCondition, domain,
- UserCoreConstants.DEFAULT_PROFILE, 2, 1, null, null));
- if (resultedUserList.size() > 1) {
- log.warn("Multiple users matched for given claims set: " + claims.keySet());
- throw Utils.handleClientException(
- IdentityRecoveryConstants.ErrorMessages.ERROR_CODE_MULTIPLE_MATCHING_USERS, null);
+ AbstractUserStoreManager abstractUserStoreManager = (AbstractUserStoreManager)
+ getUserStoreManager(tenantId);
+ String userstoreDomain = extractDomainFromClaims(claims, abstractUserStoreManager);
+ if (userstoreDomain != null) {
+ populateUserListFromClaimsForDomain(tenantId, claims, userstoreDomain, resultedUserList,
+ abstractUserStoreManager);
+ } else {
+ // If a userstore domain is not specified in the request, consider all userstores.
+ List userStoreDomainNames = getDomainNames(tenantId);
+ for (String domain : userStoreDomainNames) {
+ populateUserListFromClaimsForDomain(tenantId, claims, domain, resultedUserList,
+ abstractUserStoreManager);
}
}
// Return empty when no users are found.
@@ -333,11 +326,84 @@ public String getUsernameByClaims(Map claims, String tenantDomai
Arrays.toString(claims.keySet().toArray()));
}
throw new IdentityRecoveryException(e.getErrorCode(), "Error occurred while retrieving users.", e);
- } catch (UserStoreException e) {
+ } catch (UserStoreException | IdentityRecoveryServerException e) {
throw new IdentityRecoveryException(e.getMessage(), e);
}
}
+ /**
+ * Extract and remove the userstore domain from the claim set.
+ *
+ * @param claims List of UserClaims.
+ * @param abstractUserStoreManager Abstract user store manager.
+ * @return Userstore domain of the claims.
+ * @throws IdentityRecoveryClientException Error if multiple domains are present.
+ */
+ private String extractDomainFromClaims(Map claims,
+ AbstractUserStoreManager abstractUserStoreManager)
+ throws IdentityRecoveryClientException {
+
+ String domain = null;
+ for (Map.Entry entry : claims.entrySet()) {
+ if (StringUtils.isNotBlank(entry.getValue()) && entry.getValue().contains(UserCoreConstants.DOMAIN_SEPARATOR)) {
+ String extractedDomain = IdentityUtil.extractDomainFromName(entry.getValue());
+ // Some claims (Eg:- Birth date) can have "/" in claim values. Skip such claims where
+ // secondaryUserStoreManager for the extracted domain is null.
+ UserStoreManager secondaryUserStoreManager = abstractUserStoreManager.
+ getSecondaryUserStoreManager(extractedDomain);
+ if (secondaryUserStoreManager != null) {
+ if (domain == null) {
+ domain = extractedDomain;
+ } else if (!domain.equalsIgnoreCase(extractedDomain)) {
+ log.warn("Multiple domains found for the given claim set: " + claims.keySet());
+ throw Utils.handleClientException(
+ IdentityRecoveryConstants.ErrorMessages.
+ ERROR_CODE_USERNAME_RECOVERY_MULTIPLE_DOMAINS, null);
+ }
+ // Remove domain from claim value.
+ entry.setValue(UserCoreUtil.removeDomainFromName(entry.getValue()));
+ }
+ }
+ }
+ return domain;
+ }
+
+ /**
+ * Get the users for the given claim set and userstore domain and populate the user list.
+ *
+ * @param tenantId Tenant ID.
+ * @param claims List of UserClaims.
+ * @param userstoreDomain Userstore domain of the claims.
+ * @param userList List of users.
+ * @param abstractUserStoreManager Abstract user store manager.
+ * @throws IdentityRecoveryClientException Error if multiple users exist for the given claims set.
+ * @throws UserStoreException Error while getting the attribute name of a claim.
+ */
+ private void populateUserListFromClaimsForDomain(int tenantId, Map claims, String userstoreDomain,
+ ArrayList userList,
+ AbstractUserStoreManager abstractUserStoreManager)
+ throws UserStoreException, IdentityRecoveryClientException {
+
+ RealmService realmService = IdentityRecoveryServiceDataHolder.getInstance().getRealmService();
+ ClaimManager claimManager = (ClaimManager) realmService.getTenantUserRealm(tenantId).getClaimManager();
+
+ List expressionConditionList =
+ getExpressionConditionList(claims, userstoreDomain, claimManager);
+
+ if (!expressionConditionList.isEmpty()) {
+ Condition operationalCondition = getOperationalCondition(expressionConditionList);
+ // Get the user list that matches the condition limit : 2, offset : 1, sortBy : null, sortOrder : null
+ userList.addAll(abstractUserStoreManager.getUserListWithID(operationalCondition, userstoreDomain,
+ UserCoreConstants.DEFAULT_PROFILE, 2, 1, null, null));
+
+ if (userList.size() > 1) {
+ log.warn("Multiple users matched for given claims set: " + claims.keySet());
+ throw Utils.handleClientException(
+ IdentityRecoveryConstants.ErrorMessages.ERROR_CODE_MULTIPLE_MATCHING_USERS, null);
+ }
+ }
+ }
+
/**
* Get the expression conditions for the claim set.
*
diff --git a/components/org.wso2.carbon.identity.tenant.resource.manager/pom.xml b/components/org.wso2.carbon.identity.tenant.resource.manager/pom.xml
index 4a2de7bd0c..5cbaadd5e3 100644
--- a/components/org.wso2.carbon.identity.tenant.resource.manager/pom.xml
+++ b/components/org.wso2.carbon.identity.tenant.resource.manager/pom.xml
@@ -22,7 +22,7 @@
identity-governance
org.wso2.carbon.identity.governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.tenant.resource.manager/src/main/java/org/wso2/carbon/identity/tenant/resource/manager/core/ResourceManagerImpl.java b/components/org.wso2.carbon.identity.tenant.resource.manager/src/main/java/org/wso2/carbon/identity/tenant/resource/manager/core/ResourceManagerImpl.java
index 710b766cb0..3858e4256d 100644
--- a/components/org.wso2.carbon.identity.tenant.resource.manager/src/main/java/org/wso2/carbon/identity/tenant/resource/manager/core/ResourceManagerImpl.java
+++ b/components/org.wso2.carbon.identity.tenant.resource.manager/src/main/java/org/wso2/carbon/identity/tenant/resource/manager/core/ResourceManagerImpl.java
@@ -126,11 +126,24 @@ private void deployEventPublisherConfiguration(InputStream publisherConfig)
return;
}
- if (TenantResourceManagerDataHolder.getInstance().getCarbonEventPublisherService()
- .getActiveEventPublisherConfiguration(eventPublisherConfiguration.getEventPublisherName()) != null) {
+ EventPublisherConfiguration oldEventPublisherConfiguration = TenantResourceManagerDataHolder.getInstance()
+ .getCarbonEventPublisherService().getActiveEventPublisherConfiguration(
+ eventPublisherConfiguration.getEventPublisherName());
+
+ if (oldEventPublisherConfiguration != null) {
destroyEventPublisherConfiguration(eventPublisherConfiguration.getEventPublisherName());
}
- carbonEventPublisherService.addEventPublisherConfiguration(eventPublisherConfiguration);
+
+ try {
+ carbonEventPublisherService.addEventPublisherConfiguration(eventPublisherConfiguration);
+ } catch (EventPublisherConfigurationException e) {
+ if (oldEventPublisherConfiguration != null) {
+ carbonEventPublisherService.addEventPublisherConfiguration(oldEventPublisherConfiguration);
+ log.warn("The redeploying event publisher configuration fails. " +
+ "Hence redeploying old configuration.");
+ }
+ throw e;
+ }
}
/**
diff --git a/components/org.wso2.carbon.identity.user.endpoint/pom.xml b/components/org.wso2.carbon.identity.user.endpoint/pom.xml
index bd3ac2138c..95fbdd3ebf 100644
--- a/components/org.wso2.carbon.identity.user.endpoint/pom.xml
+++ b/components/org.wso2.carbon.identity.user.endpoint/pom.xml
@@ -5,7 +5,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.user.export.core/pom.xml b/components/org.wso2.carbon.identity.user.export.core/pom.xml
index 4a78e1dca6..4a5daa6a10 100644
--- a/components/org.wso2.carbon.identity.user.export.core/pom.xml
+++ b/components/org.wso2.carbon.identity.user.export.core/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.user.onboard.core.service/pom.xml b/components/org.wso2.carbon.identity.user.onboard.core.service/pom.xml
index 4bc8635577..c846c69693 100644
--- a/components/org.wso2.carbon.identity.user.onboard.core.service/pom.xml
+++ b/components/org.wso2.carbon.identity.user.onboard.core.service/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/components/org.wso2.carbon.identity.user.rename.core/pom.xml b/components/org.wso2.carbon.identity.user.rename.core/pom.xml
index 23daa62894..5a11970c81 100644
--- a/components/org.wso2.carbon.identity.user.rename.core/pom.xml
+++ b/components/org.wso2.carbon.identity.user.rename.core/pom.xml
@@ -20,7 +20,7 @@
identity-governance
org.wso2.carbon.identity.governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/features/org.wso2.carbon.identity.account.suspension.notification.task.server.feature/pom.xml b/features/org.wso2.carbon.identity.account.suspension.notification.task.server.feature/pom.xml
index 52fef9263b..6d0d6301fb 100644
--- a/features/org.wso2.carbon.identity.account.suspension.notification.task.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.account.suspension.notification.task.server.feature/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
../../pom.xml
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
diff --git a/features/org.wso2.carbon.identity.auth.attribute.handler.server.feature/pom.xml b/features/org.wso2.carbon.identity.auth.attribute.handler.server.feature/pom.xml
index d955117d73..e58d52a31f 100644
--- a/features/org.wso2.carbon.identity.auth.attribute.handler.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.auth.attribute.handler.server.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.identity.governance
identity-governance
../../pom.xml
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
diff --git a/features/org.wso2.carbon.identity.captcha.server.feature/pom.xml b/features/org.wso2.carbon.identity.captcha.server.feature/pom.xml
index 14f23fd2c5..da22e3a720 100644
--- a/features/org.wso2.carbon.identity.captcha.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.captcha.server.feature/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
../../pom.xml
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
diff --git a/features/org.wso2.carbon.identity.governance.feature/pom.xml b/features/org.wso2.carbon.identity.governance.feature/pom.xml
index ad49ca73dd..05c6a15a3a 100644
--- a/features/org.wso2.carbon.identity.governance.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.governance.feature/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/features/org.wso2.carbon.identity.governance.server.feature/pom.xml b/features/org.wso2.carbon.identity.governance.server.feature/pom.xml
index 4655326152..4d71e9231c 100644
--- a/features/org.wso2.carbon.identity.governance.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.governance.server.feature/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
../../pom.xml
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
diff --git a/features/org.wso2.carbon.identity.idle.account.identification.server.feature/pom.xml b/features/org.wso2.carbon.identity.idle.account.identification.server.feature/pom.xml
index 88cb3c9a98..2ae941ad0d 100644
--- a/features/org.wso2.carbon.identity.idle.account.identification.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.idle.account.identification.server.feature/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
../../pom.xml
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
diff --git a/features/org.wso2.carbon.identity.multi.attribute.login.service.server.feature/pom.xml b/features/org.wso2.carbon.identity.multi.attribute.login.service.server.feature/pom.xml
index 0760d63a97..43b9dcc7e5 100644
--- a/features/org.wso2.carbon.identity.multi.attribute.login.service.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.multi.attribute.login.service.server.feature/pom.xml
@@ -3,7 +3,7 @@
identity-governance
org.wso2.carbon.identity.governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
4.0.0
diff --git a/features/org.wso2.carbon.identity.password.expiry.server.feature/pom.xml b/features/org.wso2.carbon.identity.password.expiry.server.feature/pom.xml
index 0661e42565..b604ce6007 100644
--- a/features/org.wso2.carbon.identity.password.expiry.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.password.expiry.server.feature/pom.xml
@@ -22,7 +22,7 @@
org.wso2.carbon.identity.governance
identity-governance
../../pom.xml
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
diff --git a/features/org.wso2.carbon.identity.password.history.server.feature/pom.xml b/features/org.wso2.carbon.identity.password.history.server.feature/pom.xml
index b78a7bfb83..10d22b1085 100644
--- a/features/org.wso2.carbon.identity.password.history.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.password.history.server.feature/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
../../pom.xml
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
diff --git a/features/org.wso2.carbon.identity.password.policy.server.feature/pom.xml b/features/org.wso2.carbon.identity.password.policy.server.feature/pom.xml
index cf36b68ad8..35f080707c 100644
--- a/features/org.wso2.carbon.identity.password.policy.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.password.policy.server.feature/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
../../pom.xml
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
diff --git a/features/org.wso2.carbon.identity.piicontroller.server.feature/pom.xml b/features/org.wso2.carbon.identity.piicontroller.server.feature/pom.xml
index f797ec280c..83445781d2 100644
--- a/features/org.wso2.carbon.identity.piicontroller.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.piicontroller.server.feature/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
../../pom.xml
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
diff --git a/features/org.wso2.carbon.identity.recovery.server.feature/pom.xml b/features/org.wso2.carbon.identity.recovery.server.feature/pom.xml
index 01a60de82b..20e60d7efc 100644
--- a/features/org.wso2.carbon.identity.recovery.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.recovery.server.feature/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
../../pom.xml
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
diff --git a/features/org.wso2.carbon.identity.tenant.resource.manager.feature/pom.xml b/features/org.wso2.carbon.identity.tenant.resource.manager.feature/pom.xml
index 5532079a39..80297925e7 100644
--- a/features/org.wso2.carbon.identity.tenant.resource.manager.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.tenant.resource.manager.feature/pom.xml
@@ -20,7 +20,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/features/org.wso2.carbon.identity.user.onboard.core.service.feature/pom.xml b/features/org.wso2.carbon.identity.user.onboard.core.service.feature/pom.xml
index 51bf42c603..3a6250ce82 100644
--- a/features/org.wso2.carbon.identity.user.onboard.core.service.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.user.onboard.core.service.feature/pom.xml
@@ -20,7 +20,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
../../pom.xml
diff --git a/features/org.wso2.carbon.identity.user.server.feature/pom.xml b/features/org.wso2.carbon.identity.user.server.feature/pom.xml
index efbbe2ec21..6f38bb1b5a 100644
--- a/features/org.wso2.carbon.identity.user.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.user.server.feature/pom.xml
@@ -21,7 +21,7 @@
org.wso2.carbon.identity.governance
identity-governance
../../pom.xml
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
diff --git a/pom.xml b/pom.xml
index da7029eebe..d12acf1087 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
org.wso2.carbon.identity.governance
identity-governance
- 1.9.6-SNAPSHOT
+ 1.9.10-SNAPSHOT
4.0.0
pom
WSO2 Carbon - Governance Module