From f01ce91ece6ac9c0d8ba1ca67bfcfd5e65fbe5a1 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Thu, 2 Feb 2023 16:02:51 +0800 Subject: [PATCH] rename maxkey-webapis to maxkey-web-apis --- .../rest/RestOrganizationController.java | 2 +- .../identity/rest/RestUserInfoController.java | 2 +- .../identity/scim/ScimGroupController.java | 12 ++++----- .../scim/ScimOrganizationController.java | 10 +++---- .../ScimServiceProviderConfigController.java | 2 +- .../identity/scim/ScimUserController.java | 26 +++++++++---------- .../scim/resources/ScimEnterprise.java | 2 +- .../scim/resources/ScimEnterpriseUser.java | 2 +- .../scim/resources/ScimFormattedName.java | 2 +- .../identity/scim/resources/ScimGroup.java | 2 +- .../identity/scim/resources/ScimGroupRef.java | 2 +- .../identity/scim/resources/ScimManager.java | 2 +- .../scim/resources/ScimMemberRef.java | 2 +- .../identity/scim/resources/ScimMeta.java | 2 +- .../resources/ScimMultiValuedAttribute.java | 2 +- .../scim/resources/ScimOrganization.java | 2 +- .../resources/ScimOrganizationAddress.java | 2 +- .../scim/resources/ScimOrganizationEmail.java | 2 +- .../ScimOrganizationPhoneNumber.java | 2 +- .../scim/resources/ScimParameters.java | 4 +-- .../identity/scim/resources/ScimResource.java | 2 +- .../scim/resources/ScimSearchResult.java | 2 +- .../identity/scim/resources/ScimUser.java | 2 +- .../scim/resources/ScimUserAddress.java | 2 +- .../scim/resources/ScimUserEmail.java | 2 +- .../scim/resources/ScimUserEntitlement.java | 2 +- .../scim/resources/ScimUserExtension.java | 2 +- .../identity/scim/resources/ScimUserIm.java | 2 +- .../scim/resources/ScimUserOrganization.java | 2 +- .../scim/resources/ScimUserPhoneNumber.java | 2 +- .../scim/resources/ScimUserPhoto.java | 2 +- .../identity/scim/resources/ScimUserRole.java | 2 +- .../resources/ScimUserX509Certificate.java | 2 +- ...imEnterpriseUserJsonString2ObjectTest.java | 2 +- .../resources/ScimEnterpriseUserJsonTest.java | 12 ++++----- .../ScimGroupJsonString2ObjectTest.java | 2 +- .../scim/resources/ScimGroupJsonTest.java | 6 ++--- .../ScimUserJsonString2ObjectTest.java | 2 +- .../scim/resources/ScimUserJsonTest.java | 10 +++---- .../java/org/maxkey/MaxKeyMgtApplication.java | 6 ++--- 40 files changed, 75 insertions(+), 75 deletions(-) rename maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/{webapi => web/apis}/identity/rest/RestOrganizationController.java (98%) rename maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/{webapi => web/apis}/identity/rest/RestUserInfoController.java (99%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/ScimGroupController.java (94%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/ScimOrganizationController.java (96%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/ScimServiceProviderConfigController.java (99%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/ScimUserController.java (91%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimEnterprise.java (97%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimEnterpriseUser.java (96%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimFormattedName.java (97%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimGroup.java (96%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimGroupRef.java (94%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimManager.java (95%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimMemberRef.java (94%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimMeta.java (98%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimMultiValuedAttribute.java (97%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimOrganization.java (98%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimOrganizationAddress.java (97%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimOrganizationEmail.java (97%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimOrganizationPhoneNumber.java (95%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimParameters.java (94%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimResource.java (97%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimSearchResult.java (98%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimUser.java (99%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimUserAddress.java (97%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimUserEmail.java (96%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimUserEntitlement.java (94%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimUserExtension.java (94%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimUserIm.java (96%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimUserOrganization.java (95%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimUserPhoneNumber.java (96%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimUserPhoto.java (94%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimUserRole.java (94%) rename maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/{webapi => web/apis}/identity/scim/resources/ScimUserX509Certificate.java (94%) diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/webapi/identity/rest/RestOrganizationController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestOrganizationController.java similarity index 98% rename from maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/webapi/identity/rest/RestOrganizationController.java rename to maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestOrganizationController.java index 89194d8e7..e14635abe 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/webapi/identity/rest/RestOrganizationController.java +++ b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestOrganizationController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.rest; +package org.maxkey.web.apis.identity.rest; import java.io.IOException; diff --git a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/webapi/identity/rest/RestUserInfoController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestUserInfoController.java similarity index 99% rename from maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/webapi/identity/rest/RestUserInfoController.java rename to maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestUserInfoController.java index 2171515f5..05b89ba61 100644 --- a/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/webapi/identity/rest/RestUserInfoController.java +++ b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/web/apis/identity/rest/RestUserInfoController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.rest; +package org.maxkey.web.apis.identity.rest; import java.io.IOException; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimGroupController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimGroupController.java similarity index 94% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimGroupController.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimGroupController.java index 14c0663b4..d6e74830b 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimGroupController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimGroupController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim; +package org.maxkey.web.apis.identity.scim; import java.io.IOException; import java.util.ArrayList; @@ -30,11 +30,11 @@ 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.maxkey.web.apis.identity.scim.resources.ScimGroup; +import org.maxkey.web.apis.identity.scim.resources.ScimMemberRef; +import org.maxkey.web.apis.identity.scim.resources.ScimMeta; +import org.maxkey.web.apis.identity.scim.resources.ScimParameters; +import org.maxkey.web.apis.identity.scim.resources.ScimSearchResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimOrganizationController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimOrganizationController.java similarity index 96% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimOrganizationController.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimOrganizationController.java index 412f5319b..6a776eb48 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimOrganizationController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimOrganizationController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim; +package org.maxkey.web.apis.identity.scim; import java.io.IOException; import java.util.ArrayList; @@ -26,10 +26,10 @@ import org.maxkey.entity.Organizations; 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.maxkey.web.apis.identity.scim.resources.ScimMeta; +import org.maxkey.web.apis.identity.scim.resources.ScimOrganization; +import org.maxkey.web.apis.identity.scim.resources.ScimParameters; +import org.maxkey.web.apis.identity.scim.resources.ScimSearchResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimServiceProviderConfigController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimServiceProviderConfigController.java similarity index 99% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimServiceProviderConfigController.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimServiceProviderConfigController.java index 44cf18183..38a35b633 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimServiceProviderConfigController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimServiceProviderConfigController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim; +package org.maxkey.web.apis.identity.scim; import com.fasterxml.jackson.annotation.JsonInclude; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimUserController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimUserController.java similarity index 91% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimUserController.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimUserController.java index 3c1c6bdae..b37c4e27d 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimUserController.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/ScimUserController.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim; +package org.maxkey.web.apis.identity.scim; import java.io.IOException; import java.util.ArrayList; @@ -28,18 +28,18 @@ 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.maxkey.web.apis.identity.scim.resources.ScimEnterprise; +import org.maxkey.web.apis.identity.scim.resources.ScimFormattedName; +import org.maxkey.web.apis.identity.scim.resources.ScimGroupRef; +import org.maxkey.web.apis.identity.scim.resources.ScimManager; +import org.maxkey.web.apis.identity.scim.resources.ScimMeta; +import org.maxkey.web.apis.identity.scim.resources.ScimParameters; +import org.maxkey.web.apis.identity.scim.resources.ScimSearchResult; +import org.maxkey.web.apis.identity.scim.resources.ScimUser; +import org.maxkey.web.apis.identity.scim.resources.ScimUserEmail; +import org.maxkey.web.apis.identity.scim.resources.ScimUserPhoneNumber; +import org.maxkey.web.apis.identity.scim.resources.ScimOrganizationEmail.UserEmailType; +import org.maxkey.web.apis.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterprise.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterprise.java similarity index 97% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterprise.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterprise.java index 88c297e31..1e16a2e74 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterprise.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterprise.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterpriseUser.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterpriseUser.java similarity index 96% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterpriseUser.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterpriseUser.java index e14ef5063..39f68dbd1 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterpriseUser.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimEnterpriseUser.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.util.HashSet; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimFormattedName.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimFormattedName.java similarity index 97% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimFormattedName.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimFormattedName.java index a9c55d6b8..0695a5ea7 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimFormattedName.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimFormattedName.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroup.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroup.java similarity index 96% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroup.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroup.java index 06374ff09..b803f0558 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroup.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroup.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.util.HashSet; import java.util.Set; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroupRef.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroupRef.java similarity index 94% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroupRef.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroupRef.java index 7ad53fc14..6c21f7f8e 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroupRef.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimGroupRef.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; public class ScimGroupRef extends ScimMultiValuedAttribute{ diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimManager.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimManager.java similarity index 95% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimManager.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimManager.java index 24a56923e..6d5d568e2 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimManager.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimManager.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; public class ScimManager { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMemberRef.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMemberRef.java similarity index 94% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMemberRef.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMemberRef.java index d613e4035..c06c488f7 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMemberRef.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMemberRef.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; public class ScimMemberRef extends ScimMultiValuedAttribute{ diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMeta.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMeta.java similarity index 98% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMeta.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMeta.java index 591faa51c..408bf19cc 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMeta.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMeta.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; import java.util.Date; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMultiValuedAttribute.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMultiValuedAttribute.java similarity index 97% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMultiValuedAttribute.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMultiValuedAttribute.java index 3c8b0460d..0cf665994 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMultiValuedAttribute.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimMultiValuedAttribute.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganization.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganization.java similarity index 98% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganization.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganization.java index 1c8dbd6f6..0b9511d5a 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganization.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganization.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.util.HashSet; import java.util.List; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationAddress.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationAddress.java similarity index 97% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationAddress.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationAddress.java index af10919b2..1bbb536cd 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationAddress.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationAddress.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationEmail.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationEmail.java similarity index 97% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationEmail.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationEmail.java index 685f264ca..00dfddd3c 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationEmail.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationEmail.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationPhoneNumber.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationPhoneNumber.java similarity index 95% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationPhoneNumber.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationPhoneNumber.java index 36d0feba7..395dbd80b 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationPhoneNumber.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimOrganizationPhoneNumber.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimParameters.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimParameters.java similarity index 94% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimParameters.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimParameters.java index e3f564070..2d32080fc 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimParameters.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimParameters.java @@ -15,9 +15,9 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; -import org.maxkey.webapi.identity.scim.ScimServiceProviderConfigController; +import org.maxkey.web.apis.identity.scim.ScimServiceProviderConfigController; public class ScimParameters { int startIndex = 1; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimResource.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimResource.java similarity index 97% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimResource.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimResource.java index 54744a139..bcc2a1c34 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimResource.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimResource.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; import java.util.Set; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimSearchResult.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimSearchResult.java similarity index 98% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimSearchResult.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimSearchResult.java index a1a7cce7b..f2454b5aa 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimSearchResult.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimSearchResult.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.util.ArrayList; import java.util.Collections; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUser.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUser.java similarity index 99% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUser.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUser.java index feef7d022..114284020 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUser.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUser.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.util.HashSet; import java.util.List; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserAddress.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserAddress.java similarity index 97% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserAddress.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserAddress.java index e42f59fbc..5a570dfc0 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserAddress.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserAddress.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEmail.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEmail.java similarity index 96% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEmail.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEmail.java index 3c969f008..2f3c59aef 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEmail.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEmail.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEntitlement.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEntitlement.java similarity index 94% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEntitlement.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEntitlement.java index c5dfa48bd..ed05f23a6 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEntitlement.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserEntitlement.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserExtension.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserExtension.java similarity index 94% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserExtension.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserExtension.java index f10122680..cffa5ea2d 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserExtension.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserExtension.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserIm.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserIm.java similarity index 96% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserIm.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserIm.java index c4f8c0443..968c02f58 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserIm.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserIm.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserOrganization.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserOrganization.java similarity index 95% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserOrganization.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserOrganization.java index dbf04b78e..b68c0edb7 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserOrganization.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserOrganization.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoneNumber.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoneNumber.java similarity index 96% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoneNumber.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoneNumber.java index 1ea5e6620..fe120b807 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoneNumber.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoneNumber.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoto.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoto.java similarity index 94% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoto.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoto.java index 3e1f379ed..a4343cba3 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoto.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserPhoto.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserRole.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserRole.java similarity index 94% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserRole.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserRole.java index 2e79411f3..5937d8951 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserRole.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserRole.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserX509Certificate.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserX509Certificate.java similarity index 94% rename from maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserX509Certificate.java rename to maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserX509Certificate.java index 57a535b88..c0d6f17e5 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserX509Certificate.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/web/apis/identity/scim/resources/ScimUserX509Certificate.java @@ -15,7 +15,7 @@ */ -package org.maxkey.webapi.identity.scim.resources; +package org.maxkey.web.apis.identity.scim.resources; import java.io.Serializable; diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java index 33bb9ad58..d1cb860bf 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java @@ -19,7 +19,7 @@ package org.maxkey.identity.scim.resources; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; -import org.maxkey.webapi.identity.scim.resources.ScimEnterpriseUser; +import org.maxkey.web.apis.identity.scim.resources.ScimEnterpriseUser; public class ScimEnterpriseUserJsonString2ObjectTest { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java index 881701cf3..83bcdfd38 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java @@ -23,12 +23,12 @@ import java.util.List; 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; +import org.maxkey.web.apis.identity.scim.resources.ScimEnterprise; +import org.maxkey.web.apis.identity.scim.resources.ScimEnterpriseUser; +import org.maxkey.web.apis.identity.scim.resources.ScimFormattedName; +import org.maxkey.web.apis.identity.scim.resources.ScimMeta; +import org.maxkey.web.apis.identity.scim.resources.ScimUserEmail; +import org.maxkey.web.apis.identity.scim.resources.ScimUserPhoneNumber; public class ScimEnterpriseUserJsonTest { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java index 4f1bccb71..2f5b5747e 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java @@ -19,7 +19,7 @@ package org.maxkey.identity.scim.resources; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; -import org.maxkey.webapi.identity.scim.resources.ScimGroup; +import org.maxkey.web.apis.identity.scim.resources.ScimGroup; public class ScimGroupJsonString2ObjectTest { public static void main(String[] args) { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java index a36fc6dba..fbaa2a6f5 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java @@ -23,9 +23,9 @@ import java.util.Set; 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; +import org.maxkey.web.apis.identity.scim.resources.ScimGroup; +import org.maxkey.web.apis.identity.scim.resources.ScimMemberRef; +import org.maxkey.web.apis.identity.scim.resources.ScimMeta; public class ScimGroupJsonTest { public static void main(String[] args) { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java index 5612c2cda..dcbac5208 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java @@ -19,7 +19,7 @@ package org.maxkey.identity.scim.resources; import org.maxkey.pretty.impl.JsonPretty; import org.maxkey.util.JsonUtils; -import org.maxkey.webapi.identity.scim.resources.ScimUser; +import org.maxkey.web.apis.identity.scim.resources.ScimUser; public class ScimUserJsonString2ObjectTest { diff --git a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java index 70115aa59..2ceef2713 100644 --- a/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java +++ b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java @@ -23,11 +23,11 @@ import java.util.List; 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; +import org.maxkey.web.apis.identity.scim.resources.ScimFormattedName; +import org.maxkey.web.apis.identity.scim.resources.ScimMeta; +import org.maxkey.web.apis.identity.scim.resources.ScimUser; +import org.maxkey.web.apis.identity.scim.resources.ScimUserEmail; +import org.maxkey.web.apis.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 ecbbb43dc..e3224c99b 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.webapi.identity.kafka", - "org.maxkey.webapi.identity.rest", - "org.maxkey.webapi.identity.scim", + "org.maxkey.web.apis.identity.kafka", + "org.maxkey.web.apis.identity.rest", + "org.maxkey.web.apis.identity.scim", "org.maxkey.persistence", "org.maxkey.provision", "org.maxkey.synchronizer",