domain ->entity,SQL -> lowercase

domain ->entity,SQL ->  lowercase

maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/AbstractAuthenticationProvider.java

@@ -25,7 +25,7 @@ import org.maxkey.authn.realm.AbstractAuthenticationRealm;
 import org.maxkey.authn.support.rememberme.AbstractRemeberMeService;
 import org.maxkey.configuration.ApplicationConfig;
 import org.maxkey.constants.ConstantsLoginType;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
 import org.maxkey.web.WebConstants;
 import org.maxkey.web.WebContext;

maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/RealmAuthenticationProvider.java

@@ -24,7 +24,7 @@ import org.maxkey.authn.online.OnlineTicketServices;
 import org.maxkey.authn.realm.AbstractAuthenticationRealm;
 import org.maxkey.authn.support.rememberme.AbstractRemeberMeService;
 import org.maxkey.configuration.ApplicationConfig;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
 import org.maxkey.web.WebConstants;
 import org.maxkey.web.WebContext;

maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/SigninPrincipal.java

@@ -21,7 +21,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import org.maxkey.authn.online.OnlineTicket;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 

maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/online/OnlineTicket.java

@@ -21,7 +21,7 @@ import java.io.Serializable;
 import java.time.LocalTime;
 import java.util.HashMap;
 
-import org.maxkey.domain.apps.Apps;
+import org.maxkey.entity.apps.Apps;
 import org.springframework.security.core.Authentication;
 
 public class OnlineTicket implements Serializable{

maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/AbstractAuthenticationRealm.java

@@ -22,8 +22,8 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import org.maxkey.authn.support.rememberme.AbstractRemeberMeService;
-import org.maxkey.domain.Groups;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.Groups;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.persistence.db.LoginHistoryService;
 import org.maxkey.persistence.db.PasswordPolicyValidator;
 import org.maxkey.persistence.db.LoginService;

maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/activedirectory/ActiveDirectoryAuthenticationRealm.java

@@ -24,7 +24,7 @@ import javax.validation.constraints.Size;
 
 import org.maxkey.authn.realm.AbstractAuthenticationRealm;
 import org.maxkey.authn.realm.IAuthenticationServer;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.web.WebContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/jdbc/DefaultJdbcAuthenticationRealm.java

@@ -20,7 +20,7 @@ package org.maxkey.authn.realm.jdbc;
 import org.maxkey.authn.realm.AbstractAuthenticationRealm;
 import org.maxkey.constants.ConstantsLoginType;
 import org.maxkey.crypto.password.PasswordReciprocal;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.web.WebContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-authentications/maxkey-authentication-core/src/main/java/org/maxkey/authn/realm/ldap/LdapAuthenticationRealm.java

@@ -24,7 +24,7 @@ import javax.validation.constraints.Size;
 
 import org.maxkey.authn.realm.AbstractAuthenticationRealm;
 import org.maxkey.authn.realm.IAuthenticationServer;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.web.WebContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/AbstractOtpAuthn.java

@@ -17,7 +17,7 @@
 
 package org.maxkey.password.onetimepwd;
 
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.token.AbstractOtpTokenStore;
 import org.maxkey.password.onetimepwd.token.InMemoryOtpTokenStore;
 import org.maxkey.util.StringGenerator;

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CapOtpAuthn.java

@@ -17,7 +17,7 @@
 
 package org.maxkey.password.onetimepwd.impl;
 
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
 
 /**

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/CounterBasedOtpAuthn.java

@@ -19,7 +19,7 @@ package org.maxkey.password.onetimepwd.impl;
 
 import org.apache.commons.codec.binary.Hex;
 import org.maxkey.crypto.Base32Utils;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
 import org.maxkey.password.onetimepwd.algorithm.TimeBasedOTP;
 import org.slf4j.Logger;

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/HotpOtpAuthn.java

@@ -21,7 +21,7 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 
 import org.maxkey.crypto.Base32Utils;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
 import org.maxkey.password.onetimepwd.algorithm.HOTP;
 import org.slf4j.Logger;

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MailOtpAuthn.java

@@ -22,7 +22,7 @@ import org.apache.commons.mail.DefaultAuthenticator;
 import org.apache.commons.mail.Email;
 import org.apache.commons.mail.SimpleEmail;
 import org.maxkey.configuration.EmailConfig;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/MobileOtpAuthn.java

@@ -17,7 +17,7 @@
 
 package org.maxkey.password.onetimepwd.impl;
 
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
 
 public class MobileOtpAuthn extends AbstractOtpAuthn {

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/RsaOtpAuthn.java

@@ -17,7 +17,7 @@
 
 package org.maxkey.password.onetimepwd.impl;
 
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
 
 /**

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/SmsOtpAuthn.java

@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.util.Properties;
 
 import org.maxkey.constants.ConstantsProperties;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/TimeBasedOtpAuthn.java

@@ -24,7 +24,7 @@ import java.util.TimeZone;
 import org.apache.commons.codec.binary.Hex;
 import org.maxkey.crypto.Base32Utils;
 import org.maxkey.crypto.password.PasswordReciprocal;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.AbstractOtpAuthn;
 import org.maxkey.password.onetimepwd.algorithm.TimeBasedOTP;
 import org.slf4j.Logger;

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnAliyun.java

@@ -26,7 +26,7 @@ import com.aliyuncs.profile.DefaultProfile;
 
 import java.io.IOException;
 
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.impl.SmsOtpAuthn;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnTencentCloud.java

@@ -26,7 +26,7 @@ import com.tencentcloudapi.sms.v20190711.models.SendSmsResponse;
 
 import java.io.IOException;
 
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.impl.SmsOtpAuthn;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/impl/sms/SmsOtpAuthnYunxin.java

@@ -29,7 +29,7 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.message.BasicNameValuePair;
 import org.apache.http.util.EntityUtils;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.impl.SmsOtpAuthn;
 import org.maxkey.util.JsonUtils;
 import org.maxkey.util.StringGenerator;

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/AbstractOtpTokenStore.java

@@ -17,7 +17,7 @@
 
 package org.maxkey.password.onetimepwd.token;
 
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 
 public abstract class AbstractOtpTokenStore {
     

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/InMemoryOtpTokenStore.java

@@ -24,7 +24,7 @@ import org.joda.time.DateTime;
 import org.joda.time.Duration;
 import org.joda.time.format.DateTimeFormat;
 import org.maxkey.constants.ConstantsTimeInterval;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.OneTimePassword;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-authentications/maxkey-authentication-otp/src/main/java/org/maxkey/password/onetimepwd/token/RedisOtpTokenStore.java

@@ -19,7 +19,7 @@ package org.maxkey.password.onetimepwd.token;
 
 import org.joda.time.DateTime;
 import org.maxkey.constants.ConstantsTimeInterval;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.password.onetimepwd.OneTimePassword;
 import org.maxkey.persistence.redis.RedisConnection;
 import org.maxkey.persistence.redis.RedisConnectionFactory;

maxkey-core/src/main/java/org/maxkey/autoconfigure/MvcAutoConfiguration.java

@@ -142,7 +142,7 @@ public class MvcAutoConfiguration implements InitializingBean {
     @Bean (name = "jaxb2Marshaller")
     public Jaxb2Marshaller jaxb2Marshaller() {
         Jaxb2Marshaller jaxb2Marshaller = new Jaxb2Marshaller();
-        jaxb2Marshaller.setClassesToBeBound(org.maxkey.domain.xml.UserInfoXML.class);;
+        jaxb2Marshaller.setClassesToBeBound(org.maxkey.entity.xml.UserInfoXML.class);;
         return jaxb2Marshaller;
     }
     

maxkey-core/src/main/java/org/maxkey/domain/Accounts.java → maxkey-core/src/main/java/org/maxkey/entity/Accounts.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 import javax.persistence.Column;

maxkey-core/src/main/java/org/maxkey/domain/ChangePassword.java → maxkey-core/src/main/java/org/maxkey/entity/ChangePassword.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 

maxkey-core/src/main/java/org/maxkey/domain/ExcelImport.java → maxkey-core/src/main/java/org/maxkey/entity/ExcelImport.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import javax.persistence.Column;

maxkey-core/src/main/java/org/maxkey/domain/ExtraAttr.java → maxkey-core/src/main/java/org/maxkey/entity/ExtraAttr.java

@@ -18,7 +18,7 @@
 /**
  * 
  */
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 /**
  * @author Administrator

maxkey-core/src/main/java/org/maxkey/domain/ExtraAttrs.java → maxkey-core/src/main/java/org/maxkey/entity/ExtraAttrs.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.util.ArrayList;
 import java.util.HashMap;

maxkey-core/src/main/java/org/maxkey/domain/GroupMember.java → maxkey-core/src/main/java/org/maxkey/entity/GroupMember.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 

maxkey-core/src/main/java/org/maxkey/domain/GroupPrivileges.java → maxkey-core/src/main/java/org/maxkey/entity/GroupPrivileges.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 
@@ -26,7 +26,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import org.maxkey.domain.apps.Apps;
+import org.maxkey.entity.apps.Apps;
 
 
 /*

maxkey-core/src/main/java/org/maxkey/domain/Groups.java → maxkey-core/src/main/java/org/maxkey/entity/Groups.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 import javax.persistence.Column;

maxkey-core/src/main/java/org/maxkey/domain/HistoryLogin.java → maxkey-core/src/main/java/org/maxkey/entity/HistoryLogin.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 

maxkey-core/src/main/java/org/maxkey/domain/HistoryLoginApps.java → maxkey-core/src/main/java/org/maxkey/entity/HistoryLoginApps.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

maxkey-core/src/main/java/org/maxkey/domain/HistoryLogs.java → maxkey-core/src/main/java/org/maxkey/entity/HistoryLogs.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 import javax.persistence.Column;

maxkey-core/src/main/java/org/maxkey/domain/Navigations.java → maxkey-core/src/main/java/org/maxkey/entity/Navigations.java

@@ -18,7 +18,7 @@
 /**
  * 
  */
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.util.ArrayList;
 

maxkey-core/src/main/java/org/maxkey/domain/Notices.java → maxkey-core/src/main/java/org/maxkey/entity/Notices.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 

maxkey-core/src/main/java/org/maxkey/domain/Organizations.java → maxkey-core/src/main/java/org/maxkey/entity/Organizations.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 import javax.persistence.Column;

maxkey-core/src/main/java/org/maxkey/domain/PasswordPolicy.java → maxkey-core/src/main/java/org/maxkey/entity/PasswordPolicy.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

maxkey-core/src/main/java/org/maxkey/domain/Registration.java → maxkey-core/src/main/java/org/maxkey/entity/Registration.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 

maxkey-core/src/main/java/org/maxkey/domain/Resources.java → maxkey-core/src/main/java/org/maxkey/entity/Resources.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 import javax.persistence.Column;

maxkey-core/src/main/java/org/maxkey/domain/RoleMember.java → maxkey-core/src/main/java/org/maxkey/entity/RoleMember.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 import javax.persistence.Column;

maxkey-core/src/main/java/org/maxkey/domain/RolePermissions.java → maxkey-core/src/main/java/org/maxkey/entity/RolePermissions.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 import javax.persistence.Column;

maxkey-core/src/main/java/org/maxkey/domain/Roles.java → maxkey-core/src/main/java/org/maxkey/entity/Roles.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 import javax.persistence.Column;

maxkey-core/src/main/java/org/maxkey/domain/Saml20Metadata.java → maxkey-core/src/main/java/org/maxkey/entity/Saml20Metadata.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import java.io.Serializable;
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;

maxkey-core/src/main/java/org/maxkey/domain/UserInfo.java → maxkey-core/src/main/java/org/maxkey/entity/UserInfo.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import java.io.IOException;

maxkey-core/src/main/java/org/maxkey/domain/UserInfoAdjoint.java → maxkey-core/src/main/java/org/maxkey/entity/UserInfoAdjoint.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain;
+package org.maxkey.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

maxkey-core/src/main/java/org/maxkey/domain/apps/Apps.java → maxkey-core/src/main/java/org/maxkey/entity/apps/Apps.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;
 
 import java.io.Serializable;
 import java.util.Arrays;
@@ -29,7 +29,7 @@ import javax.persistence.Table;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 import org.maxkey.constants.Boolean;
-import org.maxkey.domain.Accounts;
+import org.maxkey.entity.Accounts;
 import org.springframework.web.multipart.MultipartFile;
 
 @Entity

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsAdapters.java → maxkey-core/src/main/java/org/maxkey/entity/apps/AppsAdapters.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;
 
 import java.io.Serializable;
 import javax.persistence.Column;

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsCasDetails.java → maxkey-core/src/main/java/org/maxkey/entity/apps/AppsCasDetails.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsExtendApiDetails.java → maxkey-core/src/main/java/org/maxkey/entity/apps/AppsExtendApiDetails.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsFormBasedDetails.java → maxkey-core/src/main/java/org/maxkey/entity/apps/AppsFormBasedDetails.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsJwtDetails.java → maxkey-core/src/main/java/org/maxkey/entity/apps/AppsJwtDetails.java

@@ -18,7 +18,7 @@
 /**
  * 
  */
-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsOAuth20Details.java → maxkey-core/src/main/java/org/maxkey/entity/apps/AppsOAuth20Details.java

@@ -15,12 +15,12 @@
  */
  
 
-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import org.maxkey.domain.apps.oauth2.provider.client.BaseClientDetails;
+import org.maxkey.entity.apps.oauth2.provider.client.BaseClientDetails;
 import org.springframework.util.StringUtils;
 
 @Entity

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsSAML20Details.java → maxkey-core/src/main/java/org/maxkey/entity/apps/AppsSAML20Details.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;
 
 import java.security.cert.X509Certificate;
 

maxkey-core/src/main/java/org/maxkey/domain/apps/AppsTokenBasedDetails.java → maxkey-core/src/main/java/org/maxkey/entity/apps/AppsTokenBasedDetails.java

@@ -18,7 +18,7 @@
 /**
  * 
  */
-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;

maxkey-core/src/main/java/org/maxkey/domain/apps/UserApps.java → maxkey-core/src/main/java/org/maxkey/entity/apps/UserApps.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.apps;
+package org.maxkey.entity.apps;
 
 /**
  * UserApps .

maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/ClientDetails.java → maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/ClientDetails.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.apps.oauth2.provider;
+package org.maxkey.entity.apps.oauth2.provider;
 
 import java.io.Serializable;
 import java.util.Collection;

maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/BaseClientDetails.java → maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/BaseClientDetails.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.apps.oauth2.provider.client;
+package org.maxkey.entity.apps.oauth2.provider.client;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,14 +28,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.maxkey.domain.apps.oauth2.provider.ClientDetails;
+import org.maxkey.entity.apps.oauth2.provider.ClientDetails;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.util.StringUtils;
 
 /**
  * Base implementation of
- * {@link org.maxkey.domain.apps.oauth2.provider.ClientDetails}.
+ * {@link org.maxkey.entity.apps.oauth2.provider.ClientDetails}.
  * 
  * @author Ryan Heaton
  * @author Dave Syer

maxkey-core/src/main/java/org/maxkey/domain/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java → maxkey-core/src/main/java/org/maxkey/entity/apps/oauth2/provider/client/Jackson2ArrayOrStringDeserializer.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.apps.oauth2.provider.client;
+package org.maxkey.entity.apps.oauth2.provider.client;
 
 import java.io.IOException;
 import java.util.Arrays;

maxkey-core/src/main/java/org/maxkey/domain/userinfo/ContactEntity.java → maxkey-core/src/main/java/org/maxkey/entity/userinfo/ContactEntity.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.userinfo;
+package org.maxkey.entity.userinfo;
 
 public class ContactEntity {
 	private String country;

maxkey-core/src/main/java/org/maxkey/domain/userinfo/EnterpriseEntity.java → maxkey-core/src/main/java/org/maxkey/entity/userinfo/EnterpriseEntity.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.userinfo;
+package org.maxkey.entity.userinfo;
 
 public class EnterpriseEntity {
 	private String employeeNumber;

maxkey-core/src/main/java/org/maxkey/domain/userinfo/ImsEntity.java → maxkey-core/src/main/java/org/maxkey/entity/userinfo/ImsEntity.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.userinfo;
+package org.maxkey.entity.userinfo;
 
 public class ImsEntity{
 	private String aim;

maxkey-core/src/main/java/org/maxkey/domain/userinfo/NameEntity.java → maxkey-core/src/main/java/org/maxkey/entity/userinfo/NameEntity.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.userinfo;
+package org.maxkey.entity.userinfo;
 
 public class NameEntity{
 	private String givenName;

maxkey-core/src/main/java/org/maxkey/domain/xml/UserInfoXML.java → maxkey-core/src/main/java/org/maxkey/entity/xml/UserInfoXML.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.maxkey.domain.xml;
+package org.maxkey.entity.xml;
 
 import javax.xml.bind.annotation.XmlRootElement;
 

maxkey-core/src/main/java/org/maxkey/persistence/db/LoginHistoryService.java

@@ -19,7 +19,7 @@ package org.maxkey.persistence.db;
 
 import java.sql.Types;
 
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.web.WebContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-core/src/main/java/org/maxkey/persistence/db/LoginService.java

@@ -25,8 +25,8 @@ import java.util.Date;
 import java.util.List;
 
 import org.maxkey.constants.ConstantsStatus;
-import org.maxkey.domain.Groups;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.Groups;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyValidator.java

@@ -35,8 +35,8 @@ import org.maxkey.constants.ConstantsProperties;
 import org.maxkey.constants.ConstantsStatus;
 import org.maxkey.constants.ConstantsTimeInterval;
 import org.maxkey.crypto.password.PasswordGen;
-import org.maxkey.domain.PasswordPolicy;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.PasswordPolicy;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.util.StringUtils;
 import org.maxkey.web.WebConstants;
 import org.maxkey.web.WebContext;

maxkey-core/src/main/java/org/maxkey/web/WebContext.java

@@ -30,7 +30,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import org.apache.commons.logging.LogFactory;
 import org.maxkey.configuration.ApplicationConfig;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.util.DateUtils;
 import org.maxkey.util.IdGenerator;
 import org.maxkey.web.message.Message;

maxkey-core/src/test/java/org/maxkey/persistence/derby/DerbyTest.java

@@ -55,7 +55,7 @@ public class DerbyTest {
 		/*interact with Derby*/
 		Statement s = conn.createStatement();
 
-		ResultSet rs = s.executeQuery("SELECT * FROM SECONDTABLE");
+		ResultSet rs = s.executeQuery("select * from secondtable");
 		
 		while(rs.next()){
 			System.out.println("key : "+rs.getInt("ID")+" ,name : "+rs.getString("NAME"));

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

@@ -19,7 +19,7 @@ package org.maxkey.identity.rest;
 
 import java.io.IOException;
 
-import org.maxkey.domain.Organizations;
+import org.maxkey.entity.Organizations;
 import org.maxkey.persistence.service.OrganizationsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;

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

@@ -19,7 +19,7 @@ package org.maxkey.identity.rest;
 
 import java.io.IOException;
 
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 import org.maxkey.persistence.service.UserInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AccountsMapper.java

@@ -21,7 +21,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.Accounts;
+import org.maxkey.entity.Accounts;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsAdaptersMapper.java

@@ -21,7 +21,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.apps.AppsAdapters;
+import org.maxkey.entity.apps.AppsAdapters;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsCasDetailsMapper.java

@@ -21,7 +21,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.apps.AppsCasDetails;
+import org.maxkey.entity.apps.AppsCasDetails;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsFormBasedDetailsMapper.java

@@ -21,7 +21,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.apps.AppsFormBasedDetails;
+import org.maxkey.entity.apps.AppsFormBasedDetails;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsJwtDetailsMapper.java

@@ -21,7 +21,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.apps.AppsJwtDetails;
+import org.maxkey.entity.apps.AppsJwtDetails;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsMapper.java

@@ -24,8 +24,8 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Update;
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.apps.Apps;
-import org.maxkey.domain.apps.UserApps;
+import org.maxkey.entity.apps.Apps;
+import org.maxkey.entity.apps.UserApps;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsSaml20DetailsMapper.java

@@ -21,7 +21,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.apps.AppsSAML20Details;
+import org.maxkey.entity.apps.AppsSAML20Details;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsTokenBasedDetailsMapper.java

@@ -21,7 +21,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.apps.AppsTokenBasedDetails;
+import org.maxkey.entity.apps.AppsTokenBasedDetails;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java

@@ -23,8 +23,8 @@ package org.maxkey.persistence.mapper;
 import java.util.List;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.GroupMember;
-import org.maxkey.domain.Groups;
+import org.maxkey.entity.GroupMember;
+import org.maxkey.entity.Groups;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupPrivilegesMapper.java

@@ -23,7 +23,7 @@ package org.maxkey.persistence.mapper;
 import java.util.List;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.GroupPrivileges;
+import org.maxkey.entity.GroupPrivileges;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupsMapper.java

@@ -23,7 +23,7 @@ package org.maxkey.persistence.mapper;
 import java.util.List;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.Groups;
+import org.maxkey.entity.Groups;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginAppsMapper.java

@@ -18,7 +18,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.HistoryLoginApps;
+import org.maxkey.entity.HistoryLoginApps;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLoginMapper.java

@@ -19,7 +19,7 @@ package org.maxkey.persistence.mapper;
 
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.HistoryLogin;
+import org.maxkey.entity.HistoryLogin;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/HistoryLogsMapper.java

@@ -21,7 +21,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.HistoryLogs;
+import org.maxkey.entity.HistoryLogs;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/NoticesMapper.java

@@ -21,7 +21,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.Notices;
+import org.maxkey.entity.Notices;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/OrganizationsMapper.java

@@ -17,7 +17,7 @@
 
 package org.maxkey.persistence.mapper;
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.Organizations;
+import org.maxkey.entity.Organizations;
 
 public interface OrganizationsMapper extends IJpaBaseMapper<Organizations> {
 

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/PasswordPolicyMapper.java

@@ -21,7 +21,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.PasswordPolicy;
+import org.maxkey.entity.PasswordPolicy;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RegistrationMapper.java

@@ -23,8 +23,8 @@ package org.maxkey.persistence.mapper;
 import java.util.List;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.Registration;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.Registration;
+import org.maxkey.entity.UserInfo;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/ResourcesMapper.java

@@ -21,7 +21,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.Resources;
+import org.maxkey.entity.Resources;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java

@@ -23,8 +23,8 @@ package org.maxkey.persistence.mapper;
 import java.util.List;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.RoleMember;
-import org.maxkey.domain.Roles;
+import org.maxkey.entity.RoleMember;
+import org.maxkey.entity.Roles;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RolesMapper.java

@@ -23,8 +23,8 @@ package org.maxkey.persistence.mapper;
 import java.util.List;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.RolePermissions;
-import org.maxkey.domain.Roles;
+import org.maxkey.entity.RolePermissions;
+import org.maxkey.entity.Roles;
 
 /**
  * @author Crystal.sea

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoAdjointMapper.java

@@ -18,7 +18,7 @@
 package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.UserInfoAdjoint;
+import org.maxkey.entity.UserInfoAdjoint;
 
 
 /**

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/UserInfoMapper.java

@@ -19,7 +19,7 @@ package org.maxkey.persistence.mapper;
 
 import org.apache.ibatis.annotations.Select;
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.UserInfo;
+import org.maxkey.entity.UserInfo;
 
 
 /**

maxkey-persistence/src/main/java/org/maxkey/persistence/service/AccountsService.java

@@ -18,7 +18,7 @@
 package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.domain.Accounts;
+import org.maxkey.entity.Accounts;
 import org.maxkey.persistence.mapper.AccountsMapper;
 import org.springframework.stereotype.Repository;
 

maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsAdaptersService.java

@@ -18,7 +18,7 @@
 package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.domain.apps.AppsAdapters;
+import org.maxkey.entity.apps.AppsAdapters;
 import org.maxkey.persistence.mapper.AppsAdaptersMapper;
 import org.springframework.stereotype.Repository;
 

maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsCasDetailsService.java

@@ -18,7 +18,7 @@
 package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.domain.apps.AppsCasDetails;
+import org.maxkey.entity.apps.AppsCasDetails;
 import org.maxkey.persistence.mapper.AppsCasDetailsMapper;
 import org.springframework.stereotype.Repository;
 

maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsFormBasedDetailsService.java

@@ -18,7 +18,7 @@
 package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.domain.apps.AppsFormBasedDetails;
+import org.maxkey.entity.apps.AppsFormBasedDetails;
 import org.maxkey.persistence.mapper.AppsFormBasedDetailsMapper;
 import org.springframework.stereotype.Repository;
 

maxkey-persistence/src/main/java/org/maxkey/persistence/service/AppsJwtDetailsService.java

@@ -18,7 +18,7 @@
 package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.domain.apps.AppsJwtDetails;
+import org.maxkey.entity.apps.AppsJwtDetails;
 import org.maxkey.persistence.mapper.AppsJwtDetailsMapper;
 import org.springframework.stereotype.Repository;