maxkey-persistence

maxkey-dao rename maxkey-persistence

maxkey-authentications/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 	
 	
 	compile project(":maxkey-core")
-	compile project(":maxkey-dao")
+	compile project(":maxkey-persistence")
    	compile project(":maxkey-client-sdk")
    	compile project(":maxkey-protocols:maxkey-protocol-oauth-2.0")
    	compile project(":maxkey-protocols:maxkey-protocol-saml-2.0")

maxkey-connectors/maxkey-connector-activedirectory/.settings/org.eclipse.wst.common.component

@@ -6,7 +6,7 @@
 		<dependent-module deploy-path="../" handle="module:/resource/maxkey-core/maxkey-core">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
-		<dependent-module deploy-path="../" handle="module:/resource/maxkey-dao/maxkey-dao">
+		<dependent-module deploy-path="../" handle="module:/resource/maxkey-persistence/maxkey-persistence">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
 		<dependent-module deploy-path="../" handle="module:/resource/maxkey-client-sdk/maxkey-client-sdk">

maxkey-connectors/maxkey-connector-activedirectory/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 	compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
 	
 	compile project(":maxkey-core")
-	compile project(":maxkey-dao")
+	compile project(":maxkey-persistence")
    	compile project(":maxkey-client-sdk")
    	compile project(":maxkey-connectors:maxkey-connector-base")
    	compile project(":maxkey-identitys:maxkey-identity-kafka")

maxkey-connectors/maxkey-connector-base/.settings/org.eclipse.wst.common.component

@@ -6,7 +6,7 @@
 		<dependent-module deploy-path="../" handle="module:/resource/maxkey-core/maxkey-core">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
-		<dependent-module deploy-path="../" handle="module:/resource/maxkey-dao/maxkey-dao">
+		<dependent-module deploy-path="../" handle="module:/resource/maxkey-persistence/maxkey-persistence">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
 		<dependent-module deploy-path="../" handle="module:/resource/maxkey-client-sdk/maxkey-client-sdk">

maxkey-connectors/maxkey-connector-base/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 	compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
 	
 	compile project(":maxkey-core")
-	compile project(":maxkey-dao")
+	compile project(":maxkey-persistence")
    	compile project(":maxkey-client-sdk")
    	compile project(":maxkey-identitys:maxkey-identity-kafka")
    

maxkey-connectors/maxkey-connector-ldap/.settings/org.eclipse.wst.common.component

@@ -6,7 +6,7 @@
 		<dependent-module deploy-path="../" handle="module:/resource/maxkey-core/maxkey-core">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
-		<dependent-module deploy-path="../" handle="module:/resource/maxkey-dao/maxkey-dao">
+		<dependent-module deploy-path="../" handle="module:/resource/maxkey-persistence/maxkey-persistence">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
 		<dependent-module deploy-path="../" handle="module:/resource/maxkey-client-sdk/maxkey-client-sdk">

maxkey-connectors/maxkey-connector-ldap/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 	compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
 	
 	compile project(":maxkey-core")
-	compile project(":maxkey-dao")
+	compile project(":maxkey-persistence")
    	compile project(":maxkey-client-sdk")
    	compile project(":maxkey-connectors:maxkey-connector-base")
    	compile project(":maxkey-identitys:maxkey-identity-kafka")

maxkey-dao/.gitignore

@@ -1 +0,0 @@
-/build/

maxkey-dao/.settings/org.eclipse.buildship.core.prefs

@@ -1,11 +0,0 @@
-build.commands=org.eclipse.jdt.core.javabuilder
-connection.arguments=
-connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
-connection.java.home=null
-connection.jvm.arguments=
-connection.project.dir=..
-containers=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7/
-derived.resources=.gradle,build
-eclipse.preferences.version=1
-natures=org.eclipse.jdt.core.javanature
-project.path=\:maxkey-dao

maxkey-dao/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

maxkey-dao/.settings/org.eclipse.jdt.core.prefs

@@ -1,17 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=warning
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.mainOnlyProjectHasTestOnlyDependency=error
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error

maxkey-dao/.settings/org.eclipse.wst.common.component

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="maxkey-dao">
-        <wb-resource deploy-path="/" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/" source-path="/src/main/resources"/>
-        <wb-resource deploy-path="/" source-path="/src/test/java"/>
-        <wb-resource deploy-path="/" source-path="/src/test/resources"/>
-    </wb-module>
-</project-modules>

maxkey-dao/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <fixed facet="java"/>
-  <fixed facet="jst.utility"/>
-  <installed facet="jst.utility" version="1.0"/>
-  <installed facet="java" version="1.8"/>
-</faceted-project>

maxkey-dao/.settings/org.eclipse.wst.validation.prefs

@@ -1,20 +0,0 @@
-DELEGATES_PREFERENCE=delegateValidatorList
-USER_BUILD_PREFERENCE=enabledBuildValidatorList
-USER_MANUAL_PREFERENCE=enabledManualValidatorList
-USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.800.v201904082137
-eclipse.preferences.version=1
-override=true
-suspend=false
-vals/org.eclipse.jst.jsf.facelet.ui.FaceletHTMLValidator/global=FF01
-vals/org.eclipse.jst.jsf.ui.JSFAppConfigValidator/global=FF01
-vals/org.eclipse.jst.jsp.core.JSPBatchValidator/global=FF01
-vals/org.eclipse.jst.jsp.core.JSPContentValidator/global=FF01
-vals/org.eclipse.jst.jsp.core.TLDValidator/global=FF01
-vals/org.eclipse.wst.dtd.core.dtdDTDValidator/global=FF01
-vals/org.eclipse.wst.html.core.HTMLValidator/global=FF01
-vals/org.eclipse.wst.json.core.json/global=FF03
-vals/org.eclipse.wst.wsdl.validation.wsdl/global=FF02158org.eclipse.wst.wsdl.validation.internal.eclipse.Validator
-vals/org.eclipse.wst.xml.core.xml/global=FF03
-vals/org.eclipse.wst.xsd.core.xsd/global=FF02162org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator
-vals/org.eclipse.wst.xsl.core.xsl/global=FF02
-vf.version=3

maxkey-dao/.settings/org.springframework.ide.eclipse.prefs

@@ -1,2 +0,0 @@
-boot.validation.initialized=true
-eclipse.preferences.version=1

maxkey-identitys/maxkey-identity-rest/.settings/org.eclipse.wst.common.component

@@ -6,7 +6,7 @@
 		<dependent-module deploy-path="../" handle="module:/resource/maxkey-core/maxkey-core">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
-		<dependent-module deploy-path="../" handle="module:/resource/maxkey-dao/maxkey-dao">
+		<dependent-module deploy-path="../" handle="module:/resource/maxkey-persistence/maxkey-persistence">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
 		<dependent-module deploy-path="../" handle="module:/resource/maxkey-client-sdk/maxkey-client-sdk">

maxkey-identitys/maxkey-identity-rest/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 	compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
 	
 	compile project(":maxkey-core")
-	compile project(":maxkey-dao")
+	compile project(":maxkey-persistence")
    	compile project(":maxkey-client-sdk")
    
 }

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

@@ -2,8 +2,8 @@ package org.maxkey.identity.rest;
 
 import java.io.IOException;
 
-import org.maxkey.dao.service.OrganizationsService;
 import org.maxkey.domain.Organizations;
+import org.maxkey.persistence.service.OrganizationsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;

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

@@ -2,8 +2,8 @@ package org.maxkey.identity.rest;
 
 import java.io.IOException;
 
-import org.maxkey.dao.service.UserInfoService;
 import org.maxkey.domain.UserInfo;
+import org.maxkey.persistence.service.UserInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpStatus;

maxkey-identitys/maxkey-identity-scim/.settings/org.eclipse.wst.common.component

@@ -6,7 +6,7 @@
 		<dependent-module deploy-path="../" handle="module:/resource/maxkey-core/maxkey-core">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
-		<dependent-module deploy-path="../" handle="module:/resource/maxkey-dao/maxkey-dao">
+		<dependent-module deploy-path="../" handle="module:/resource/maxkey-persistence/maxkey-persistence">
 			<dependency-type>uses</dependency-type>
 		</dependent-module>
 		<dependent-module deploy-path="../" handle="module:/resource/maxkey-client-sdk/maxkey-client-sdk">

maxkey-identitys/maxkey-identity-scim/build.gradle

@@ -9,7 +9,7 @@ dependencies {
 	compile fileTree(dir: '../maxkey-lib/*/', include: '*.jar')
 	
 	compile project(":maxkey-core")
-	compile project(":maxkey-dao")
+	compile project(":maxkey-persistence")
    	compile project(":maxkey-client-sdk")
    
 }

maxkey-persistence/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>maxkey-dao</name>
+	<name>maxkey-persistence</name>
 	<comment>maxkey-dao</comment>
 	<projects>
 	</projects>

maxkey-persistence/build.gradle

@@ -1,4 +1,4 @@
-description = "maxkey-dao"
+description = "maxkey-persistence"
 
 dependencies {
 	//local jars

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.Accounts;

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.apps.AppsCasDetails;

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.apps.AppsDesktopDetails;

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.apps.AppsFormBasedDetails;

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.apps.AppsSAML20Details;

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.apps.AppsTokenBasedDetails;

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.Groups;

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

@@ -1,4 +1,4 @@
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.HistoryLoginApps;

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

@@ -1,4 +1,4 @@
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.HistoryLogs;

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

@@ -1,4 +1,4 @@
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.Organizations;
 

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.PasswordPolicy;

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import java.util.List;
 import java.util.Map;

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
 import org.maxkey.domain.Resources;

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import java.util.List;
 

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

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;
 
 import org.apache.ibatis.annotations.Select;
 import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/package-info.java

@@ -2,4 +2,4 @@
  * 
  * Sql DAO Mapper XML Configuration.
 */
-package org.maxkey.dao.persistence;
+package org.maxkey.persistence.mapper;

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.AccountsMapper;
 import org.maxkey.domain.Accounts;
+import org.maxkey.persistence.mapper.AccountsMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.AppsCasDetailsMapper;
 import org.maxkey.domain.apps.AppsCasDetails;
+import org.maxkey.persistence.mapper.AppsCasDetailsMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.AppsDesktopDetailsMapper;
 import org.maxkey.domain.apps.AppsDesktopDetails;
+import org.maxkey.persistence.mapper.AppsDesktopDetailsMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.AppsFormBasedDetailsMapper;
 import org.maxkey.domain.apps.AppsFormBasedDetails;
+import org.maxkey.persistence.mapper.AppsFormBasedDetailsMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.AppsSaml20DetailsMapper;
 import org.maxkey.domain.apps.AppsSAML20Details;
+import org.maxkey.persistence.mapper.AppsSaml20DetailsMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,11 +1,11 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import java.util.List;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.AppsMapper;
 import org.maxkey.domain.apps.Apps;
 import org.maxkey.domain.apps.UserApps;
+import org.maxkey.persistence.mapper.AppsMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.AppsTokenBasedDetailsMapper;
 import org.maxkey.domain.apps.AppsTokenBasedDetails;
+import org.maxkey.persistence.mapper.AppsTokenBasedDetailsMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.GroupMemberMapper;
 import org.maxkey.domain.GroupMember;
+import org.maxkey.persistence.mapper.GroupMemberMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.GroupPrivilegesMapper;
 import org.maxkey.domain.GroupPrivileges;
+import org.maxkey.persistence.mapper.GroupPrivilegesMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.GroupsMapper;
 import org.maxkey.domain.Groups;
+import org.maxkey.persistence.mapper.GroupsMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.HistoryLoginAppsMapper;
 import org.maxkey.domain.HistoryLoginApps;
+import org.maxkey.persistence.mapper.HistoryLoginAppsMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.HistoryLoginMapper;
 import org.maxkey.domain.HistoryLogin;
+import org.maxkey.persistence.mapper.HistoryLoginMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.HistoryLogsMapper;
 import org.maxkey.domain.HistoryLogs;
+import org.maxkey.persistence.mapper.HistoryLogsMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,11 +1,11 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.OrganizationsMapper;
 import org.maxkey.domain.Organizations;
 import org.maxkey.identity.kafka.KafkaIdentityAction;
 import org.maxkey.identity.kafka.KafkaIdentityTopic;
 import org.maxkey.identity.kafka.KafkaProvisioningService;
+import org.maxkey.persistence.mapper.OrganizationsMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.PasswordPolicyMapper;
 import org.maxkey.domain.PasswordPolicy;
+import org.maxkey.persistence.mapper.PasswordPolicyMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,11 +1,11 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import java.util.List;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.RegistrationMapper;
 import org.maxkey.domain.Registration;
 import org.maxkey.domain.UserInfo;
+import org.maxkey.persistence.mapper.RegistrationMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,11 +1,11 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import java.util.List;
 import java.util.Map;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.ReportMapper;
+import org.maxkey.persistence.mapper.ReportMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.ResourcesMapper;
 import org.maxkey.domain.Resources;
+import org.maxkey.persistence.mapper.ResourcesMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,8 +1,8 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.RoleMemberMapper;
 import org.maxkey.domain.RoleMember;
+import org.maxkey.persistence.mapper.RoleMemberMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,11 +1,11 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 import java.util.List;
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.RolesMapper;
 import org.maxkey.domain.RolePermissions;
 import org.maxkey.domain.Roles;
+import org.maxkey.persistence.mapper.RolesMapper;
 import org.springframework.stereotype.Service;
 
 @Service

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

@@ -1,16 +1,16 @@
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;
 
 
 import org.apache.mybatis.jpa.persistence.JpaBaseService;
 import org.maxkey.constants.ConstantsStatus;
 import org.maxkey.crypto.ReciprocalUtils;
 import org.maxkey.crypto.password.PasswordReciprocal;
-import org.maxkey.dao.persistence.UserInfoMapper;
 import org.maxkey.domain.ChangePassword;
 import org.maxkey.domain.UserInfo;
 import org.maxkey.identity.kafka.KafkaIdentityAction;
 import org.maxkey.identity.kafka.KafkaIdentityTopic;
 import org.maxkey.identity.kafka.KafkaProvisioningService;
+import org.maxkey.persistence.mapper.UserInfoMapper;
 import org.maxkey.util.DateUtils;
 import org.maxkey.util.StringUtils;
 import org.maxkey.web.WebContext;

maxkey-persistence/src/main/java/org/maxkey/persistence/service/package-info.java

@@ -2,4 +2,4 @@
  * 
  * Mysql DAO Mapper XML Configuration.
 */
-package org.maxkey.dao.service;
+package org.maxkey.persistence.service;

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AccountsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.AccountsMapper">
+<mapper namespace="org.maxkey.persistence.mapper.AccountsMapper">
 
 	<sql id="where_statement">
     	<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.AppsCasDetailsMapper">
+<mapper namespace="org.maxkey.persistence.mapper.AppsCasDetailsMapper">
 	<select id="getAppDetails" parameterType="string" resultType="AppsCasDetails">
     	SELECT 
 			*

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsDesktopDetailsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.AppsDesktopDetailsMapper">
+<mapper namespace="org.maxkey.persistence.mapper.AppsDesktopDetailsMapper">
 
 	<select id="getAppDetails" parameterType="string" resultType="AppsDesktopDetails">
     	SELECT 

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.AppsFormBasedDetailsMapper">
+<mapper namespace="org.maxkey.persistence.mapper.AppsFormBasedDetailsMapper">
 
 	<select id="getAppDetails" parameterType="string" resultType="AppsFormBasedDetails">
     	SELECT 

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.AppsMapper">
+<mapper namespace="org.maxkey.persistence.mapper.AppsMapper">
 
 	<sql id="where_statement">
 		<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.AppsSaml20DetailsMapper">
+<mapper namespace="org.maxkey.persistence.mapper.AppsSaml20DetailsMapper">
 
 	<select id="getAppDetails" parameterType="string" resultType="AppsSaml20Details">
     	SELECT 

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.AppsTokenBasedDetailsMapper">
+<mapper namespace="org.maxkey.persistence.mapper.AppsTokenBasedDetailsMapper">
 
 <select id="getAppDetails" parameterType="string" resultType="AppsTokenBasedDetails">
     	SELECT 

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ForgotPasswordMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.ForgotPasswordMapper">
+<mapper namespace="org.maxkey.persistence.mapper.ForgotPasswordMapper">
 
 </mapper>

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.GroupMemberMapper">
+<mapper namespace="org.maxkey.persistence.mapper.GroupMemberMapper">
 
 	<sql id="where_statement">
     	<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupPrivilegesMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.GroupPrivilegesMapper" >
+<mapper namespace="org.maxkey.persistence.mapper.GroupPrivilegesMapper" >
 
 	<sql id="where_statement">
     	<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.GroupsMapper">
+<mapper namespace="org.maxkey.persistence.mapper.GroupsMapper">
 
 	<sql id="where_statement">
     	<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginAppsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.HistoryLoginAppsMapper" >
+<mapper namespace="org.maxkey.persistence.mapper.HistoryLoginAppsMapper" >
 
 	<sql id="dao_where_statement">
     	<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLoginMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.HistoryLoginMapper" >
+<mapper namespace="org.maxkey.persistence.mapper.HistoryLoginMapper" >
 
 	<sql id="dao_where_statement">
     	<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistoryLogsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.HistoryLogsMapper" >
+<mapper namespace="org.maxkey.persistence.mapper.HistoryLogsMapper" >
 
 	<sql id="where_statement">
     	<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/OrganizationsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.OrganizationsMapper" >
+<mapper namespace="org.maxkey.persistence.mapper.OrganizationsMapper" >
 
 	<sql id="dao_where_statement">
     	<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/PasswordPolicyMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.PasswordPolicyMapper" >
+<mapper namespace="org.maxkey.persistence.mapper.PasswordPolicyMapper" >
 	
    
 </mapper>

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RegistrationMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.RegistrationMapper">
+<mapper namespace="org.maxkey.persistence.mapper.RegistrationMapper">
 	
 	<select id="queryUserInfoByEmail" parameterType="string" resultType="UserInfo">
 		SELECT

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ReportMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.ReportMapper" >
+<mapper namespace="org.maxkey.persistence.mapper.ReportMapper" >
  	<!-- DAY  COUNT 一天访问量 -->
 	<select id="analysisDay" parameterType="String" resultType="Integer">
     	SELECT 

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.ResourcesMapper">
+<mapper namespace="org.maxkey.persistence.mapper.ResourcesMapper">
 
 	<sql id="where_statement">
     	<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.RoleMemberMapper">
+<mapper namespace="org.maxkey.persistence.mapper.RoleMemberMapper">
 
 	<sql id="where_statement">
     	<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RolesMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.RolesMapper">
+<mapper namespace="org.maxkey.persistence.mapper.RolesMapper">
 
 	<sql id="where_statement">
     	<if test="id != null and id != ''">

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/UserInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.UserInfoMapper">
+<mapper namespace="org.maxkey.persistence.mapper.UserInfoMapper">
 	
 	<select id="loadByUsername" parameterType="string" resultType="UserInfo">
     	SELECT 

maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AccountsServiceTest.java

@@ -8,10 +8,10 @@ import java.util.List;
 import org.apache.mybatis.jpa.util.WebContext;
 import org.junit.Before;
 import org.junit.Test;
-import org.maxkey.dao.service.AccountsService;
-import org.maxkey.dao.service.AppsFormBasedDetailsService;
 import org.maxkey.domain.Accounts;
 import org.maxkey.domain.apps.AppsFormBasedDetails;
+import org.maxkey.persistence.service.AccountsService;
+import org.maxkey.persistence.service.AppsFormBasedDetailsService;
 import org.maxkey.util.PathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/AppsServiceTest.java

@@ -8,12 +8,12 @@ import java.util.List;
 import org.apache.mybatis.jpa.util.WebContext;
 import org.junit.Before;
 import org.junit.Test;
-import org.maxkey.dao.service.AccountsService;
-import org.maxkey.dao.service.AppsFormBasedDetailsService;
-import org.maxkey.dao.service.AppsService;
 import org.maxkey.domain.Accounts;
 import org.maxkey.domain.apps.Apps;
 import org.maxkey.domain.apps.AppsFormBasedDetails;
+import org.maxkey.persistence.service.AccountsService;
+import org.maxkey.persistence.service.AppsFormBasedDetailsService;
+import org.maxkey.persistence.service.AppsService;
 import org.maxkey.util.PathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-persistence/src/test/java/org/apache/mybatis/jpa/test/FormBasedDetailsServiceTest.java

@@ -8,8 +8,8 @@ import java.util.List;
 import org.apache.mybatis.jpa.util.WebContext;
 import org.junit.Before;
 import org.junit.Test;
-import org.maxkey.dao.service.AppsFormBasedDetailsService;
 import org.maxkey.domain.apps.AppsFormBasedDetails;
+import org.maxkey.persistence.service.AppsFormBasedDetailsService;
 import org.maxkey.util.PathUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

maxkey-persistence/src/test/resources/spring/applicationContext-persist.xml

@@ -36,7 +36,7 @@
 	<bean id="sqlSessionFactory" class="org.apache.mybatis.jpa.MyBatisSessionFactoryBean">
 		<property name="timeout" value="30" />
 		<property name="dataSource" ref="dataSource" />
-		<property name="mapperLocations" value="classpath*:/org/maxkey/dao/persistence/xml/mysql/*.xml" />
+		<property name="mapperLocations" value="classpath*:/org/maxkey/persistence/mapper/xml/mysql/*.xml" />
 		<property name="typeAliasesPackage" 
         		  value="
 	        			org.maxkey.domain,
@@ -58,13 +58,13 @@
     <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
         <property name="basePackage" 
         		  value="
-        		  		org.maxkey.dao.persistence,
+        		  		org.maxkey.persistence.mapper,
         		  		" />
       
     </bean>
 
  	<!-- enable component scanning (beware that this does not enable mapper scanning!) -->    
-    <context:component-scan base-package="org.maxkey.dao.service" />
+    <context:component-scan base-package="org.maxkey.persistence.service" />
     
     <bean class ="org.apache.mybatis.jpa.id.IdentifierGeneratorFactory">
     <!--