maxkey-identitys rename maxkey-mxapis

maxkey-identitys/maxkey-identity-rest/build.gradle → maxkey-mxapis/maxkey-mxapi-rest/build.gradle

@@ -1,4 +1,4 @@
-description = "maxkey-identity-rest"
+description = "maxkey-mxapi-rest"
 
 apply plugin: 'java'
 apply plugin: 'eclipse-wtp'

maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestOrganizationController.java → maxkey-mxapis/maxkey-mxapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestOrganizationController.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.rest;
+package org.maxkey.mxapis.identity.rest;
 
 import java.io.IOException;
 

maxkey-identitys/maxkey-identity-rest/src/main/java/org/maxkey/identity/rest/RestUserInfoController.java → maxkey-mxapis/maxkey-mxapi-rest/src/main/java/org/maxkey/mxapis/identity/rest/RestUserInfoController.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.rest;
+package org.maxkey.mxapis.identity.rest;
 
 import java.io.IOException;
 

maxkey-identitys/maxkey-identity-scim/build.gradle → maxkey-mxapis/maxkey-mxapi-scim/build.gradle

@@ -1,4 +1,4 @@
-description = "maxkey-identity-scim"
+description = "maxkey-mxapi-scim"
 
 apply plugin: 'java'
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimGroupController.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimGroupController.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.controller;
+package org.maxkey.mxapis.identity.scim;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -26,11 +26,11 @@ import java.util.Set;
 import org.apache.mybatis.jpa.persistence.JpaPageResults;
 import org.maxkey.entity.Roles;
 import org.maxkey.entity.UserInfo;
-import org.maxkey.identity.scim.resources.ScimGroup;
-import org.maxkey.identity.scim.resources.ScimMemberRef;
-import org.maxkey.identity.scim.resources.ScimMeta;
-import org.maxkey.identity.scim.resources.ScimParameters;
-import org.maxkey.identity.scim.resources.ScimSearchResult;
+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;

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimOrganizationController.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimOrganizationController.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.controller;
+package org.maxkey.mxapis.identity.scim;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,10 +23,10 @@ import java.util.List;
 
 import org.apache.mybatis.jpa.persistence.JpaPageResults;
 import org.maxkey.entity.Organizations;
-import org.maxkey.identity.scim.resources.ScimMeta;
-import org.maxkey.identity.scim.resources.ScimOrganization;
-import org.maxkey.identity.scim.resources.ScimParameters;
-import org.maxkey.identity.scim.resources.ScimSearchResult;
+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;

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimServiceProviderConfigController.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimServiceProviderConfigController.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.controller;
+package org.maxkey.mxapis.identity.scim;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import org.springframework.web.bind.annotation.RequestMapping;

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/controller/ScimUserController.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/ScimUserController.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.controller;
+package org.maxkey.mxapis.identity.scim;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -24,18 +24,18 @@ 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.identity.scim.resources.ScimEnterprise;
-import org.maxkey.identity.scim.resources.ScimGroupRef;
-import org.maxkey.identity.scim.resources.ScimManager;
-import org.maxkey.identity.scim.resources.ScimMeta;
-import org.maxkey.identity.scim.resources.ScimParameters;
-import org.maxkey.identity.scim.resources.ScimSearchResult;
-import org.maxkey.identity.scim.resources.ScimOrganizationEmail.UserEmailType;
-import org.maxkey.identity.scim.resources.ScimOrganizationPhoneNumber.UserPhoneNumberType;
-import org.maxkey.identity.scim.resources.ScimUser;
-import org.maxkey.identity.scim.resources.ScimUserEmail;
-import org.maxkey.identity.scim.resources.ScimFormattedName;
-import org.maxkey.identity.scim.resources.ScimUserPhoneNumber;
+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;

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimEnterprise.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterprise.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimEnterpriseUser.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimEnterpriseUser.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.util.HashSet;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimFormattedName.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimFormattedName.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimGroup.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroup.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.util.HashSet;
 import java.util.Set;

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimGroupRef.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimGroupRef.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 public class ScimGroupRef extends ScimMultiValuedAttribute{
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimManager.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimManager.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 public class ScimManager {
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMemberRef.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMemberRef.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 public class ScimMemberRef extends ScimMultiValuedAttribute{
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMeta.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMeta.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 import java.util.Date;

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimMultiValuedAttribute.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimMultiValuedAttribute.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganization.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganization.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.util.HashSet;
 import java.util.List;

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationAddress.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationAddress.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationEmail.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationEmail.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimOrganizationPhoneNumber.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimOrganizationPhoneNumber.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimParameters.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimParameters.java

@@ -15,9 +15,9 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
-import org.maxkey.identity.scim.controller.ScimServiceProviderConfigController;
+import org.maxkey.mxapis.identity.scim.ScimServiceProviderConfigController;
 
 public class ScimParameters {
 	int startIndex = 1;

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimResource.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimResource.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 import java.util.Set;

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimSearchResult.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimSearchResult.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.util.ArrayList;
 import java.util.Collections;

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUser.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUser.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.util.HashSet;
 import java.util.List;

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserAddress.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserAddress.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserEmail.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEmail.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserEntitlement.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserEntitlement.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserExtension.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserExtension.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserIm.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserIm.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserOrganization.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserOrganization.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserPhoneNumber.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoneNumber.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserPhoto.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserPhoto.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserRole.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserRole.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/main/java/org/maxkey/identity/scim/resources/ScimUserX509Certificate.java → maxkey-mxapis/maxkey-mxapi-scim/src/main/java/org/maxkey/mxapis/identity/scim/resources/ScimUserX509Certificate.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.identity.scim.resources;
+package org.maxkey.mxapis.identity.scim.resources;
 
 import java.io.Serializable;
 

maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java → maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonString2ObjectTest.java

@@ -17,6 +17,7 @@
 
 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;
 

maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java → maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimEnterpriseUserJsonTest.java

@@ -20,6 +20,13 @@ package org.maxkey.identity.scim.resources;
 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;
 

maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java → maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonString2ObjectTest.java

@@ -17,6 +17,7 @@
 
 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;
 

maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java → maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimGroupJsonTest.java

@@ -21,6 +21,9 @@ 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;
 

maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java → maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonString2ObjectTest.java

@@ -17,6 +17,7 @@
 
 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;
 

maxkey-identitys/maxkey-identity-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java → maxkey-mxapis/maxkey-mxapi-scim/src/test/java/org/maxkey/identity/scim/resources/ScimUserJsonTest.java

@@ -20,6 +20,12 @@ package org.maxkey.identity.scim.resources;
 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;
 

maxkey-webs/maxkey-web-mgt/build.gradle

@@ -17,9 +17,9 @@ dependencies {
    	implementation project(":maxkey-protocols:maxkey-protocol-oauth-2.0")
    	implementation project(":maxkey-protocols:maxkey-protocol-saml-2.0")   
    	
-   	//identity
-   	implementation project(":maxkey-identitys:maxkey-identity-scim")   
-   	implementation project(":maxkey-identitys:maxkey-identity-rest")
+   	//rest apis
+   	implementation project(":maxkey-mxapis:maxkey-mxapi-scim")   
+   	implementation project(":maxkey-mxapis:maxkey-mxapi-rest")
    		
    	//synchronizers
    	implementation project(":maxkey-synchronizers:maxkey-synchronizer")

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.identity.kafka",
-    "org.maxkey.identity.rest",
-    "org.maxkey.identity.scim.controller",
+    "org.maxkey.mxapis.identity.kafka",
+    "org.maxkey.mxapis.identity.rest",
+    "org.maxkey.mxapis.identity.scim",
     "org.maxkey.persistence",
     "org.maxkey.provision",
     "org.maxkey.synchronizer",

settings.gradle

@@ -32,9 +32,9 @@ include (
 	'maxkey-authentications:maxkey-authentication-otp',
 	'maxkey-authentications:maxkey-authentication-provider',
 	'maxkey-authentications:maxkey-authentication-sms',
-	//identity
-	'maxkey-identitys:maxkey-identity-scim',
-	'maxkey-identitys:maxkey-identity-rest',
+	//rest apis
+	'maxkey-mxapis:maxkey-mxapi-scim',
+	'maxkey-mxapis:maxkey-mxapi-rest',
 	//synchronizers
 	'maxkey-synchronizers:maxkey-synchronizer',
 	'maxkey-synchronizers:maxkey-synchronizer-reorgdept',