domain ->entity,SQL -> lowercase

domain ->entity,SQL ->  lowercase

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/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/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/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/entity/ExtraAttr.java

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

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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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"));