diff --git a/maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestOrganizationController.java b/maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/webapi/identity/rest/RestOrganizationController.java similarity index 98% rename from maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestOrganizationController.java rename to maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/webapi/identity/rest/RestOrganizationController.java index 34b9ffbc..89194d8e 100644 --- a/maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestOrganizationController.java +++ b/maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/webapi/identity/rest/RestOrganizationController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.rest; +package org.maxkey.webapi.identity.rest; import java.io.IOException; diff --git a/maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestUserInfoController.java b/maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/webapi/identity/rest/RestUserInfoController.java similarity index 99% rename from maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestUserInfoController.java rename to maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/webapi/identity/rest/RestUserInfoController.java index f9b810f6..2171515f 100644 --- a/maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestUserInfoController.java +++ b/maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/webapi/identity/rest/RestUserInfoController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.rest; +package org.maxkey.webapi.identity.rest; import java.io.IOException; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimGroupController.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimGroupController.java similarity index 94% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimGroupController.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimGroupController.java index e6e13ea8..14c0663b 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimGroupController.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimGroupController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim; +package org.maxkey.webapi.identity.scim; import java.io.IOException; import java.util.ArrayList; @@ -26,15 +26,15 @@ import java.util.Set; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.entity.Roles; import org.maxkey.entity.UserInfo; -import org.maxkey.mxapis.identity.scim.resources.ScimGroup; -import org.maxkey.mxapis.identity.scim.resources.ScimMemberRef; -import org.maxkey.mxapis.identity.scim.resources.ScimMeta; -import org.maxkey.mxapis.identity.scim.resources.ScimParameters; -import org.maxkey.mxapis.identity.scim.resources.ScimSearchResult; import org.maxkey.persistence.service.RoleMemberService; import org.maxkey.persistence.service.RolesService; import org.maxkey.util.DateUtils; import org.maxkey.util.StringUtils; +import org.maxkey.webapi.identity.scim.resources.ScimGroup; +import org.maxkey.webapi.identity.scim.resources.ScimMemberRef; +import org.maxkey.webapi.identity.scim.resources.ScimMeta; +import org.maxkey.webapi.identity.scim.resources.ScimParameters; +import org.maxkey.webapi.identity.scim.resources.ScimSearchResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimOrganizationController.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimOrganizationController.java similarity index 96% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimOrganizationController.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimOrganizationController.java index 20b07248..412f5319 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimOrganizationController.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimOrganizationController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim; +package org.maxkey.webapi.identity.scim; import java.io.IOException; import java.util.ArrayList; @@ -23,13 +23,13 @@ import java.util.List; import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.entity.Organizations; -import org.maxkey.mxapis.identity.scim.resources.ScimMeta; -import org.maxkey.mxapis.identity.scim.resources.ScimOrganization; -import org.maxkey.mxapis.identity.scim.resources.ScimParameters; -import org.maxkey.mxapis.identity.scim.resources.ScimSearchResult; import org.maxkey.persistence.service.OrganizationsService; import org.maxkey.util.DateUtils; import org.maxkey.util.StringUtils; +import org.maxkey.webapi.identity.scim.resources.ScimMeta; +import org.maxkey.webapi.identity.scim.resources.ScimOrganization; +import org.maxkey.webapi.identity.scim.resources.ScimParameters; +import org.maxkey.webapi.identity.scim.resources.ScimSearchResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimServiceProviderConfigController.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimServiceProviderConfigController.java similarity index 99% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimServiceProviderConfigController.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimServiceProviderConfigController.java index a3259a31..44cf1818 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimServiceProviderConfigController.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimServiceProviderConfigController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim; +package org.maxkey.webapi.identity.scim; import com.fasterxml.jackson.annotation.JsonInclude; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimUserController.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimUserController.java similarity index 92% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimUserController.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimUserController.java index 8f030f10..3c1c6bda 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimUserController.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimUserController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim; +package org.maxkey.webapi.identity.scim; import java.io.IOException; import java.util.ArrayList; @@ -24,22 +24,22 @@ import org.apache.mybatis.jpa.persistence.JpaPageResults; import org.maxkey.constants.ConstsStatus; import org.maxkey.entity.Roles; import org.maxkey.entity.UserInfo; -import org.maxkey.mxapis.identity.scim.resources.ScimEnterprise; -import org.maxkey.mxapis.identity.scim.resources.ScimFormattedName; -import org.maxkey.mxapis.identity.scim.resources.ScimGroupRef; -import org.maxkey.mxapis.identity.scim.resources.ScimManager; -import org.maxkey.mxapis.identity.scim.resources.ScimMeta; -import org.maxkey.mxapis.identity.scim.resources.ScimParameters; -import org.maxkey.mxapis.identity.scim.resources.ScimSearchResult; -import org.maxkey.mxapis.identity.scim.resources.ScimUser; -import org.maxkey.mxapis.identity.scim.resources.ScimUserEmail; -import org.maxkey.mxapis.identity.scim.resources.ScimUserPhoneNumber; -import org.maxkey.mxapis.identity.scim.resources.ScimOrganizationEmail.UserEmailType; -import org.maxkey.mxapis.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType; import org.maxkey.persistence.service.RolesService; import org.maxkey.persistence.service.UserInfoService; import org.maxkey.util.DateUtils; import org.maxkey.util.StringUtils; +import org.maxkey.webapi.identity.scim.resources.ScimEnterprise; +import org.maxkey.webapi.identity.scim.resources.ScimFormattedName; +import org.maxkey.webapi.identity.scim.resources.ScimGroupRef; +import org.maxkey.webapi.identity.scim.resources.ScimManager; +import org.maxkey.webapi.identity.scim.resources.ScimMeta; +import org.maxkey.webapi.identity.scim.resources.ScimParameters; +import org.maxkey.webapi.identity.scim.resources.ScimSearchResult; +import org.maxkey.webapi.identity.scim.resources.ScimUser; +import org.maxkey.webapi.identity.scim.resources.ScimUserEmail; +import org.maxkey.webapi.identity.scim.resources.ScimUserPhoneNumber; +import org.maxkey.webapi.identity.scim.resources.ScimOrganizationEmail.UserEmailType; +import org.maxkey.webapi.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterprise.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterprise.java similarity index 97% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterprise.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterprise.java index 744f2c18..88c297e3 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterprise.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterprise.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterpriseUser.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterpriseUser.java similarity index 96% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterpriseUser.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterpriseUser.java index a0847aad..e14ef506 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterpriseUser.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterpriseUser.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.util.HashSet; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimFormattedName.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimFormattedName.java similarity index 98% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimFormattedName.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimFormattedName.java index efe8e102..a9c55d6b 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimFormattedName.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimFormattedName.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroup.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroup.java similarity index 96% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroup.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroup.java index 54afd0d7..06374ff0 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroup.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroup.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.util.HashSet; import java.util.Set; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroupRef.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroupRef.java similarity index 94% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroupRef.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroupRef.java index 4c370709..7ad53fc1 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroupRef.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroupRef.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; public class ScimGroupRef extends ScimMultiValuedAttribute{ diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimManager.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimManager.java similarity index 96% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimManager.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimManager.java index 7c09a204..24a56923 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimManager.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimManager.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; public class ScimManager { diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMemberRef.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMemberRef.java similarity index 94% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMemberRef.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMemberRef.java index bb5a36aa..d613e403 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMemberRef.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMemberRef.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; public class ScimMemberRef extends ScimMultiValuedAttribute{ diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMeta.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMeta.java similarity index 98% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMeta.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMeta.java index db26fc68..591faa51 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMeta.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMeta.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; import java.util.Date; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMultiValuedAttribute.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMultiValuedAttribute.java similarity index 97% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMultiValuedAttribute.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMultiValuedAttribute.java index 5c86aba6..3c8b0460 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMultiValuedAttribute.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMultiValuedAttribute.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganization.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganization.java similarity index 98% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganization.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganization.java index 03510dd6..1c8dbd6f 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganization.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganization.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.util.HashSet; import java.util.List; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationAddress.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationAddress.java similarity index 97% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationAddress.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationAddress.java index 2b02c7f9..af10919b 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationAddress.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationAddress.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationEmail.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationEmail.java similarity index 97% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationEmail.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationEmail.java index 9eadf430..685f264c 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationEmail.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationEmail.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationPhoneNumber.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationPhoneNumber.java similarity index 96% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationPhoneNumber.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationPhoneNumber.java index 25172d4c..36d0feba 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationPhoneNumber.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationPhoneNumber.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimParameters.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimParameters.java similarity index 95% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimParameters.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimParameters.java index f7e4f494..e3f56407 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimParameters.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimParameters.java @@ -15,9 +15,9 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; -import org.maxkey.mxapis.identity.scim.ScimServiceProviderConfigController; +import org.maxkey.webapi.identity.scim.ScimServiceProviderConfigController; public class ScimParameters { int startIndex = 1; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimResource.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimResource.java similarity index 97% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimResource.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimResource.java index 94585141..54744a13 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimResource.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimResource.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; import java.util.Set; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimSearchResult.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimSearchResult.java similarity index 98% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimSearchResult.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimSearchResult.java index cdeb1ece..a1a7cce7 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimSearchResult.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimSearchResult.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.util.ArrayList; import java.util.Collections; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUser.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUser.java similarity index 99% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUser.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUser.java index 5289ba56..feef7d02 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUser.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUser.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.util.HashSet; import java.util.List; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserAddress.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserAddress.java similarity index 97% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserAddress.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserAddress.java index 70967679..e42f59fb 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserAddress.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserAddress.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEmail.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEmail.java similarity index 97% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEmail.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEmail.java index ee60817c..3c969f00 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEmail.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEmail.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEntitlement.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEntitlement.java similarity index 94% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEntitlement.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEntitlement.java index 74b5222f..c5dfa48b 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEntitlement.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEntitlement.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserExtension.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserExtension.java similarity index 94% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserExtension.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserExtension.java index d6dcc7ad..f1012268 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserExtension.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserExtension.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserIm.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserIm.java similarity index 96% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserIm.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserIm.java index ea053373..c4f8c044 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserIm.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserIm.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserOrganization.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserOrganization.java similarity index 95% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserOrganization.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserOrganization.java index fcb1597c..dbf04b78 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserOrganization.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserOrganization.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoneNumber.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoneNumber.java similarity index 96% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoneNumber.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoneNumber.java index 64858d72..1ea5e662 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoneNumber.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoneNumber.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoto.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoto.java similarity index 94% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoto.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoto.java index 2ba85711..3e1f379e 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoto.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoto.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserRole.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserRole.java similarity index 94% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserRole.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserRole.java index 1e611f62..2e79411f 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserRole.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserRole.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserX509Certificate.java b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserX509Certificate.java similarity index 94% rename from maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserX509Certificate.java rename to maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserX509Certificate.java index b435a0b6..57a535b8 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserX509Certificate.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserX509Certificate.java @@ -15,7 +15,7 @@ */ -package org.maxkey.mxapis.identity.scim.resources; +package org.maxkey.webapi.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java index ac0ce1af..33bb9ad5 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java @@ -17,9 +17,9 @@ package org.maxkey.identity.scim.resources; -import org.maxkey.mxapis.identity.scim.resources.ScimEnterpriseUser; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; +import org.maxkey.webapi.identity.scim.resources.ScimEnterpriseUser; public class ScimEnterpriseUserJsonString2ObjectTest { diff --git a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java index d1b3a462..881701cf 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java @@ -21,14 +21,14 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.maxkey.mxapis.identity.scim.resources.ScimEnterprise; -import org.maxkey.mxapis.identity.scim.resources.ScimEnterpriseUser; -import org.maxkey.mxapis.identity.scim.resources.ScimFormattedName; -import org.maxkey.mxapis.identity.scim.resources.ScimMeta; -import org.maxkey.mxapis.identity.scim.resources.ScimUserEmail; -import org.maxkey.mxapis.identity.scim.resources.ScimUserPhoneNumber; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; +import org.maxkey.webapi.identity.scim.resources.ScimEnterprise; +import org.maxkey.webapi.identity.scim.resources.ScimEnterpriseUser; +import org.maxkey.webapi.identity.scim.resources.ScimFormattedName; +import org.maxkey.webapi.identity.scim.resources.ScimMeta; +import org.maxkey.webapi.identity.scim.resources.ScimUserEmail; +import org.maxkey.webapi.identity.scim.resources.ScimUserPhoneNumber; public class ScimEnterpriseUserJsonTest { diff --git a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java index 4d5a0f15..4f1bccb7 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java @@ -17,9 +17,9 @@ package org.maxkey.identity.scim.resources; -import org.maxkey.mxapis.identity.scim.resources.ScimGroup; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; +import org.maxkey.webapi.identity.scim.resources.ScimGroup; public class ScimGroupJsonString2ObjectTest { public static void main(String[] args) { diff --git a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java index af1436b7..a36fc6db 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java @@ -21,11 +21,11 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -import org.maxkey.mxapis.identity.scim.resources.ScimGroup; -import org.maxkey.mxapis.identity.scim.resources.ScimMemberRef; -import org.maxkey.mxapis.identity.scim.resources.ScimMeta; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; +import org.maxkey.webapi.identity.scim.resources.ScimGroup; +import org.maxkey.webapi.identity.scim.resources.ScimMemberRef; +import org.maxkey.webapi.identity.scim.resources.ScimMeta; public class ScimGroupJsonTest { public static void main(String[] args) { diff --git a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java index c5d4c92b..5612c2cd 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java @@ -17,9 +17,9 @@ package org.maxkey.identity.scim.resources; -import org.maxkey.mxapis.identity.scim.resources.ScimUser; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; +import org.maxkey.webapi.identity.scim.resources.ScimUser; public class ScimUserJsonString2ObjectTest { diff --git a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java index 3177dd51..70115aa5 100644 --- a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java +++ b/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java @@ -21,13 +21,13 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.maxkey.mxapis.identity.scim.resources.ScimFormattedName; -import org.maxkey.mxapis.identity.scim.resources.ScimMeta; -import org.maxkey.mxapis.identity.scim.resources.ScimUser; -import org.maxkey.mxapis.identity.scim.resources.ScimUserEmail; -import org.maxkey.mxapis.identity.scim.resources.ScimUserPhoneNumber; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; +import org.maxkey.webapi.identity.scim.resources.ScimFormattedName; +import org.maxkey.webapi.identity.scim.resources.ScimMeta; +import org.maxkey.webapi.identity.scim.resources.ScimUser; +import org.maxkey.webapi.identity.scim.resources.ScimUserEmail; +import org.maxkey.webapi.identity.scim.resources.ScimUserPhoneNumber; public class ScimUserJsonTest { diff --git a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java index 37707cbb..ecbbb43d 100644 --- a/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java +++ b/maxkey-webs/maxkey-web-mgt/src/main/java/org/maxkey/MaxKeyMgtApplication.java @@ -39,9 +39,9 @@ import org.springframework.context.annotation.ComponentScan; "org.maxkey.entity", "org.maxkey.entity.apps", "org.maxkey.entity.userinfo", - "org.maxkey.mxapis.identity.kafka", - "org.maxkey.mxapis.identity.rest", - "org.maxkey.mxapis.identity.scim", + "org.maxkey.webapi.identity.kafka", + "org.maxkey.webapi.identity.rest", + "org.maxkey.webapi.identity.scim", "org.maxkey.persistence", "org.maxkey.provision", "org.maxkey.synchronizer",