From ac61b133c5d3420238f803f0c348c309cc9d7607 Mon Sep 17 00:00:00 2001 From: MaxKey Date: Thu, 2 Feb 2023 15:51:48 +0800 Subject: [PATCH] rename maxkey-webapis to maxkey-web-apis --- build.gradle | 4 ++-- config/build_standard.gradle | 4 ++-- gradle.properties | 4 ++-- .../maxkey-web-api-rest}/build.gradle | 2 +- .../webapi/identity/rest/RestOrganizationController.java | 0 .../maxkey/webapi/identity/rest/RestUserInfoController.java | 0 .../maxkey-web-api-scim}/build.gradle | 2 +- .../org/maxkey/webapi/identity/scim/ScimGroupController.java | 0 .../webapi/identity/scim/ScimOrganizationController.java | 0 .../identity/scim/ScimServiceProviderConfigController.java | 0 .../org/maxkey/webapi/identity/scim/ScimUserController.java | 0 .../maxkey/webapi/identity/scim/resources/ScimEnterprise.java | 0 .../webapi/identity/scim/resources/ScimEnterpriseUser.java | 0 .../webapi/identity/scim/resources/ScimFormattedName.java | 0 .../org/maxkey/webapi/identity/scim/resources/ScimGroup.java | 0 .../maxkey/webapi/identity/scim/resources/ScimGroupRef.java | 0 .../maxkey/webapi/identity/scim/resources/ScimManager.java | 0 .../maxkey/webapi/identity/scim/resources/ScimMemberRef.java | 0 .../org/maxkey/webapi/identity/scim/resources/ScimMeta.java | 0 .../identity/scim/resources/ScimMultiValuedAttribute.java | 0 .../webapi/identity/scim/resources/ScimOrganization.java | 0 .../identity/scim/resources/ScimOrganizationAddress.java | 0 .../webapi/identity/scim/resources/ScimOrganizationEmail.java | 0 .../identity/scim/resources/ScimOrganizationPhoneNumber.java | 0 .../maxkey/webapi/identity/scim/resources/ScimParameters.java | 0 .../maxkey/webapi/identity/scim/resources/ScimResource.java | 0 .../webapi/identity/scim/resources/ScimSearchResult.java | 0 .../org/maxkey/webapi/identity/scim/resources/ScimUser.java | 0 .../webapi/identity/scim/resources/ScimUserAddress.java | 0 .../maxkey/webapi/identity/scim/resources/ScimUserEmail.java | 0 .../webapi/identity/scim/resources/ScimUserEntitlement.java | 0 .../webapi/identity/scim/resources/ScimUserExtension.java | 0 .../org/maxkey/webapi/identity/scim/resources/ScimUserIm.java | 0 .../webapi/identity/scim/resources/ScimUserOrganization.java | 0 .../webapi/identity/scim/resources/ScimUserPhoneNumber.java | 0 .../maxkey/webapi/identity/scim/resources/ScimUserPhoto.java | 0 .../maxkey/webapi/identity/scim/resources/ScimUserRole.java | 0 .../identity/scim/resources/ScimUserX509Certificate.java | 0 .../org/maxkey/identity/scim/resources/ReadJson2String.java | 0 .../identity/scim/resources/ScimEnterpriseUserJsonString.json | 0 .../resources/ScimEnterpriseUserJsonString2ObjectTest.java | 0 .../identity/scim/resources/ScimEnterpriseUserJsonTest.java | 0 .../maxkey/identity/scim/resources/ScimGroupJsonString.json | 0 .../scim/resources/ScimGroupJsonString2ObjectTest.java | 0 .../org/maxkey/identity/scim/resources/ScimGroupJsonTest.java | 0 .../maxkey/identity/scim/resources/ScimUserJsonString.json | 0 .../scim/resources/ScimUserJsonString2ObjectTest.java | 0 .../org/maxkey/identity/scim/resources/ScimUserJsonTest.java | 0 maxkey-webs/maxkey-web-mgt/build.gradle | 4 ++-- maxkey-webs/maxkey-web-mgt/config/build_docker.gradle | 4 ++-- maxkey-webs/maxkey-web-mgt/config/build_jar.gradle | 4 ++-- maxkey-webs/maxkey-web-mgt/config/build_standard.gradle | 4 ++-- settings.gradle | 4 ++-- 53 files changed, 18 insertions(+), 18 deletions(-) rename {maxkey-webapis/maxkey-webapi-rest => maxkey-web-apis/maxkey-web-api-rest}/build.gradle (88%) rename {maxkey-webapis/maxkey-webapi-rest => maxkey-web-apis/maxkey-web-api-rest}/src/main/java/org/maxkey/webapi/identity/rest/RestOrganizationController.java (100%) rename {maxkey-webapis/maxkey-webapi-rest => maxkey-web-apis/maxkey-web-api-rest}/src/main/java/org/maxkey/webapi/identity/rest/RestUserInfoController.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/build.gradle (87%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/ScimGroupController.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/ScimOrganizationController.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/ScimServiceProviderConfigController.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/ScimUserController.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterprise.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimEnterpriseUser.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimFormattedName.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroup.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimGroupRef.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimManager.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMemberRef.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMeta.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimMultiValuedAttribute.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganization.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationAddress.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationEmail.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimOrganizationPhoneNumber.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimParameters.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimResource.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimSearchResult.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUser.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserAddress.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEmail.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserEntitlement.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserExtension.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserIm.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserOrganization.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoneNumber.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserPhoto.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserRole.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/main/java/org/maxkey/webapi/identity/scim/resources/ScimUserX509Certificate.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/test/java/org/maxkey/identity/scim/resources/ReadJson2String.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString.json (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString.json (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString.json (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java (100%) rename {maxkey-webapis/maxkey-webapi-scim => maxkey-web-apis/maxkey-web-api-scim}/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java (100%) diff --git a/build.gradle b/build.gradle index 76479ca58..dd4565cbc 100644 --- a/build.gradle +++ b/build.gradle @@ -46,8 +46,8 @@ def libjarsmapper=[ 'maxkey-web-resources' :'lib', 'maxkey-authentication-social' :'maxkey', 'maxkey-web-maxkey' :'maxkey', - 'maxkey-webapi-rest' :'maxkey_mgt', - 'maxkey-webapi-scim' :'maxkey_mgt', + 'maxkey-web-api-rest' :'maxkey_mgt', + 'maxkey-web-api-scim' :'maxkey_mgt', 'maxkey-web-mgt' :'maxkey_mgt', 'maxkey-synchronizer' :'maxkey_mgt', 'maxkey-synchronizer-activedirectory' :'maxkey_mgt', diff --git a/config/build_standard.gradle b/config/build_standard.gradle index 817ba4f49..8a2eee3d7 100644 --- a/config/build_standard.gradle +++ b/config/build_standard.gradle @@ -46,8 +46,8 @@ def libjarsmapper=[ 'maxkey-web-resources' :'lib', 'maxkey-authentication-social' :'maxkey', 'maxkey-web-maxkey' :'maxkey', - 'maxkey-webapi-rest' :'maxkey_mgt', - 'maxkey-webapi-scim' :'maxkey_mgt', + 'maxkey-web-api-rest' :'maxkey_mgt', + 'maxkey-web-api-scim' :'maxkey_mgt', 'maxkey-web-mgt' :'maxkey_mgt', 'maxkey-synchronizer' :'maxkey_mgt', 'maxkey-synchronizer-activedirectory' :'maxkey_mgt', diff --git a/gradle.properties b/gradle.properties index 1e47ec19d..9d883ae12 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #/* -# * Copyright [2022] [MaxKey of copyright http://www.maxkey.top] +# * Copyright [2023] [MaxKey of copyright http://www.maxkey.top] # * # * Licensed under the Apache License, Version 2.0 (the "License"); # * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ author =MaxKeyTop jibFromImage =adoptopenjdk:8-jre jibToImage =maxkeytop jibToAuthUsername =maxkeytop -jibToAuthPassword =docker registry credential +jibToAuthPassword =docker registry credential #maxkey used jars version #Apache diff --git a/maxkey-webapis/maxkey-webapi-rest/build.gradle b/maxkey-web-apis/maxkey-web-api-rest/build.gradle similarity index 88% rename from maxkey-webapis/maxkey-webapi-rest/build.gradle rename to maxkey-web-apis/maxkey-web-api-rest/build.gradle index 6c5b30afc..e80276461 100644 --- a/maxkey-webapis/maxkey-webapi-rest/build.gradle +++ b/maxkey-web-apis/maxkey-web-api-rest/build.gradle @@ -1,4 +1,4 @@ -description = "maxkey-webapi-rest" +description = "maxkey-web-api-rest" apply plugin: 'java' apply plugin: 'eclipse-wtp' diff --git a/maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/webapi/identity/rest/RestOrganizationController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/webapi/identity/rest/RestOrganizationController.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/rest/RestOrganizationController.java diff --git a/maxkey-webapis/maxkey-webapi-rest/src/main/java/org/maxkey/webapi/identity/rest/RestUserInfoController.java b/maxkey-web-apis/maxkey-web-api-rest/src/main/java/org/maxkey/webapi/identity/rest/RestUserInfoController.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/rest/RestUserInfoController.java diff --git a/maxkey-webapis/maxkey-webapi-scim/build.gradle b/maxkey-web-apis/maxkey-web-api-scim/build.gradle similarity index 87% rename from maxkey-webapis/maxkey-webapi-scim/build.gradle rename to maxkey-web-apis/maxkey-web-api-scim/build.gradle index 8127140d2..a387dbf13 100644 --- a/maxkey-webapis/maxkey-webapi-scim/build.gradle +++ b/maxkey-web-apis/maxkey-web-api-scim/build.gradle @@ -1,4 +1,4 @@ -description = "maxkey-webapi-scim" +description = "maxkey-web-api-scim" apply plugin: 'java' diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimGroupController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimGroupController.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/ScimGroupController.java diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimOrganizationController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimOrganizationController.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/ScimOrganizationController.java diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimServiceProviderConfigController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimServiceProviderConfigController.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/ScimServiceProviderConfigController.java diff --git a/maxkey-webapis/maxkey-webapi-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimUserController.java b/maxkey-web-apis/maxkey-web-api-scim/src/main/java/org/maxkey/webapi/identity/scim/ScimUserController.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/ScimUserController.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimEnterprise.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimEnterprise.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimEnterpriseUser.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimEnterpriseUser.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimFormattedName.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimFormattedName.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimGroup.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimGroup.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimGroupRef.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimGroupRef.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimManager.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimManager.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimMemberRef.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimMemberRef.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimMeta.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimMeta.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimMultiValuedAttribute.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimMultiValuedAttribute.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimOrganization.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimOrganization.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimOrganizationAddress.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimOrganizationAddress.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimOrganizationEmail.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimOrganizationEmail.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimOrganizationPhoneNumber.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimOrganizationPhoneNumber.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimParameters.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimParameters.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimResource.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimResource.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimSearchResult.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimSearchResult.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUser.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUser.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserAddress.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserAddress.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserEmail.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserEmail.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserEntitlement.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserEntitlement.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserExtension.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserExtension.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserIm.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserIm.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserOrganization.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserOrganization.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserPhoneNumber.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserPhoneNumber.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserPhoto.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserPhoto.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserRole.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserRole.java diff --git a/maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserX509Certificate.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-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/webapi/identity/scim/resources/ScimUserX509Certificate.java diff --git a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ReadJson2String.java b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ReadJson2String.java similarity index 100% rename from maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ReadJson2String.java rename to maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ReadJson2String.java diff --git a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString.json b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString.json similarity index 100% rename from maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString.json rename to maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString.json diff --git a/maxkey-webapis/maxkey-webapi-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 similarity index 100% rename from maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java rename to maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java diff --git a/maxkey-webapis/maxkey-webapi-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 similarity index 100% rename from maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java rename to maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java diff --git a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString.json b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString.json similarity index 100% rename from maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString.json rename to maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString.json diff --git a/maxkey-webapis/maxkey-webapi-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 similarity index 100% rename from maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java rename to maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java diff --git a/maxkey-webapis/maxkey-webapi-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 similarity index 100% rename from maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java rename to maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java diff --git a/maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString.json b/maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString.json similarity index 100% rename from maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString.json rename to maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString.json diff --git a/maxkey-webapis/maxkey-webapi-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 similarity index 100% rename from maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java rename to maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java diff --git a/maxkey-webapis/maxkey-webapi-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 similarity index 100% rename from maxkey-webapis/maxkey-webapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java rename to maxkey-web-apis/maxkey-web-api-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java diff --git a/maxkey-webs/maxkey-web-mgt/build.gradle b/maxkey-webs/maxkey-web-mgt/build.gradle index 5bc107a92..cf7fa109e 100644 --- a/maxkey-webs/maxkey-web-mgt/build.gradle +++ b/maxkey-webs/maxkey-web-mgt/build.gradle @@ -18,8 +18,8 @@ dependencies { implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0") //rest apis - implementation project(":maxkey-webapis:maxkey-webapi-scim") - implementation project(":maxkey-webapis:maxkey-webapi-rest") + implementation project(":maxkey-web-apis:maxkey-web-api-scim") + implementation project(":maxkey-web-apis:maxkey-web-api-rest") //synchronizers implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle b/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle index edaf1dfb0..deb7187ef 100644 --- a/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle +++ b/maxkey-webs/maxkey-web-mgt/config/build_docker.gradle @@ -53,8 +53,8 @@ dependencies { implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0") //webapis - implementation project(":maxkey-webapis:maxkey-webapi-scim") - implementation project(":maxkey-webapis:maxkey-webapi-rest") + implementation project(":maxkey-web-apis:maxkey-web-api-scim") + implementation project(":maxkey-web-apis:maxkey-web-api-rest") //synchronizers implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle b/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle index 62da703ec..c800ec4fb 100644 --- a/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle +++ b/maxkey-webs/maxkey-web-mgt/config/build_jar.gradle @@ -54,8 +54,8 @@ dependencies { implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0") //webapis - implementation project(":maxkey-webapis:maxkey-webapi-scim") - implementation project(":maxkey-webapis:maxkey-webapi-rest") + implementation project(":maxkey-web-apis:maxkey-web-api-scim") + implementation project(":maxkey-web-apis:maxkey-web-api-rest") //synchronizers implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle b/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle index 6d2057312..bb61e2657 100644 --- a/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle +++ b/maxkey-webs/maxkey-web-mgt/config/build_standard.gradle @@ -18,8 +18,8 @@ dependencies { implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0") //webapis - implementation project(":maxkey-webapis:maxkey-webapi-scim") - implementation project(":maxkey-webapis:maxkey-webapi-rest") + implementation project(":maxkey-web-apis:maxkey-web-api-scim") + implementation project(":maxkey-web-apis:maxkey-web-api-rest") //synchronizers implementation project(":maxkey-synchronizers:maxkey-synchronizer") diff --git a/settings.gradle b/settings.gradle index 81c545a55..2b37d1aa8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -33,8 +33,8 @@ include ( 'maxkey-authentications:maxkey-authentication-provider', 'maxkey-authentications:maxkey-authentication-sms', //rest apis - 'maxkey-webapis:maxkey-webapi-scim', - 'maxkey-webapis:maxkey-webapi-rest', + 'maxkey-web-apis:maxkey-web-api-scim', + 'maxkey-web-apis:maxkey-web-api-rest', //synchronizers 'maxkey-synchronizers:maxkey-synchronizer', 'maxkey-synchronizers:maxkey-synchronizer-reorgdept',